From patchwork Wed Oct 29 08:49:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1018 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 6BE1A805D; Wed, 29 Oct 2014 09:41:57 +0100 (CET) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by dpdk.org (Postfix) with ESMTP id 169F17FCC for ; Wed, 29 Oct 2014 09:41:46 +0100 (CET) Received: by mail-pa0-f44.google.com with SMTP id bj1so2737446pad.31 for ; Wed, 29 Oct 2014 01:50:37 -0700 (PDT) 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=LNdxiDbmuFrBW+EBcJaBgR/R6fYIcw9kEKRQuaz3fs8tjE7uqHrqXOFs+VCftDyau/ Zfpojx59awtguJsGh6/6nX6Y96SQWAvb/5N9b/9ShIVW/md6Vvj+vaDobNFTmB6ZWPD5 bljcZ7Z6JyJ9bJr2pt68OevEmz9/uiQkSesuiVMLtzUkqJp4CFHF/+y1MSwReadpXbwI xefdF8Mds+AdP+reXRTRvWVeXFQE7nIztgbZvtKrYtrENyX/757qpgPWUv5bO+ZVjpn/ cILQsjB2Sh4ip2/Ta0mZjwimBkttMEkpm6baErn+AonpJrF69yiy1wl71yRh6RkAsGQ3 NfLg== X-Gm-Message-State: ALoCoQnEvVAHpv6hjumWczd7tiJEAQw8n3sU+RdIjpL3sgrJFAzAVoR1QlgRbH9jyHV/FM3OeoN1 X-Received: by 10.68.216.70 with SMTP id oo6mr9181070pbc.124.1414572637407; Wed, 29 Oct 2014 01:50:37 -0700 (PDT) Received: from eris.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id ky4sm3686872pbc.55.2014.10.29.01.50.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 01:50:36 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Wed, 29 Oct 2014 17:49:29 +0900 Message-Id: <1414572576-21371-19-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414572576-21371-1-git-send-email-mukawa@igel.co.jp> References: <1414572576-21371-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 18/25] 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); }