From patchwork Tue Nov 4 03:45:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1105 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7F6707F40; Tue, 4 Nov 2014 04:37:38 +0100 (CET) Received: from mail-pd0-f177.google.com (mail-pd0-f177.google.com [209.85.192.177]) by dpdk.org (Postfix) with ESMTP id 1719C7FB4 for ; Tue, 4 Nov 2014 04:37:34 +0100 (CET) Received: by mail-pd0-f177.google.com with SMTP id v10so12613509pde.8 for ; Mon, 03 Nov 2014 19:46:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fzagOiS8r6RFnDGv3SV8LFnU8IeQyOodTOuNlmdHac0=; b=AKCj1HTouPQDAxkvBb+6Wemqe8sjCq5b0PattbaAaSj6vOHwtIOzSMEcYlC4U2ml1M mZ9KsvTVA3X8MIl0NXUkU6SnvQKTHRsg2q7KfTg3XAjmo4cuTjmspxHH1/yjQJPbxfOl ZeYYnuLC77hAcD5Iwo+7FhhRWzwK7zUcA5cvXb4APVO9Ey3p+I3hoNZGax5Yba0Y24M1 2y0fhqSvHIWHnf6UWjwJT6Xbl3gMY7qPr7e0QwRU5Qq5ph9WaZvzzytClorwdxqDuNae 0n5KyPWAOlVLdGMC8dAyH+fUIvVJLgyjLNoHI8KOLE2zaupS0n48aAN7KiJMid5Z/tyJ O9Hg== X-Gm-Message-State: ALoCoQklV8uQ7uYDgAyPEPG3iPAw4svy1WRxz8qWT09e5aBMbc2ZPgnIPPJSYi72gyj2a2SQumqB X-Received: by 10.66.242.203 with SMTP id ws11mr47822527pac.69.1415072811311; Mon, 03 Nov 2014 19:46:51 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id jc3sm18430580pbb.49.2014.11.03.19.46.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Nov 2014 19:46:50 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 4 Nov 2014 12:45:38 +0900 Message-Id: <1415072748-31937-19-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415072748-31937-1-git-send-email-mukawa@igel.co.jp> References: <1414572576-21371-1-git-send-email-mukawa@igel.co.jp> <1415072748-31937-1-git-send-email-mukawa@igel.co.jp> Cc: nakajima.yoshihiro@lab.ntt.co.jp, masutani.hitoshi@lab.ntt.co.jp Subject: [dpdk-dev] [RFC PATCH v2 18/28] eal/pci: Prevent double registrations for pci_device_list X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The patch fixes pci_scan_one() not to register same pci devices twice. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/linuxapp/eal/eal_pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 57a5887..c70e8ea 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -292,14 +292,17 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, } else { struct rte_pci_device *dev2 = NULL; + int ret; TAILQ_FOREACH(dev2, &pci_device_list, next) { - if (eal_compare_pci_addr(&dev->addr, &dev2->addr) != 0) + ret = eal_compare_pci_addr(&dev->addr, &dev2->addr); + if (ret > 0) continue; - else { + else if (ret < 0) { TAILQ_INSERT_BEFORE(dev2, dev, next); return 0; - } + } else /* already registered */ + return 0; } TAILQ_INSERT_TAIL(&pci_device_list, dev, next); }