From patchwork Sun Feb 1 04:01:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 2877 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 C27055AD1; Sun, 1 Feb 2015 05:02:51 +0100 (CET) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by dpdk.org (Postfix) with ESMTP id 2C9765AB7 for ; Sun, 1 Feb 2015 05:02:41 +0100 (CET) Received: by mail-pa0-f54.google.com with SMTP id eu11so68344973pac.13 for ; Sat, 31 Jan 2015 20:02: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=IMIXoYw8USxaLQsnHod0VDfr4Ma7zHD2cMZA2moCSkA=; b=EX3E+A6mMOYgiATUDPnGc2qvCfsSpoprW9GSph0IT+OmCnmHllfgC12N63D8ND/YWH mUCNYofy/6AbVigrrvJRIdre05nQj/2fT0+4BiLhyGgNtqhVXIfVnMZvXxIYTiC97ZIg bWczuaa/dOreUKN5ch2wIVz51Nr3TkfNGjhT+DCGf+pG4Bn5pT5Q7IdLNxFWVvstz28z NVRqNWQa5+yx4G8hBL2P/7mFlzOtVz0VUP1fOqTDHyJkt3aa+POLKWOd61UsP5wgPZiC eRNnW9LVZ+6HvSoS93c5OdvAVyxdwqYsBCYyAtuBcuMLE2RVZnDBs9vf4mWG/bXjfl29 QrFg== X-Gm-Message-State: ALoCoQkK/axM7glBdElLvxL2RT9fO7s4yKVhkVOGnVypCrOy7PoxquTwJOIgwe1uT9JdF6gS1BgK X-Received: by 10.68.141.204 with SMTP id rq12mr19875750pbb.7.1422763360365; Sat, 31 Jan 2015 20:02:40 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id hd4sm5369241pbc.86.2015.01.31.20.02.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 31 Jan 2015 20:02:39 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Sun, 1 Feb 2015 13:01:56 +0900 Message-Id: <1422763322-13742-10-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422763322-13742-1-git-send-email-mukawa@igel.co.jp> References: <1421664027-17971-9-git-send-email-mukawa@igel.co.jp> <1422763322-13742-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v6 09/13] eal/pci: Add a function to remove the entry of 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 function removes the specified devargs entry from devargs_list. Also the patch adds sanity checking to rte_eal_devargs_add(). v5: - Change function definition of rte_eal_devargs_remove(). v4: - Fix sanity check code. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/eal_common_devargs.c | 60 +++++++++++++++++++++++++++++ lib/librte_eal/common/include/rte_devargs.h | 21 ++++++++++ 2 files changed, 81 insertions(+) diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 4c7d11a..5b1ac8e 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) @@ -87,6 +116,12 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) free(devargs); return -1; } + /* 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; + } break; case RTE_DEVTYPE_VIRTUAL: /* save driver name */ @@ -98,6 +133,12 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) free(devargs); return -1; } + /* make sure there is no same entry */ + if (rte_eal_devargs_find(devtype, &devargs->virtual.drv_name)) { + RTE_LOG(ERR, EAL, + "device already registered: <%s>\n", buf); + return -1; + } break; } @@ -105,6 +146,25 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) return 0; } +/* remove it from the devargs_list */ +int +rte_eal_devargs_remove(enum rte_devtype devtype, void *args) +{ + struct rte_devargs *devargs; + + if (args == NULL) + return -EINVAL; + + devargs = rte_eal_devargs_find(devtype, args); + if (devargs == NULL) { + RTE_LOG(ERR, EAL, "device not found\n"); + return -ENODEV; + } + + TAILQ_REMOVE(&devargs_list, devargs, next); + return 0; +} + /* count the number of devices of a specified type */ unsigned int rte_eal_devargs_type_count(enum rte_devtype devtype) diff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h index 9f9c98f..b5ad4b3 100644 --- a/lib/librte_eal/common/include/rte_devargs.h +++ b/lib/librte_eal/common/include/rte_devargs.h @@ -123,6 +123,27 @@ extern struct rte_devargs_list devargs_list; int rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str); /** + * Remove a device from the user device list + * + * For PCI devices, the format of arguments string is "PCI_ADDR". It shouldn't + * involves parameters for the device. Example: "08:00.1". + * + * For virtual devices, the format of arguments string is "DRIVER_NAME*". It + * shouldn't involves parameters for the device. Example: "eth_ring". The + * validity of the driver name is not checked by this function, it is done + * when closing the drivers. + * + * @param devtype + * The type of the device. + * @param name + * The name of the device. + * + * @return + * - 0 on success, negative on error + */ +int rte_eal_devargs_remove(enum rte_devtype devtype, void *args); + +/** * Count the number of user devices of a specified type * * @param devtype