patch 'raw/ifpga: remove virtual devices on close' has been queued to stable release 20.11.6
Xueming Li
xuemingl at nvidia.com
Tue Jun 21 10:02:58 CEST 2022
Hi,
FYI, your patch has been queued to stable release 20.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/23/22. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/c9a4ddc1e848c4e1fcd6d928d7e8f715c0189f4f
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From c9a4ddc1e848c4e1fcd6d928d7e8f715c0189f4f Mon Sep 17 00:00:00 2001
From: Wei Huang <wei.huang at intel.com>
Date: Thu, 16 Jun 2022 23:38:21 -0400
Subject: [PATCH] raw/ifpga: remove virtual devices on close
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit ae835aba40349ee9631ef6b52e68a2893febe7e0 ]
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")
Signed-off-by: Wei Huang <wei.huang at intel.com>
Acked-by: Tianfei Zhang <tianfei.zhang at intel.com>
Reviewed-by: Rosen Xu <rosen.xu at intel.com>
---
drivers/raw/ifpga/ifpga_rawdev.c | 169 +++++++++++++++++++++++--------
drivers/raw/ifpga/ifpga_rawdev.h | 8 ++
2 files changed, 136 insertions(+), 41 deletions(-)
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 2d7f1af51d..ee6589ad01 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -135,6 +135,8 @@ ifpga_rawdev_allocate(struct rte_rawdev *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;
}
@@ -740,12 +742,20 @@ ifpga_rawdev_close(struct rte_rawdev *dev)
struct ifpga_rawdev *ifpga_rdev = NULL;
struct opae_adapter *adapter;
struct opae_manager *mgr;
- int ret = 0;
+ char *vdev_name = NULL;
+ int i, ret = 0;
if (dev) {
- ifpga_rdev = ifpga_rawdev_get(dev);
- if (ifpga_rdev)
+ 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) {
mgr = opae_adapter_get_mgr(adapter);
@@ -1637,9 +1647,6 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)
if (ret)
IFPGA_RAWDEV_PMD_DEBUG("Device cleanup failed");
- if (dev)
- dev->rawdev = NULL;
-
return ret;
}
@@ -1696,75 +1703,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:
- if (kvlist)
- rte_kvargs_free(kvlist);
- if (name)
- 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;
}
@@ -1772,10 +1822,47 @@ end:
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 b3c7295070..b4aaa15fda 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.h
+++ b/drivers/raw/ifpga/ifpga_rawdev.h
@@ -50,6 +50,7 @@ ifpga_rawdev_get_priv(const struct rte_rawdev *rawdev)
#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 *
--
2.35.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-06-21 15:37:54.201821835 +0800
+++ 0112-raw-ifpga-remove-virtual-devices-on-close.patch 2022-06-21 15:37:49.237785294 +0800
@@ -1 +1 @@
-From ae835aba40349ee9631ef6b52e68a2893febe7e0 Mon Sep 17 00:00:00 2001
+From c9a4ddc1e848c4e1fcd6d928d7e8f715c0189f4f Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Tue, 7 Jun 2022 05:07:21 -0400
+Date: Thu, 16 Jun 2022 23:38:21 -0400
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ae835aba40349ee9631ef6b52e68a2893febe7e0 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++-------
+ drivers/raw/ifpga/ifpga_rawdev.c | 169 +++++++++++++++++++++++--------
@@ -20 +22 @@
- 2 files changed, 138 insertions(+), 36 deletions(-)
+ 2 files changed, 136 insertions(+), 41 deletions(-)
@@ -23 +25 @@
-index 6d4117c5e8..fe3fc43abe 100644
+index 2d7f1af51d..ee6589ad01 100644
@@ -26 +28 @@
-@@ -134,6 +134,8 @@ ifpga_rawdev_allocate(struct rte_rawdev *rawdev)
+@@ -135,6 +135,8 @@ ifpga_rawdev_allocate(struct rte_rawdev *rawdev)
@@ -35,5 +37,2 @@
-@@ -736,10 +738,22 @@ ifpga_rawdev_stop(struct rte_rawdev *dev)
- static int
- ifpga_rawdev_close(struct rte_rawdev *dev)
- {
-+ struct ifpga_rawdev *ifpga_rdev = NULL;
+@@ -740,12 +742,20 @@ ifpga_rawdev_close(struct rte_rawdev *dev)
+ struct ifpga_rawdev *ifpga_rdev = NULL;
@@ -40,0 +40,2 @@
+ struct opae_manager *mgr;
+- int ret = 0;
@@ -42 +43 @@
-+ int i = 0;
++ int i, ret = 0;
@@ -45 +46,2 @@
-- ifpga_monitor_stop_func(ifpga_rawdev_get(dev));
+- ifpga_rdev = ifpga_rawdev_get(dev);
+- if (ifpga_rdev)
@@ -53 +55 @@
-+ ifpga_monitor_stop_func(ifpga_rdev);
+ ifpga_monitor_stop_func(ifpga_rdev);
@@ -58,5 +60,5 @@
- opae_adapter_destroy(adapter);
-@@ -1638,8 +1652,6 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)
- return -EINVAL;
- }
- dev = ifpga_rawdev_get(rawdev);
+ mgr = opae_adapter_get_mgr(adapter);
+@@ -1637,9 +1647,6 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)
+ if (ret)
+ IFPGA_RAWDEV_PMD_DEBUG("Device cleanup failed");
+
@@ -64,0 +67,3 @@
+-
+ return ret;
+ }
@@ -66,3 +71 @@
- adapter = ifpga_rawdev_get_priv(rawdev);
- if (!adapter)
-@@ -1714,73 +1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
+@@ -1696,75 +1703,118 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
@@ -207,2 +210,4 @@
-- rte_kvargs_free(kvlist);
-- free(name);
+- if (kvlist)
+- rte_kvargs_free(kvlist);
+- if (name)
+- free(name);
@@ -217 +222 @@
-@@ -1788,10 +1845,47 @@ end:
+@@ -1772,10 +1822,47 @@ end:
@@ -269 +274 @@
-index 857b73463d..4c191190ca 100644
+index b3c7295070..b4aaa15fda 100644
More information about the stable
mailing list