From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 3EB847CFD for ; Thu, 29 Mar 2018 23:24:28 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id h76so12997637wme.4 for ; Thu, 29 Mar 2018 14:24:28 -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=/eyQ2v0oXHedW7lyFQR0H1RCpUBqJoevhVBtnUxXgNY=; b=EYbnq6Xx9sEXGPtg+yQtcOZ3pYyUwmaOUcvl7dkj/sBuaeNY4OchwNXRAWm7RoE3DZ wdFLRlNP+1o4rLg+mMJVKRt8SsXmywfjmUbXOC4ZU5rVNn/V8h96Ye0AS9FwYhO3JzHt sJvS3UW38r13KB/OC5hI+0EDgFN5vuZ2PphxITAgkSz3jUrsJw39FPmlrCNZLAbwhxIq HWHNIIHMON6uMknAC1wx5MMEvhKzmx0Kv15juNzGKKCEP4VUjOLauJ4GVwAFIifsOWW1 ZaU8EHJSAZMy2HmuWldnv0XbXWu9AKCUy68WtijMlHPg9E4UxYLYGg2rf3Cl9ODs1EYB EM/g== 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=/eyQ2v0oXHedW7lyFQR0H1RCpUBqJoevhVBtnUxXgNY=; b=Uowe3JdCwMmUp1WrdFgFscDUlbeHvMTOxqVbciIfO3fzkSV2qt0dQWIN+R5edZuGJf 5WofLXxjtC6cMmUQmOt3kLs3t7zHJHQBeB0v8NrHERR/+hP6hDI2hDyxeXOBnyVsEHeH 2OwCrKZqTZf7vY26Xzn9SHxnS0J/4urockFcTRz7XT82vyyTo/VSfbrnv1cz9LOmFpKM iNDtx7XgfMmHhgzQv+acMnwLEwvxU9R91iLt+OAngZbqsHuvYWK87Hv22whPn9fYtM/p uuyKcB4E0TuIBcZA6sWInalJ+4yRZ9L9W6em1p8dxzlwFo06iu1kWj54EiuU6DG2Qn99 OYhg== X-Gm-Message-State: AElRT7EpX4prUY3GfDq97KkwAuSvJg4VQWbJjRj2fRnVQKm1J4rfZaRx cS0BCsl9I+vdApiO+D2RafWLo26Z X-Google-Smtp-Source: AIpwx4+aKl63HI9IQm4YQGpD7W3nwW1JQ5BOQbYdS54V5aDWEcOHty+4IDkjh5v5vHo3w7aNAA0Rcg== X-Received: by 10.28.234.7 with SMTP id i7mr420964wmh.14.1522358667431; Thu, 29 Mar 2018 14:24:27 -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 m35sm11907457wrm.59.2018.03.29.14.24.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Mar 2018 14:24:26 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Thu, 29 Mar 2018 23:23:36 +0200 Message-Id: <4e66f445bdaffeeddf8a88be6d0d6b8845fb484e.1522358421.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 12/20] 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: Thu, 29 Mar 2018 21:24:29 -0000 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 --- 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