From patchwork Tue Dec 9 06:30:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1869 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 6EFE2805C; Tue, 9 Dec 2014 07:31:19 +0100 (CET) Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by dpdk.org (Postfix) with ESMTP id 6D14E8055 for ; Tue, 9 Dec 2014 07:31:17 +0100 (CET) Received: by mail-pa0-f46.google.com with SMTP id lj1so6788580pab.33 for ; Mon, 08 Dec 2014 22:31:16 -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=84NTs0P69hBU5BJRbWEL5WNCmpPpi1z/Js6zWxWHROk=; b=HYUz+viWxdWUKu5qdKbGtPfFDT8o7Wy3ejyfvWbDSN/wo2pALVT7VhtZqgjVcVBQ8M ViTpcXP+sSWEKi1ZD/VimJgH9xfv7TM2m05p2DdInBB30Kc0mijhOihORSAkyATVtpm9 L3Njb+40zDr0j+6h4ZlFx5ooB7/dDXLQIFKXsr8VmVTUsKKzm8Wz26RRJf157cWmIvjK W++7CSjLgfr9e9AKcGh8SiJ4z7E1TtRH2T/KJEH7ugt1r5Z2L9cksQEet2FLd6o7SSTT 1aQL+do2yL2eRXD3HlvO+hXa0OjmvGBOoDZ7scTNrqN/WZpzIZzeJjSlPesJ8uw9tczo 5Zgg== X-Gm-Message-State: ALoCoQmMqGkZR6dMyXgupHDW4SjTbPQNzoPJPi5sGqPMPn3x7033LfOY+bfAA84yG4Cy7eB0h6ug X-Received: by 10.66.166.39 with SMTP id zd7mr2398716pab.11.1418106676781; Mon, 08 Dec 2014 22:31:16 -0800 (PST) Received: from eris.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id f12sm403088pat.43.2014.12.08.22.31.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Dec 2014 22:31:16 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 9 Dec 2014 15:30:14 +0900 Message-Id: <1418106629-22227-14-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418106629-22227-1-git-send-email-mukawa@igel.co.jp> References: <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> <1418106629-22227-1-git-send-email-mukawa@igel.co.jp> Cc: nakajima.yoshihiro@lab.ntt.co.jp, menrigh@brocade.com, masutani.hitoshi@lab.ntt.co.jp Subject: [dpdk-dev] [PATCH v3 13/28] eal/pci: Prevent double registration for devargs_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 rte_eal_devargs_add() not to register same device twice. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/eal_common_devargs.c | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 4c7d11a..f95a12d 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -44,6 +44,35 @@ struct rte_devargs_list devargs_list = TAILQ_HEAD_INITIALIZER(devargs_list); + +/* find a entry specified by pci address or device name */ +static struct rte_devargs * +rte_eal_devargs_find(enum rte_devtype devtype, void *args) +{ + struct rte_devargs *devargs; + + if (args == NULL) + return NULL; + + TAILQ_FOREACH(devargs, &devargs_list, next) { + switch (devtype) { + case RTE_DEVTYPE_WHITELISTED_PCI: + case RTE_DEVTYPE_BLACKLISTED_PCI: + if (eal_compare_pci_addr(&devargs->pci.addr, args) == 0) + goto found; + break; + case RTE_DEVTYPE_VIRTUAL: + if (memcmp(&devargs->virtual.drv_name, args, + strlen((char *)args)) == 0) + goto found; + break; + } + } + return NULL; +found: + return devargs; +} + /* store a whitelist parameter for later parsing */ int rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) @@ -101,6 +130,12 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) break; } + /* make sure there is no same entry */ + if (rte_eal_devargs_find(devtype, &devargs->pci.addr)) { + RTE_LOG(ERR, EAL, "device already registered: <%s>\n", buf); + return -1; + } + TAILQ_INSERT_TAIL(&devargs_list, devargs, next); return 0; }