From patchwork Tue Apr 24 11:31:10 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: 38796 X-Patchwork-Delegate: thomas@monjalon.net 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 773E42BDB; Tue, 24 Apr 2018 13:31:36 +0200 (CEST) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 8E80B100C for ; Tue, 24 Apr 2018 13:31:31 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id v60-v6so49558783wrc.7 for ; Tue, 24 Apr 2018 04:31:31 -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=BJm+U1h9jqRR93OJwpIn/I8V8dongIYDXOuaFP1+rZKjavrvG1Sn/9738qKzadBM43 RWYbGlhEszcC6VoskZbOBW3xxFKEFkMArl+3hY7kBP7X7y1cY5jBUdeUa8/RX8Vm+5C/ v8sFeNJtOjI25F9kFx2AxKSGjZyyJy2KpSwVar9Kf7A0EmcmXu7/RlxfXsJeQ/nPNiJG dY1Y0Ai+4fLS1g42Rq+/P0YqE2gcllBbebXEkmo8+GW81V7QA4KsoBGDxDbxmRmAzdl7 TrYQfIL7Op2Rq+jVZB9pTAtWmKTZ1OeMOLbwC2/YvwoUbVfM5VF8Rb6Yd90dYif99b2i Wd5g== 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=XrkJzhnCrj3vRiqOwBe5JC80zH9sa2N1k8RN5ZwPWPrFtCB3yzI+WL8MlPIF3CrknR 3wXaqY3EyDZkHW4Uj7Wz7tmkFoy4BSb+J0NKErvD2o04j7PiIjdGcEGwXk++agDcxp6G gpt4Y7Du/pPzjSp0EKLXQvlyo74BMog9JXBKwM9mNKfEaLDy+EquX3beLI5naL5d/irj iE3CzoBBTkjnMzdkfy2QFRz2dgwuJcusDjUuVOU8uodY4ot13DUvu3gR5vvo6NGfa/T4 e9vHjOZfFqeZCpLcYO8qXNa3tL5+Xni0pj+prmVffVtel7yUd8ubETFQJMj9wwHjBEFh +ZNA== X-Gm-Message-State: ALQs6tBXI8rz6sGeOilXGlluIgBvvEy6BQc/WB9FKge2ig0VGkUAPGhN N0mSY3Sw2xH2PwRBBPqNjpuvsYnc X-Google-Smtp-Source: AIpwx4+rA0suse4gbAImCRba2tlpNBPsSGYlMlFnphovMZITRWmZpCOtm+GY3SVDTNEQL7kQzeqP9Q== X-Received: by 2002:adf:c4c4:: with SMTP id o4-v6mr20714776wrf.173.1524569490866; Tue, 24 Apr 2018 04:31:30 -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 u37-v6sm16138844wrb.53.2018.04.24.04.31.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 04:31:30 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Tue, 24 Apr 2018 13:31:10 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 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 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, ...) */