From: Yuanhan Liu <yliu@fridaylinux.org>
To: Gaetan Rivet <gaetan.rivet@6wind.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'bus/pci: fix find device implementation' has been queued to LTS release 17.11.3
Date: Sun, 6 May 2018 14:36:25 +0800 [thread overview]
Message-ID: <20180506063639.23196-12-yliu@fridaylinux.org> (raw)
In-Reply-To: <20180506063639.23196-1-yliu@fridaylinux.org>
Hi,
FYI, your patch has been queued to LTS release 17.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/09/18. So please
shout if anyone has objections.
Thanks.
--yliu
---
>From 899885d1c17155a6d24e004e6e1dfcde3789f14d Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Fri, 27 Apr 2018 16:13:05 +0200
Subject: [PATCH] bus/pci: fix find device implementation
[ upstream commit 64de7e4069b9b84b0f2d840b44e334233412d55f ]
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")
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 104fdf904..6789748e2 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -488,17 +488,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 d4a299641..c6af61d74 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -103,6 +103,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-05-06 6:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-06 6:36 [dpdk-stable] patch 'mbuf: fix Tx checksum offload API doc' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'mbuf: improve tunnel Tx offloads " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'app/crypto-perf: fix excess crypto device error' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'examples/l2fwd-crypto: fix the default aead assignments' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'crypto/zuc: do not set default op status' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'crypto/zuc: batch ops with same transform' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'crypto/dpaa2_sec: fix HMAC supported digest sizes' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'mk: fix make defconfig on FreeBSD' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'mempool: fix leak when no objects are populated' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'test: fix memory flags test for low NUMA nodes number' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'test/mempool: fix autotest retry' " Yuanhan Liu
2018-05-06 6:36 ` Yuanhan Liu [this message]
2018-05-06 6:36 ` [dpdk-stable] patch 'net/sfc: add missing Rx fini on RSS setup fail path' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/bnxt: set padding flags in Rx descriptor' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/bnxt: fix endianness of flag' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/bnxt: fix Rx checksum flags for tunnel frames' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/bnxt: free memory allocated for VF filters' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/ixgbe: enable vector PMD for icc 32 bits' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/bnx2x: fix for PCI FLR after ungraceful exit' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/bnxt: avoid invalid vnic id in set L2 Rx mask' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'app/testpmd: fix command token' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/nfp: fix mbufs releasing when stop or close' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/tap: fix icc build' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'drivers/net: fix link autoneg value for virtual PMDs' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/sfc: process RSS settings on Rx configure step' " Yuanhan Liu
2018-05-06 6:36 ` [dpdk-stable] patch 'net/sfc: ignore spec bits not covered by mask' " Yuanhan Liu
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=20180506063639.23196-12-yliu@fridaylinux.org \
--to=yliu@fridaylinux.org \
--cc=gaetan.rivet@6wind.com \
--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).