From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) by dpdk.org (Postfix) with ESMTP id 2E9BA7FFE for ; Wed, 29 Oct 2014 09:41:36 +0100 (CET) Received: by mail-pa0-f41.google.com with SMTP id rd3so2732194pab.28 for ; Wed, 29 Oct 2014 01:50:26 -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=GAPh75Nyt/OiMlG4dgu8R5V9PkfVv6MFPqBfivvaFbs=; b=BCC4TjLch8XB87gIYWJKV/VqzSY0CCfpcQ/0Vo7EsBPwL8AkPrbcd9mKWx9bQgsq1N NG7KplxYaBq3m8WEZllj45Rp7GpeN3W2/BOU/jlZSNloKu8qi+dOXS4QufZCADMEVsEl ELU6FGqJjRwTrEzhTScvUGT6Z2ypM2xKm7weJ8Aac21ni65MmjrLw98hhmjvcUWyBDjR lJbP7uJw057Twl9SZHrra9GK1BtAdaNcDCR/E/+W23IDx36jY6mdTCPgfPyx3Tg4oa3Y 7LR7kVRcPI6u6tajgAh+xgUMES+eowN6O6BxpVOOzhzWMZ6pBKwhbmaK19LtwSJzFpAw kPpw== X-Gm-Message-State: ALoCoQnVLGq/yvFtjYQRvbXvX26EP/74aKVkZuzeu9tgBSDanCumJb5Fi4b1j2tebUKMyV8aNJcA X-Received: by 10.66.252.193 with SMTP id zu1mr202988pac.153.1414572626476; Wed, 29 Oct 2014 01:50:26 -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.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 01:50:25 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Wed, 29 Oct 2014 17:49:24 +0900 Message-Id: <1414572576-21371-14-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 13/25] 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: , X-List-Received-Date: Wed, 29 Oct 2014 08:41:37 -0000 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 | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 4c7d11a..aaa6901 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -44,6 +44,32 @@ 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; + + 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 +127,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; } -- 1.9.1