From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>, stable@dpdk.org
Subject: [dpdk-stable] [PATCH v6 16/22] bus/vdev: fix find device implementation
Date: Fri, 13 Apr 2018 15:22:31 +0200 [thread overview]
Message-ID: <5579b2f2895eed8693bdcd5c6c90c8d2af77658c.1523625525.git.gaetan.rivet@6wind.com> (raw)
In-Reply-To: <cover.1523625523.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1523625523.git.gaetan.rivet@6wind.com>
If start is set and a device before it matches the data,
this device is returned.
This induces potentially infinite loops.
Fixes: c7fe1eea8a74 ("bus: simplify finding starting point")
Cc: stable@dpdk.org
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
drivers/bus/vdev/rte_bus_vdev.h | 3 +++
drivers/bus/vdev/vdev.c | 14 +++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h
index 646d6c090..f9b5eb596 100644
--- a/drivers/bus/vdev/rte_bus_vdev.h
+++ b/drivers/bus/vdev/rte_bus_vdev.h
@@ -25,6 +25,9 @@ struct rte_vdev_device {
#define RTE_DEV_TO_VDEV(ptr) \
container_of(ptr, struct rte_vdev_device, device)
+#define RTE_DEV_TO_VDEV_CONST(ptr) \
+ container_of(ptr, const struct rte_vdev_device, device)
+
static inline const char *
rte_vdev_device_name(const struct rte_vdev_device *dev)
{
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index f8dd1f5e6..c135554c0 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -358,15 +358,19 @@ static struct rte_device *
vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
const void *data)
{
+ const struct rte_vdev_device *vstart;
struct rte_vdev_device *dev;
- TAILQ_FOREACH(dev, &vdev_device_list, next) {
- if (start && &dev->device == start) {
- start = NULL;
- continue;
- }
+ if (start != NULL) {
+ vstart = RTE_DEV_TO_VDEV_CONST(start);
+ dev = TAILQ_NEXT(vstart, next);
+ } else {
+ dev = TAILQ_FIRST(&vdev_device_list);
+ }
+ while (dev != NULL) {
if (cmp(&dev->device, data) == 0)
return &dev->device;
+ dev = TAILQ_NEXT(dev, next);
}
return NULL;
}
--
2.11.0
next prev parent reply other threads:[~2018-04-13 13:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1521124599.git.gaetan.rivet@6wind.com>
2018-03-15 17:49 ` [dpdk-stable] [PATCH v1 12/18] bus/pci: " Gaetan Rivet
2018-03-15 17:49 ` [dpdk-stable] [PATCH v1 15/18] bus/vdev: " Gaetan Rivet
[not found] ` <cover.1521652453.git.gaetan.rivet@6wind.com>
2018-03-21 17:15 ` [dpdk-stable] [PATCH v2 10/18] bus/pci: " Gaetan Rivet
2018-03-21 17:15 ` [dpdk-stable] [PATCH v2 13/18] bus/vdev: " Gaetan Rivet
[not found] ` <cover.1522105876.git.gaetan.rivet@6wind.com>
2018-03-26 23:18 ` [dpdk-stable] [PATCH v3 12/20] bus/pci: " Gaetan Rivet
2018-03-26 23:18 ` [dpdk-stable] [PATCH v3 15/20] bus/vdev: " Gaetan Rivet
[not found] ` <cover.1522358419.git.gaetan.rivet@6wind.com>
2018-03-29 21:23 ` [dpdk-stable] [PATCH v4 12/20] bus/pci: " Gaetan Rivet
2018-03-29 21:23 ` [dpdk-stable] [PATCH v4 15/20] bus/vdev: " Gaetan Rivet
[not found] ` <cover.1523404469.git.gaetan.rivet@6wind.com>
2018-04-11 0:04 ` [dpdk-stable] [PATCH v5 12/21] bus/pci: " Gaetan Rivet
2018-04-11 0:04 ` [dpdk-stable] [PATCH v5 15/21] bus/vdev: " Gaetan Rivet
[not found] ` <cover.1523625523.git.gaetan.rivet@6wind.com>
2018-04-13 13:22 ` [dpdk-stable] [PATCH v6 13/22] bus/pci: " Gaetan Rivet
2018-04-13 13:22 ` Gaetan Rivet [this message]
[not found] ` <cover.1523804657.git.gaetan.rivet@6wind.com>
2018-04-15 15:07 ` [dpdk-stable] [PATCH v7 " Gaetan Rivet
2018-04-15 15:07 ` [dpdk-stable] [PATCH v7 16/22] bus/vdev: " Gaetan Rivet
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=5579b2f2895eed8693bdcd5c6c90c8d2af77658c.1523625525.git.gaetan.rivet@6wind.com \
--to=gaetan.rivet@6wind.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/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).