From patchwork Tue Nov 4 03:45:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1099 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 3E7D47FA0; Tue, 4 Nov 2014 04:37:28 +0100 (CET) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by dpdk.org (Postfix) with ESMTP id E5FB07F74 for ; Tue, 4 Nov 2014 04:37:24 +0100 (CET) Received: by mail-pa0-f43.google.com with SMTP id eu11so13554654pac.16 for ; Mon, 03 Nov 2014 19:46:40 -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=GAPh75Nyt/OiMlG4dgu8R5V9PkfVv6MFPqBfivvaFbs=; b=l9R/pYl5O/5+Dgz4XRCKgknXnuRp42O/wjlzC1ZBtGTDQMc5cb8pLyi/dOKuIbD/M+ GMgiRVekYRq9NfuyOGg1CDNJCVsasqvWlvLhQX9badUL8o5MwC5Uh+2udEUG1CyhmaXB GczTPJetq8d4MyLpvofkgjoVUMkewHADb9OGz1uYrKvFqDUNGmTIBJ5MTNanE3vSfRLs cFzz8jd9rJiTs2/5VJ4SLkmgAwfsG5hPyMXEvr+xyxOEljiL6681S7W/0Cc5FxKhzHmc CXSxzGdLd8fwrTcTDRTA1vxAA9crQwsecdT99jwOACBSZqhW8jebdlOpS5htd/4G01Pn lAJw== X-Gm-Message-State: ALoCoQm+beZ6Ouaui6KUdS1SpybMWJut6SxBE0iOsH+MyJCjWl+1EcsM444NNJMTT8qmuS4Zm18S X-Received: by 10.68.101.131 with SMTP id fg3mr7421425pbb.130.1415072800907; Mon, 03 Nov 2014 19:46:40 -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.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Nov 2014 19:46:40 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 4 Nov 2014 12:45:33 +0900 Message-Id: <1415072748-31937-14-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 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 | 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; }