From patchwork Fri May 27 08:33:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 111972 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AF984A055F; Fri, 27 May 2022 10:27:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A646042802; Fri, 27 May 2022 10:27:08 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 694CB42685; Fri, 27 May 2022 10:27:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653640026; x=1685176026; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ydN2OeN55ts5fOsWkJTY7uX9ZMooJN+teCQrw+43ndc=; b=apYsd/3JIhKkZMyKfo4+A7sLQRNU7lum90EnTAq1A/4YPI676mauO7uQ JKpqaSdErKMO5lPyeJgUSv/4FIf5bxbx0h6/6JRMGFKoCVKCsPuOokPV4 H97JCV7kCLqx4gZ0hG3zLHR7G+cpAe9EJ/XExUPda0cM4922j13J6KGxH e6BI4RA8AcUOSuH3HnyGT/wUF6xUye0ylHI5Q9d52FUGI8MuZlJ6ecLZn n0UmmwSNo5tUOzgSsjOOTbgcK2sC7bM3n/dMW3qutPVS7UFkHs7FZBc6y c6ITiABssZmZo8Mv/UBn9DxftA19OOu41tT7Q6TbGy1gilH8x+hmiz++0 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10359"; a="274147326" X-IronPort-AV: E=Sophos;i="5.91,254,1647327600"; d="scan'208";a="274147326" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2022 01:26:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,254,1647327600"; d="scan'208";a="610129529" Received: from unknown (HELO zj-fpga-amt.sh.intel.com) ([10.238.175.102]) by orsmga001.jf.intel.com with ESMTP; 27 May 2022 01:26:47 -0700 From: Wei Huang To: dev@dpdk.org, thomas@monjalon.net, nipun.gupta@nxp.com, hemant.agrawal@nxp.com Cc: stable@dpdk.org, rosen.xu@intel.com, tianfei.zhang@intel.com, qi.z.zhang@intel.com, Wei Huang Subject: [PATCH v4 2/5] raw/ifpga: remove vdev when ifpga is closed Date: Fri, 27 May 2022 04:33:50 -0400 Message-Id: <1653640433-5066-3-git-send-email-wei.huang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1653640433-5066-1-git-send-email-wei.huang@intel.com> References: <1653535974-1379-1-git-send-email-wei.huang@intel.com> <1653640433-5066-1-git-send-email-wei.huang@intel.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Virtual devices created on ifpga raw device will not be removed when ifpga device has closed. To avoid resource leak problem, this patch introduces an ifpga virtual device remove function, virtual devices will be destroyed after the ifpga raw device closed. Fixes: ef1e8ede3da5 ("raw/ifpga: add Intel FPGA bus rawdev driver") Cc: stable@dpdk.org Signed-off-by: Wei Huang Acked-by: Tianfei Zhang Reviewed-by: Rosen Xu --- v2: update commit log with Tianfei's comment --- v3: replace constant with PCI_PRI_STR_SIZE per Rosen's comment --- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++++++++--------- drivers/raw/ifpga/ifpga_rawdev.h | 8 ++ 2 files changed, 138 insertions(+), 36 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 6d4117c..fe3fc43 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -134,6 +134,8 @@ struct ifpga_rawdev * for (i = 0; i < IFPGA_MAX_IRQ; i++) dev->intr_handle[i] = NULL; dev->poll_enabled = 0; + for (i = 0; i < IFPGA_MAX_VDEV; i++) + dev->vdev_name[i] = NULL; return dev; } @@ -736,10 +738,22 @@ static int set_surprise_link_check_aer( static int ifpga_rawdev_close(struct rte_rawdev *dev) { + struct ifpga_rawdev *ifpga_rdev = NULL; struct opae_adapter *adapter; + char *vdev_name = NULL; + int i = 0; if (dev) { - ifpga_monitor_stop_func(ifpga_rawdev_get(dev)); + ifpga_rdev = ifpga_rawdev_get(dev); + if (ifpga_rdev) { + for (i = 0; i < IFPGA_MAX_VDEV; i++) { + vdev_name = ifpga_rdev->vdev_name[i]; + if (vdev_name) + rte_vdev_uninit(vdev_name); + } + ifpga_monitor_stop_func(ifpga_rdev); + ifpga_rdev->rawdev = NULL; + } adapter = ifpga_rawdev_get_priv(dev); if (adapter) { opae_adapter_destroy(adapter); @@ -1638,8 +1652,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr) return -EINVAL; } dev = ifpga_rawdev_get(rawdev); - if (dev) - dev->rawdev = NULL; adapter = ifpga_rawdev_get_priv(rawdev); if (!adapter) @@ -1714,73 +1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, return 0; } + static int -ifpga_cfg_probe(struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs(struct rte_devargs *devargs, + struct ifpga_vdev_args *args) { - struct rte_devargs *devargs; - struct rte_kvargs *kvlist = NULL; - struct rte_rawdev *rawdev = NULL; - struct ifpga_rawdev *ifpga_dev; - int port; + struct rte_kvargs *kvlist; char *name = NULL; - char dev_name[RTE_RAWDEV_NAME_MAX_LEN]; - int ret = -1; + int port = 0; + int ret = -EINVAL; - devargs = dev->device.devargs; + if (!devargs || !args) + return ret; kvlist = rte_kvargs_parse(devargs->args, valid_args); if (!kvlist) { - IFPGA_RAWDEV_PMD_LOG(ERR, "error when parsing param"); - goto end; + IFPGA_RAWDEV_PMD_ERR("error when parsing devargs"); + return ret; } if (rte_kvargs_count(kvlist, IFPGA_ARG_NAME) == 1) { if (rte_kvargs_process(kvlist, IFPGA_ARG_NAME, - &ifpga_rawdev_get_string_arg, - &name) < 0) { + &ifpga_rawdev_get_string_arg, &name) < 0) { IFPGA_RAWDEV_PMD_ERR("error to parse %s", - IFPGA_ARG_NAME); + IFPGA_ARG_NAME); goto end; + } else { + strlcpy(args->bdf, name, sizeof(args->bdf)); + rte_free(name); } } else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpga bus", - IFPGA_ARG_NAME); + IFPGA_ARG_NAME); goto end; } if (rte_kvargs_count(kvlist, IFPGA_ARG_PORT) == 1) { - if (rte_kvargs_process(kvlist, - IFPGA_ARG_PORT, - &rte_ifpga_get_integer32_arg, - &port) < 0) { + if (rte_kvargs_process(kvlist, IFPGA_ARG_PORT, + &rte_ifpga_get_integer32_arg, &port) < 0) { IFPGA_RAWDEV_PMD_ERR("error to parse %s", IFPGA_ARG_PORT); goto end; + } else { + args->port = port; } } else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpga bus", - IFPGA_ARG_PORT); + IFPGA_ARG_PORT); goto end; } + ret = 0; + +end: + if (kvlist) + rte_kvargs_free(kvlist); + + return ret; +} + +static int +ifpga_cfg_probe(struct rte_vdev_device *vdev) +{ + struct rte_rawdev *rawdev = NULL; + struct ifpga_rawdev *ifpga_dev; + struct ifpga_vdev_args args; + char dev_name[RTE_RAWDEV_NAME_MAX_LEN]; + const char *vdev_name = NULL; + int i, n, ret = 0; + + vdev_name = rte_vdev_device_name(vdev); + if (!vdev_name) + return -EINVAL; + + IFPGA_RAWDEV_PMD_INFO("probe ifpga virtual device %s", vdev_name); + + ret = ifpga_vdev_parse_devargs(vdev->device.devargs, &args); + if (ret) + return ret; + memset(dev_name, 0, sizeof(dev_name)); - snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s", name); + snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s", args.bdf); rawdev = rte_rawdev_pmd_get_named_dev(dev_name); if (!rawdev) - goto end; + return -ENODEV; ifpga_dev = ifpga_rawdev_get(rawdev); if (!ifpga_dev) - goto end; + return -ENODEV; - memset(dev_name, 0, sizeof(dev_name)); - snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s", - port, name); + for (i = 0; i < IFPGA_MAX_VDEV; i++) { + if (ifpga_dev->vdev_name[i] == NULL) { + n = strlen(vdev_name) + 1; + ifpga_dev->vdev_name[i] = rte_malloc(NULL, n, 0); + if (ifpga_dev->vdev_name[i] == NULL) + return -ENOMEM; + strlcpy(ifpga_dev->vdev_name[i], vdev_name, n); + break; + } + } + if (i >= IFPGA_MAX_VDEV) { + IFPGA_RAWDEV_PMD_ERR("Can't create more virtual device!"); + return -ENOENT; + } + + snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s", + args.port, args.bdf); ret = rte_eal_hotplug_add(RTE_STR(IFPGA_BUS_NAME), - dev_name, devargs->args); -end: - rte_kvargs_free(kvlist); - free(name); + dev_name, vdev->device.devargs->args); + if (ret) { + rte_free(ifpga_dev->vdev_name[i]); + ifpga_dev->vdev_name[i] = NULL; + } return ret; } @@ -1788,10 +1845,47 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, static int ifpga_cfg_remove(struct rte_vdev_device *vdev) { - IFPGA_RAWDEV_PMD_INFO("Remove ifpga_cfg %p", - vdev); + struct rte_rawdev *rawdev = NULL; + struct ifpga_rawdev *ifpga_dev; + struct ifpga_vdev_args args; + char dev_name[RTE_RAWDEV_NAME_MAX_LEN]; + const char *vdev_name = NULL; + char *tmp_vdev = NULL; + int i, ret = 0; - return 0; + vdev_name = rte_vdev_device_name(vdev); + if (!vdev_name) + return -EINVAL; + + IFPGA_RAWDEV_PMD_INFO("remove ifpga virtual device %s", vdev_name); + + ret = ifpga_vdev_parse_devargs(vdev->device.devargs, &args); + if (ret) + return ret; + + memset(dev_name, 0, sizeof(dev_name)); + snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s", args.bdf); + rawdev = rte_rawdev_pmd_get_named_dev(dev_name); + if (!rawdev) + return -ENODEV; + ifpga_dev = ifpga_rawdev_get(rawdev); + if (!ifpga_dev) + return -ENODEV; + + snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s", + args.port, args.bdf); + ret = rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME), dev_name); + + for (i = 0; i < IFPGA_MAX_VDEV; i++) { + tmp_vdev = ifpga_dev->vdev_name[i]; + if (tmp_vdev && !strcmp(tmp_vdev, vdev_name)) { + free(tmp_vdev); + ifpga_dev->vdev_name[i] = NULL; + break; + } + } + + return ret; } static struct rte_vdev_driver ifpga_cfg_driver = { diff --git a/drivers/raw/ifpga/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h index 857b734..4c19119 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.h +++ b/drivers/raw/ifpga/ifpga_rawdev.h @@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state { #define IFPGA_RAWDEV_MSIX_IRQ_NUM 7 #define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4 #define IFPGA_MAX_IRQ 12 struct ifpga_rawdev { @@ -64,6 +65,13 @@ struct ifpga_rawdev { void *intr_handle[IFPGA_MAX_IRQ]; /* enable monitor thread poll device's sensors or not */ int poll_enabled; + /* name of virtual devices created on raw device */ + char *vdev_name[IFPGA_MAX_VDEV]; +}; + +struct ifpga_vdev_args { + char bdf[PCI_PRI_STR_SIZE]; + int port; }; struct ifpga_rawdev *