From patchwork Fri Apr 27 14:13:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 39116 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E6ED8AA97; Fri, 27 Apr 2018 16:15:57 +0200 (CEST) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 95FAD8D85 for ; Fri, 27 Apr 2018 16:15:54 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id v60-v6so1935602wrc.7 for ; Fri, 27 Apr 2018 07:15:54 -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=pH7OvR+ZGgvRcEaQLAWumOvI/rH2PgZY2RrgOkb8EkU=; b=yWytgVqkD53JzHNQQDWd7AZfBQAHfRikhlAo8MFEwWdxbXqq+ehwK9eycPmN2w17Zo Fhsh0jmh1RhBNP6wRpgiCGPZHOKCo4RDkG5Slun+tVmTwd7SM8zoTYuSEOsT+MrT8Bs9 QGFFifQfaFSMG/ad/C/LR5Qajc7AZzEWCxjqYrUql4XS/4j+RG50zZGCUiVtIfANkfA6 SKPVSdy0STIs8F70tAMx3ZuXlHpZCW3s3knw/s7z5q7EHh8/x27hXtWNwixKcH4WVlVQ qJMLhmqrvsGuwfkamtH4yg6W3yqyL691CCJZosfDXPsOwDZCSWczvBTmvlW4o2sVukA3 Ykjg== 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=pH7OvR+ZGgvRcEaQLAWumOvI/rH2PgZY2RrgOkb8EkU=; b=ad2GS1PnbvOtpRdzSvPdFte16IyzWqeXK3dL7IO4hWqTcNL6azfk5ytOxFvPvukNtc /OSHy341eG0oyaXaT48cg3vrKLAZOAqQJCNiXPL0/g7enBt8Z7GzLcJMc68c04LRxuQg 5DI+MdxAg5n8OXMmZ3GKS/xfLRz5SFpvbR8dlxOWSsYVBmqdAyjjod37R6hlz1X4OGgA SUNFVvECDwjqbYgj/WLPJQHD9iWb7uUlBrIGfSbqVEzEzEqhuNQe1XpRlsopXnvkctHq I3TK7op7YXint3Pvh9ta4fGLxGEZ5XwM2B8nNCYhpoCjWR3x5e2ppDz9JlmOYNhq4TIX 85KA== X-Gm-Message-State: ALQs6tAbkQwNIiq3gcpewmBIFnOor3BY69zBajNSYg08W58NnHfaoC2r FbY9/XinTI899uwc/CzqjALdWKin X-Google-Smtp-Source: AB8JxZpkMiQSZwQJ7UDUdrTJGZdRd1tMM4nquO2+fZymq9b5FeV4MU1tdZNDS8TVE4jvgimoh/I/wQ== X-Received: by 2002:adf:80e4:: with SMTP id 91-v6mr2052742wrl.258.1524838553926; Fri, 27 Apr 2018 07:15:53 -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 b10-v6sm3297374wrn.42.2018.04.27.07.15.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 07:15:53 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Fri, 27 Apr 2018 16:13:05 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 1/2] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 6bed0bc9d..7215aaec3 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -455,17 +455,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, ...) */