From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id EF4AB2C72 for ; Sun, 6 May 2018 08:37:45 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 9B64C2244B; Sun, 6 May 2018 02:37:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 06 May 2018 02:37:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=guIba2ctKH40E30wR o0QSeAZWP3QVSD54CZqJsv6GLc=; b=O/2m0aDM+n2lOfCIFENEkHSzRVo6pwMlP 7XhKRVBUUnZO7owg9V1/+GAuBEtx7bThPlIrfJwPtAeRlievAzSJY0sE+A8JIx7z PyrcDEKlWfqkGnXJqzz9agW+qyWg2laHO0rPq4MKiVjIl5SEnHzpM2bRnRpulQmD HkKWHn8KdepTrvB16PtqQ0UpNV49rDlQrE8THWvUQ0g2w/UJewwq3pNaYngYbZ/G FuU5QNccv6c8E+7KVPOTnVwd6bR1X8pLn3s6FZhnvuStcZunGaJke6OCKX1U2TVH /ozdaHeMfLuaLHLjT5n1yeSrPN9ctEqxsvrg2rm02C2qWZ3FJz+6A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=guIba2ctKH40E30wRo0QSeAZWP3QVSD54CZqJsv6GLc=; b=jG0wA3Nd y582rq3GBBIvzi6TUJOFmyE126UTi58aGSkzt718dcGaY81dtY/dzlK/Y+voMr0l /8vtFyPWSQ53EvbGY5DqfvVdNNcqEkefv6EsfyWefdtm6kT/eKtoeTn1PwHDVu5T yeKH11+ARL+88i6uaDFGb8Icvv0+1UgG53uWwlBskmaFkqSVm62ooqqKLpGw3KJ1 0VzpmzM5Hnmizay8clmxDR/7KMoHmFv2HBGomo0TlLPlNnzIsaHsEbPrRxBFbhLa bkY3iS0aGKRdYVM4pEh1acezkjIoTWHnLR2iiYvjcSbPoWq8D2PzO63CWxLe7KQE SlnpkNWmBwE9gQ== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.102]) by mail.messagingengine.com (Postfix) with ESMTPA id 091C31025C; Sun, 6 May 2018 02:37:43 -0400 (EDT) From: Yuanhan Liu To: Gaetan Rivet Cc: dpdk stable Date: Sun, 6 May 2018 14:36:25 +0800 Message-Id: <20180506063639.23196-12-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180506063639.23196-1-yliu@fridaylinux.org> References: <20180506063639.23196-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'bus/pci: fix find device implementation' has been queued to LTS release 17.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 06:37:46 -0000 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 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 --- 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