From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 1B82A7D19 for ; Wed, 21 Mar 2018 18:16:12 +0100 (CET) Received: by mail-wr0-f194.google.com with SMTP id 80so4891115wrb.2 for ; Wed, 21 Mar 2018 10:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=syXrSa9YC1OOkH9j4QYjWDBXqn/SgOQQsLC8njyCSyo=; b=pyt73YACbH3d3ODPg+zMRvscFE/Gypriju1Qiml4fCLPz69bmAcWl2nPpIUiYEpk56 H7xg+vv+Lin9QLrvoT1qsMDMu/UGtzl42uwBmmcZhm91gKzJ/TjWB+EzIolsafiRuYG6 ZTwTHOuyiJS6cIKS1Gz9DM3gnDeDumZ/KuFVG4xn/xSaAa7NKN3KgplHMGSoGgbeR1of WAe0OI/7MyBLJ2rosPPq2FZikRM++3W6UDtx4meqydFaVOosW7KpUOS4P6pBkgkGLn8f uKK84GAd4Njl+M5LgXWkpCky7Y+drcpAYwawIwNKwLwf7xE2DlEANZC39hOX0xNhTpuv XQHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=syXrSa9YC1OOkH9j4QYjWDBXqn/SgOQQsLC8njyCSyo=; b=lvfxMZwVl4ZvhZ0EvgfUa9zC3U1pegkgHhqv7qgy33yaLrILAEMkF2OzopliJ1W6sC jw+CpVlUw4tfV9EYboZv9J2u9Nl4b5KrBy6crb0evJplWpvq1Y54RJMKnz/TX8l9RZPj 3lW5pWuoxBsIgQCffzBFU4Zv3ySIuJ/B5mOzPP1d5NU3ZX3DVOORqWYrwoGfKFYM8JTN LrSKTr0f78r26iE6/eBOZt9sQ0rC+BoxaeG8eTqnfjBVdv58b4OvXwWniK2a17kdiPzu HJjFNW+ocsHYjbjD4KQy1gX2VqSrwfZLAQ6Y6BTGAPnlMDbNJgiqowPnywggRFmDZx6l UlKw== X-Gm-Message-State: AElRT7H2JkcjOAqjC2r809Zy224FHO5QeqDcJJ+z0x1X9fEibG2Ubs+9 1QWAimfJ9lm5pWMan0NryIxyiWrC X-Google-Smtp-Source: AG47ELv0zWGiy4WWHchhiJpZq6BBpizfzey1oO73zC0oiyERjB3su4ERjdwFkxykx1nN0hsjcoNP7g== X-Received: by 10.223.176.36 with SMTP id f33mr17990022wra.75.1521652571422; Wed, 21 Mar 2018 10:16:11 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id l10sm4224101wrf.37.2018.03.21.10.16.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 10:16:10 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Wed, 21 Mar 2018 18:15:31 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 10/18] bus/pci: fix find device implementation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2018 17:16:12 -0000 If start is set, and a device before it matches the data passed for comparison, then this first device is returned. This produces potentially infinite loops. Fixes: c7fe1eea8a74 ("bus: simplify finding starting point") Cc: stable@dpdk.org 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 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