From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 20CC35F2D for ; Tue, 27 Mar 2018 01:19:20 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id u11so8203038wri.12 for ; Mon, 26 Mar 2018 16:19:20 -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=L/CDQCz+Ef7RYztyWGL1MnixPEBAL/aNK9QGcfu+4k/574QWrRgxKccch+w+EmExuM xmaHtyKK/pe0IBRz+9YMU7gbUVuwiGjpw2kQO6oOnWUmxwOsF7nvKn7xIAXExmrVsLNM D4ZiSk0QEngsYtTZtS7+N8hdgM4G2YVupMoy69partyaq+rPYhIqJbQB4YtLFiXYwqAy xJdFDJqYZeZJBp3kq6WwTkx0bWocdWpxPyD8L7fVORl7Hg2layb/6OwG8ICq4vX+Ckmt ZDSjaKq5Xt55E5SYI92AqH9XLAGLGQzvcLB5gu7h1Mg61n3x3bHgfJAUYr0+Sk5xS8y1 XPIw== 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=tCqDo3ObUFz3jPnSg2uZDBAjRkWrdvqWpYCxtVFsctxu/fuAQWv3j2dJ23LAEKDjOb JSRgGEPyBKORJ6fQxw2bNpOJw3heAgJX7t4PZ1pgvlq7AY/L9grxpCEqppCCLWh2CV+V tnafqLwTn8cXQt1dtMgqkIP976IEYgSwaQip0rWSlSmkFgEeUZERDd88zIG1s7tqj0vn 2XXAcuMewSZGqkdt4H9E1J6bUa+4Ys1D4AiA9oW2UgONMm5MkIQr2AMhjpalHa9XuepC QR7PjpVn2myPOkkQM7HaDGtehcXfjuMpv/0YdQU6pVRF8TOLKU1OS+JBnYgMjTrBQvRD tt+w== X-Gm-Message-State: AElRT7Gqb+TgDCEyvJYndI4yiXFP3KhnXb88GvBaBYwaFnFnQamkYaio ddsl3V3EkwQ4USDH8fESLuyKACQQ X-Google-Smtp-Source: AIpwx48zEnMK+Fw2xfl7WYgj9YjSnp+sWsZRhUmZ9AkxfTMpGim5hWQ9QSLVxG5w4ciBZJy/J6473g== X-Received: by 10.223.156.198 with SMTP id h6mr6728715wre.175.1522106359407; Mon, 26 Mar 2018 16:19:19 -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 67sm343712wra.9.2018.03.26.16.19.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 16:19:18 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Tue, 27 Mar 2018 01:18:36 +0200 Message-Id: <40b72bda391149b260a576cd82b0fde8460c0fa4.1522105876.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 v3 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: Mon, 26 Mar 2018 23:19:20 -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