From: Li Zhang <lizh@nvidia.com>
To: <orika@nvidia.com>, <viacheslavo@nvidia.com>, <matan@nvidia.com>,
<shahafs@nvidia.com>,
Bruce Richardson <bruce.richardson@intel.com>,
"Dmitry Kozlyuk" <dmitry.kozliuk@gmail.com>,
Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>,
Dmitry Malloy <dmitrym@microsoft.com>,
Pallavi Kadam <pallavi.kadam@intel.com>
Cc: <dev@dpdk.org>, <thomas@monjalon.net>, <rasland@nvidia.com>,
<roniba@nvidia.com>, Yajun Wu <yajunw@nvidia.com>,
<stable@dpdk.org>
Subject: [PATCH v1 02/17] eal: add device removal in rte cleanup
Date: Mon, 6 Jun 2022 14:20:39 +0300 [thread overview]
Message-ID: <20220606112109.208873-3-lizh@nvidia.com> (raw)
In-Reply-To: <20220606112109.208873-1-lizh@nvidia.com>
From: Yajun Wu <yajunw@nvidia.com>
Add device removal in function rte_eal_cleanup. This is the last chance
device remove get called for sanity. Loop vdev bus first and then all bus
for all device, calling rte_dev_remove.
Cc: stable@dpdk.org
Signed-off-by: Yajun Wu <yajunw@nvidia.com>
---
lib/eal/freebsd/eal.c | 33 +++++++++++++++++++++++++++++++++
lib/eal/include/rte_dev.h | 6 ++++++
lib/eal/linux/eal.c | 33 +++++++++++++++++++++++++++++++++
lib/eal/windows/eal.c | 33 +++++++++++++++++++++++++++++++++
4 files changed, 105 insertions(+)
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index a6b20960f2..5ffd9146b6 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -886,11 +886,44 @@ rte_eal_init(int argc, char **argv)
return fctret;
}
+static int
+bus_match_all(const struct rte_bus *bus, const void *data)
+{
+ RTE_SET_USED(bus);
+ RTE_SET_USED(data);
+ return 0;
+}
+
+static void
+remove_all_device(void)
+{
+ struct rte_bus *start = NULL, *next;
+ struct rte_dev_iterator dev_iter = {0};
+ struct rte_device *dev = NULL;
+ struct rte_device *tdev = NULL;
+ char devstr[128];
+
+ RTE_DEV_FOREACH_SAFE(dev, "bus=vdev", &dev_iter, tdev) {
+ (void)rte_dev_remove(dev);
+ }
+ while ((next = rte_bus_find(start, bus_match_all, NULL)) != NULL) {
+ start = next;
+ /* Skip buses that don't have iterate method */
+ if (!next->dev_iterate || !next->name)
+ continue;
+ snprintf(devstr, sizeof(devstr), "bus=%s", next->name);
+ RTE_DEV_FOREACH_SAFE(dev, devstr, &dev_iter, tdev) {
+ (void)rte_dev_remove(dev);
+ }
+ };
+}
+
int
rte_eal_cleanup(void)
{
struct internal_config *internal_conf =
eal_get_internal_configuration();
+ remove_all_device();
rte_service_finalize();
rte_mp_channel_cleanup();
/* after this point, any DPDK pointers will become dangling */
diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h
index e6ff1218f9..382d548ea3 100644
--- a/lib/eal/include/rte_dev.h
+++ b/lib/eal/include/rte_dev.h
@@ -492,6 +492,12 @@ int
rte_dev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova,
size_t len);
+#define RTE_DEV_FOREACH_SAFE(dev, devstr, it, tdev) \
+ for (rte_dev_iterator_init(it, devstr), \
+ (dev) = rte_dev_iterator_next(it); \
+ (dev) && ((tdev) = rte_dev_iterator_next(it), 1); \
+ (dev) = (tdev))
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 1ef263434a..30b295916e 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1248,6 +1248,38 @@ mark_freeable(const struct rte_memseg_list *msl, const struct rte_memseg *ms,
return 0;
}
+static int
+bus_match_all(const struct rte_bus *bus, const void *data)
+{
+ RTE_SET_USED(bus);
+ RTE_SET_USED(data);
+ return 0;
+}
+
+static void
+remove_all_device(void)
+{
+ struct rte_bus *start = NULL, *next;
+ struct rte_dev_iterator dev_iter = {0};
+ struct rte_device *dev = NULL;
+ struct rte_device *tdev = NULL;
+ char devstr[128];
+
+ RTE_DEV_FOREACH_SAFE(dev, "bus=vdev", &dev_iter, tdev) {
+ (void)rte_dev_remove(dev);
+ }
+ while ((next = rte_bus_find(start, bus_match_all, NULL)) != NULL) {
+ start = next;
+ /* Skip buses that don't have iterate method */
+ if (!next->dev_iterate || !next->name)
+ continue;
+ snprintf(devstr, sizeof(devstr), "bus=%s", next->name);
+ RTE_DEV_FOREACH_SAFE(dev, devstr, &dev_iter, tdev) {
+ (void)rte_dev_remove(dev);
+ }
+ };
+}
+
int
rte_eal_cleanup(void)
{
@@ -1257,6 +1289,7 @@ rte_eal_cleanup(void)
struct internal_config *internal_conf =
eal_get_internal_configuration();
+ remove_all_device();
if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
internal_conf->hugepage_file.unlink_existing)
rte_memseg_walk(mark_freeable, NULL);
diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c
index 122de2a319..3d7d411293 100644
--- a/lib/eal/windows/eal.c
+++ b/lib/eal/windows/eal.c
@@ -254,12 +254,45 @@ __rte_trace_point_register(rte_trace_point_t *trace, const char *name,
return -ENOTSUP;
}
+static int
+bus_match_all(const struct rte_bus *bus, const void *data)
+{
+ RTE_SET_USED(bus);
+ RTE_SET_USED(data);
+ return 0;
+}
+
+static void
+remove_all_device(void)
+{
+ struct rte_bus *start = NULL, *next;
+ struct rte_dev_iterator dev_iter = {0};
+ struct rte_device *dev = NULL;
+ struct rte_device *tdev = NULL;
+ char devstr[128];
+
+ RTE_DEV_FOREACH_SAFE(dev, "bus=vdev", &dev_iter, tdev) {
+ (void)rte_dev_remove(dev);
+ }
+ while ((next = rte_bus_find(start, bus_match_all, NULL)) != NULL) {
+ start = next;
+ /* Skip buses that don't have iterate method */
+ if (!next->dev_iterate || !next->name)
+ continue;
+ snprintf(devstr, sizeof(devstr), "bus=%s", next->name);
+ RTE_DEV_FOREACH_SAFE(dev, devstr, &dev_iter, tdev) {
+ (void)rte_dev_remove(dev);
+ }
+ };
+}
+
int
rte_eal_cleanup(void)
{
struct internal_config *internal_conf =
eal_get_internal_configuration();
+ remove_all_device();
eal_intr_thread_cancel();
eal_mem_virt2iova_cleanup();
/* after this point, any DPDK pointers will become dangling */
--
2.31.1
next prev parent reply other threads:[~2022-06-06 11:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220408075606.33056-1-lizh@nvidia.com>
2022-04-08 7:55 ` [RFC 01/15] examples/vdpa: fix vDPA device remove Li Zhang
[not found] ` <20220606112109.208873-1-lizh@nvidia.com>
2022-06-06 11:20 ` [PATCH v1 01/17] vdpa/mlx5: fix usage of capability for max number of virtqs Li Zhang
2022-06-06 11:20 ` Li Zhang [this message]
2022-06-06 11:20 ` [PATCH 02/16] examples/vdpa: fix vDPA device remove Li Zhang
2022-06-06 11:20 ` [PATCH v1 03/17] examples/vdpa: fix devices cleanup Li Zhang
[not found] ` <20220606114650.209612-1-lizh@nvidia.com>
2022-06-06 11:46 ` [PATCH v1 01/17] vdpa/mlx5: fix usage of capability for max number of virtqs Li Zhang
2022-06-06 11:46 ` [PATCH v1 02/17] eal: add device removal in rte cleanup Li Zhang
2022-06-06 11:46 ` [PATCH v1 03/17] examples/vdpa: fix devices cleanup Li Zhang
[not found] ` <20220616023012.16013-1-lizh@nvidia.com>
2022-06-16 2:29 ` [PATCH v2 01/15] vdpa/mlx5: fix usage of capability for max number of virtqs Li Zhang
2022-06-17 14:27 ` Maxime Coquelin
[not found] ` <20220618084805.87315-1-lizh@nvidia.com>
2022-06-18 8:47 ` [PATCH v3 " Li Zhang
[not found] ` <20220618090258.91157-1-lizh@nvidia.com>
2022-06-18 9:02 ` [PATCH v4 " Li Zhang
2022-06-28 3:47 ` [PATCH 21.11] vdpa/mlx5: fix maximum " Li Zhang
2022-06-28 14:58 ` Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220606112109.208873-3-lizh@nvidia.com \
--to=lizh@nvidia.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=dmitrym@microsoft.com \
--cc=matan@nvidia.com \
--cc=navasile@linux.microsoft.com \
--cc=orika@nvidia.com \
--cc=pallavi.kadam@intel.com \
--cc=rasland@nvidia.com \
--cc=roniba@nvidia.com \
--cc=shahafs@nvidia.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
--cc=viacheslavo@nvidia.com \
--cc=yajunw@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).