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 v5 12/21] bus/pci: fix find device implementation
Date: Wed, 11 Apr 2018 02:04:13 +0200 [thread overview]
Message-ID: <7f268a74f810f50e4451c1f0dbea656baa861e4c.1523404469.git.gaetan.rivet@6wind.com> (raw)
In-Reply-To: <cover.1523404469.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1523404469.git.gaetan.rivet@6wind.com>
If start is set, and a device before it matches the data
passed for comparison, then this first 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/pci/pci_common.c | 21 ++++++++++++---------
drivers/bus/pci/rte_bus_pci.h | 3 +++
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 2a00f365a..2c45f8151 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -459,17 +459,20 @@ static struct rte_device *
pci_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
const void *data)
{
- struct rte_pci_device *dev;
+ const struct rte_pci_device *pstart;
+ struct rte_pci_device *pdev;
- FOREACH_DEVICE_ON_PCIBUS(dev) {
- if (start && &dev->device == start) {
- start = NULL; /* starting point found */
- continue;
- }
- if (cmp(&dev->device, data) == 0)
- return &dev->device;
+ if (start != NULL) {
+ pstart = RTE_DEV_TO_PCI_CONST(start);
+ pdev = TAILQ_NEXT(pstart, next);
+ } else {
+ pdev = TAILQ_FIRST(&rte_pci_bus.device_list);
+ }
+ while (pdev != NULL) {
+ if (cmp(&pdev->device, data) == 0)
+ return &pdev->device;
+ pdev = TAILQ_NEXT(pdev, next);
}
-
return NULL;
}
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 357afb912..458e6d076 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -74,6 +74,9 @@ struct rte_pci_device {
*/
#define RTE_DEV_TO_PCI(ptr) container_of(ptr, struct rte_pci_device, device)
+#define RTE_DEV_TO_PCI_CONST(ptr) \
+ container_of(ptr, const struct rte_pci_device, device)
+
#define RTE_ETH_DEV_TO_PCI(eth_dev) RTE_DEV_TO_PCI((eth_dev)->device)
/** Any PCI device identifier (vendor, device, ...) */
--
2.11.0
next prev parent reply other threads:[~2018-04-11 0:04 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] " 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 ` Gaetan Rivet [this message]
2018-04-11 0:04 ` [dpdk-stable] [PATCH v5 15/21] " 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 ` [dpdk-stable] [PATCH v6 16/22] bus/vdev: " Gaetan Rivet
[not found] ` <cover.1523804657.git.gaetan.rivet@6wind.com>
2018-04-15 15:07 ` [dpdk-stable] [PATCH v7 13/22] bus/pci: " 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=7f268a74f810f50e4451c1f0dbea656baa861e4c.1523404469.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).