From patchwork Sat Jul 15 17:56:36 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: 26946 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 744A4568A; Sat, 15 Jul 2017 19:57:07 +0200 (CEST) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id 871262A5D for ; Sat, 15 Jul 2017 19:57:01 +0200 (CEST) Received: by mail-wm0-f49.google.com with SMTP id w126so44531937wme.0 for ; Sat, 15 Jul 2017 10:57:01 -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=tAaWYiCajUteTplTeKqmMoco65NpxhBHA7n9hZBwAncRZhxe1m2q+VI5VPxdZYhIes iwAyKEiEKhSft5u8ol1aiDd9IUgXClF1mh7bik8D9c7w3veMPrR2zxbuS6L9/a7gMYAB j1LNW7vOss9ZDzcPdkRtAbCF2jQ84F5ik3oLfPOsVj6IrbtnNRZFI01q8Djp5V5rZ+5g DhQLRWAurSbFVrjZlGOl3fUVwbtTyr7tfB+Uq5NvA3MAo7R58AJSYe3D0BKmhJ0WKJF4 VAagKcwWEpXcO5QVL3FfoQ9OUfBDlxmlG1XBehNQ6523tWzSKEvhuA9eEXnwUaT6KJDa R0Lg== 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=SSsszsAWECxW9K5Z0NZplseMjP7JQ+QmQ8RdXSnpliRBT0yCAcPfLQ8bK2In/XXsXs RIsXpjCY08BhRUIQQn1zoBSYQrI0NdBEEkpbzzSAsGXrHv6lmkgrw9L1TMUAMs2eEsVg QglsPXLeLrfVG57Fmq98H+VlYzZre5VSIYf0rMA610C4AGicb68DBsSZkZjhy3NziRmG DzH1MukiCNSpxNhusALFQGkBtZ/bxewtSqdIRtJEPbtGrq8xXXThd6cAgrmR/by9QMiT WNdK28+rzZAuUivJUeeaVMTcL38XcyD4g9CBIwbcLjNSJle21jgvRabn7RxF+myg/tYV vrpg== X-Gm-Message-State: AIVw113et08ArPgEkimDDUTTVs/406O98Vs4ZZMvfPhQydaOfkH3CtH5 M9/6DA7YNTUJzHTUrCQ= X-Received: by 10.28.101.6 with SMTP id z6mr1598619wmb.106.1500141420582; Sat, 15 Jul 2017 10:57:00 -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 79sm2479445wmj.2.2017.07.15.10.56.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Jul 2017 10:56:59 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Sat, 15 Jul 2017 19:56:36 +0200 Message-Id: <1d0b78b93d5124f354fe880639a573d76274f02f.1499964391.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 v4 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;