From patchwork Mon Jul 10 23:19:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 26737 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 81E557CB1; Tue, 11 Jul 2017 01:19:33 +0200 (CEST) Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) by dpdk.org (Postfix) with ESMTP id 6017C5699 for ; Tue, 11 Jul 2017 01:19:27 +0200 (CEST) Received: by mail-wr0-f181.google.com with SMTP id c11so159266079wrc.3 for ; Mon, 10 Jul 2017 16:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=wFexy0TjWuZJ6peWbD+EhxRdp9oO55b6+FeG+BFq+VM=; b=hYN6UiP1BGr1f7lwH5G+VTb2IUx3f7oE27Vi7NNrJRyVlOZWalorjOUPMsgMd/llxa xtaV6hbyRtZKzDsJhBQ7RHPibytoO0FTLOJk48b4ZoHOYK7MLJue1S9RzeksL4iolU0H mPhKuaPdF1kEzvAOk+3frayJr8He5gYrf4PrA5Ez4S7b1ETDkWchBOfCJbD5/Rrvu9m1 RQZf/bejsZ1leQx8W5OexpgTnipFQCAEhr1/3h4+M/Kpf4hqToEHO0nN+xZ88JzbnyQK xIqZc84Oh9L/zuOGFUt0eHA0W0ydEbK9Aoq29o1Wq5ADCrXZ0/UcSGaA4hGERrE0VI/J ROAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=wFexy0TjWuZJ6peWbD+EhxRdp9oO55b6+FeG+BFq+VM=; b=HHlN/nWZCNLVP9AFHrEvMlWbeM+wUe5H/QNcmYoiWnilNBWzIYS387eLRvQMy9z4hW 3S8qUMZpSSBv6gAvXRu/xgRUEbF+c16VmDbymYtsL/2lvOSrLtuFbSHhTaWSDUAs4oJ8 BZaEN3g5PMter3yJajrBjz8l2w/XelcuodvV64j4btzYU0IYTyUqfZbh9bDGzdVOFEir 3gx9RfanscA0q/0jU7Z+dwXZjgqbcPtc5pL/v6IO9DTrWN1kyPYUoCr2xN5J2qncW/CY caKNcccHOJEIuwgb90N4z+havFC2FVCPwitkGw3OHOSyKm0rd878pTVpCINi4tk7LI1T sTog== X-Gm-Message-State: AIVw111RUn5pHc6K5mayOhmA5Djmhrj/5ELrb1wPP9+bxQoW+kDTKy1v 8+GUJFVt7Bf6XpMZBYU= X-Received: by 10.28.14.149 with SMTP id 143mr369828wmo.105.1499728766437; Mon, 10 Jul 2017 16:19:26 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id j190sm43773wmd.22.2017.07.10.16.19.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jul 2017 16:19:25 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Tue, 11 Jul 2017 01:19:01 +0200 Message-Id: <56989f7ab5634768809c975be95d17a61c7075e9.1499728330.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 2/8] devargs: introduce removal function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hotplug support introduces the possibility of removing devices from the system. Allocated resources must be freed. Extend the rte_devargs API to allow freeing allocated resources. This API is experimental and bound to change. It is currently designed as a symetrical to rte_eal_devargs_add(), but the latter will evolve shortly anyway. Its DEVTYPE parameter is currently only used to specify scan policies, and those will evolve in the next release. This evolution should rationalize the rte_devargs API. As such, the proposed API here is not the most convenient, but is taylored to follow the current design and integrate easily with its main use within rte_eal_hotplug_* functions. Signed-off-by: Gaetan Rivet --- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 + lib/librte_eal/common/eal_common_devargs.c | 19 +++++++++++++++++++ lib/librte_eal/common/include/rte_devargs.h | 18 ++++++++++++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + 4 files changed, 39 insertions(+) diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 381f895..40cd523 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -207,6 +207,7 @@ EXPERIMENTAL { global: rte_eal_devargs_parse; + rte_eal_devargs_remove; rte_eal_hotplug_add; rte_eal_hotplug_remove; diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 49d43a3..bcdee13 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -41,6 +41,7 @@ #include #include +#include #include "eal_private.h" /** Global list of user devices */ @@ -182,6 +183,24 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) return -1; } +int +rte_eal_devargs_remove(const char *busname, const char *devname) +{ + struct rte_devargs *d; + void *tmp; + + TAILQ_FOREACH_SAFE(d, &devargs_list, next, tmp) { + if (strcmp(d->bus->name, busname) == 0 && + strcmp(d->name, devname) == 0) { + TAILQ_REMOVE(&devargs_list, d, next); + free(d->args); + free(d); + return 0; + } + } + return 1; +} + /* 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 a0427cd..36453b6 100644 --- a/lib/librte_eal/common/include/rte_devargs.h +++ b/lib/librte_eal/common/include/rte_devargs.h @@ -163,6 +163,24 @@ rte_eal_devargs_parse(const char *dev, int rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str); /** + * Remove a device from the user device list. + * Its resources are freed. + * If the devargs cannot be found, nothing happens. + * + * @param busname + * bus name of the devargs to remove. + * + * @param devname + * device name of the devargs to remove. + * + * @return + * 0 on success. + * <0 on error. + * >0 if the devargs was not within the user device list. + */ +int rte_eal_devargs_remove(const char *busname, const char *devname); + +/** * Count the number of user devices of a specified type * * @param devtype diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 0f9e009..a8ee349 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -212,6 +212,7 @@ EXPERIMENTAL { global: rte_eal_devargs_parse; + rte_eal_devargs_remove; rte_eal_hotplug_add; rte_eal_hotplug_remove;