From patchwork Thu Nov 20 09:06:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1376 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 D8F2B8005; Thu, 20 Nov 2014 09:57:23 +0100 (CET) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by dpdk.org (Postfix) with ESMTP id 131F77F7C for ; Thu, 20 Nov 2014 09:57:20 +0100 (CET) Received: by mail-pd0-f170.google.com with SMTP id fp1so2722820pdb.1 for ; Thu, 20 Nov 2014 01:07:48 -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=NarW9W0VQJpn3YrhFA8+/+JSmvYSoCZIZHK1q/QBtDpEjO1ZmLPNaB8dyrzRT6kiEs n9sIJAU25BB7rBQr9WIv0w3+jKsfEfq9mvE+1RmZecJKKdH0vzSICI9pBlFiJ3vo+LD8 gwLDozWf7F1qMLQT4hU0ZIoCBLB3RqdDZfbrRXOLNG7T5P+3L0R9/tUQFPBBDfcwZEmO sXj1LxyF19OdUaggWf7g6FG7mJqCuaFB27siIBuqg3JkY4qK20kAIATnL9GiVQxJxG6i RkG/28GMskGMXEFZ27BWQN0uFS5BjvvGD9u3pKeNBiEnhf2ovu1/dqYA4nfBSF0oW/Bf 1xRw== X-Gm-Message-State: ALoCoQkkNtFhEgEnfUJ3gzHcNc6KtmPGJUDEjGHkPZqD7Rv1ULP2LIUaD9OuBXpUa6Iw3Z4otTcM X-Received: by 10.66.157.39 with SMTP id wj7mr29621326pab.117.1416474468780; Thu, 20 Nov 2014 01:07:48 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id a6sm1432407pbu.64.2014.11.20.01.07.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Nov 2014 01:07:48 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Thu, 20 Nov 2014 18:06:27 +0900 Message-Id: <1416474399-16851-14-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> References: <1414572576-21371-1-git-send-email-mukawa@igel.co.jp> <1416474399-16851-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 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: , 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; }