From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by dpdk.org (Postfix) with ESMTP id 34BE7559A for ; Thu, 30 Aug 2018 15:42:45 +0200 (CEST) Received: by mail-wm0-f46.google.com with SMTP id s12-v6so2059751wmc.0 for ; Thu, 30 Aug 2018 06:42:45 -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 :mime-version:content-transfer-encoding; bh=UCDR0M0DtcuI3oK7gjdz+Az6MHSirgQY9BaN5ez27SQ=; b=Tp98UgZtquoQ+acX7r+WAzhIV9EMxh6pUzVx5/NQ/RieAmsSN1NOs6zVo23nS3eZtJ 7DD2jHKdP3vZsLdTbxKovt8pZ4Hj3gjSO3097FlIepTuyAc1VPksc/Y5oi4IPqAJhTIk bkC6r1ojJl/ymkOrt82W8PkDceeOj9giWmqwM+CK/ZaTuthmQfePkeWaBu6nwDdsWuXD C/ZK4+1N4kcvV1XOjR+r7zKVqergxr1aqt9Oz7wX43IoEapyZHoHA4On6hwItqtXemUC fUaZgi66l67afSsbAmPnt1ksiVjWplEj1MDEqpUCErJ7UqYxP/5/Acnl/mtHcAH3Gjt9 GP1A== 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:mime-version:content-transfer-encoding; bh=UCDR0M0DtcuI3oK7gjdz+Az6MHSirgQY9BaN5ez27SQ=; b=lSLYy7wwczqO1GyEVLRWz2jQGyiZjoPfwbreaa8t92A8PkiPszVhMDyG+0bMKXgHW1 xweY5dpHm1T366sJBWFPatizoRvRuCBSlkwHNiAlzy2TLYWMkINMo1R+krd3RfSetbNP PxyZNc4lzxq1BeqzB2ourdacvcxUrKoAMD9/4BCnoBYxeeIGargG8ZOpTmBEQqfiQ3Tc hxhjaLTyd678QIvaOQ6rJoxCj0krWvBf3e53xQllJsO9th8Tpp/4Uy89SF32aw8L38kw pZd3SbwQ4eNSqSz6A3LagxIjpI2Hi7Ef0n0c4FyotH4FhTlpWmqAeS6ZBhHggPXWzSho ftUA== X-Gm-Message-State: APzg51Aw/FNYWwLalEOCkDN0MOuvGmAwcJYz0VQLqyWZC+H87qMsP8+5 7OAPQ91yRJzCtF858q0/h/ubYEKCVHM= X-Google-Smtp-Source: ANB0VdYyKI0pKniONASQhwsqTqCLUxcEUo1exyOfR0NvP/Ed3uI8iMD6wxXcBBFe5GWo7JLy/VwBXg== X-Received: by 2002:a1c:b709:: with SMTP id h9-v6mr1772829wmf.130.1535636564489; Thu, 30 Aug 2018 06:42:44 -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 w10-v6sm5247731wrp.31.2018.08.30.06.42.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 06:42:43 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 30 Aug 2018 15:42:01 +0200 Message-Id: <16def86390aad22bab0cab129f1a01a535bdb7c3.1535633784.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v1 10/13] bus/vdev: pre-process declarative vdev devargs 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: , X-List-Received-Date: Thu, 30 Aug 2018 13:42:45 -0000 The new devargs format does not recognize a particular device name. Each bus uses its specific format. Process each devargs privately prior to attempting a bus scan. Prepare them if they are using the new devargs format. Signed-off-by: Gaetan Rivet --- drivers/bus/vdev/vdev.c | 10 ++++--- drivers/bus/vdev/vdev_params.c | 50 +++++++++++++++++++++++++++++++++ drivers/bus/vdev/vdev_private.h | 6 ++++ 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index e8518833d..f2dace245 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -115,8 +115,8 @@ rte_vdev_remove_custom_scan(rte_vdev_scan_callback callback, void *user_arg) return 0; } -static int -vdev_parse(const char *name, void *addr) +int +rte_vdev_parse(const char *name, void *addr) { struct rte_vdev_driver **out = addr; struct rte_vdev_driver *driver = NULL; @@ -148,7 +148,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) VDEV_LOG(DEBUG, "Search driver %s to probe device %s", name, rte_vdev_device_name(dev)); - if (vdev_parse(name, &driver)) + if (rte_vdev_parse(name, &driver)) return -1; dev->device.driver = &driver->driver; ret = driver->probe(dev); @@ -443,6 +443,8 @@ vdev_scan(void) /* for virtual devices we scan the devargs_list populated via cmdline */ RTE_EAL_DEVARGS_FOREACH("vdev", devargs) { + if (rte_vdev_devargs_prepare(devargs)) + continue; dev = calloc(1, sizeof(*dev)); if (!dev) @@ -536,7 +538,7 @@ static struct rte_bus rte_vdev_bus = { .find_device = rte_vdev_find_device, .plug = vdev_plug, .unplug = vdev_unplug, - .parse = vdev_parse, + .parse = rte_vdev_parse, .dev_iterate = rte_vdev_dev_iterate, }; diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c index 2f55f451f..aafaf3330 100644 --- a/drivers/bus/vdev/vdev_params.c +++ b/drivers/bus/vdev/vdev_params.c @@ -2,11 +2,14 @@ * Copyright 2018 Gaëtan Rivet */ +#include + #include #include #include #include #include +#include #include "vdev_logs.h" #include "vdev_private.h" @@ -60,3 +63,50 @@ rte_vdev_dev_iterate(const void *start, rte_kvargs_free(kvargs); return dev; } + +static int +vdev_driver_kv_parse(const char *key __rte_unused, + const char *value, + void *_devargs) +{ + struct rte_devargs *devargs = _devargs; + struct rte_vdev_driver *driver; + + /* Verify that the driver matches. */ + if (rte_vdev_parse(value, &driver)) + return -1; + + /* Copy the driver name as-is. */ + snprintf(devargs->name, sizeof(devargs->name), "%s", value); + return 0; +} + +int +rte_vdev_devargs_prepare(struct rte_devargs *devargs) +{ + struct rte_kvargs *kvargs = NULL; + char *args; + int ret; + + if (devargs->bus_str == NULL) + return 0; + + args = strchr(devargs->bus_str, ','); + if (args == NULL) + return 0; + args++; + + kvargs = rte_kvargs_parse(args, vdev_params_keys); + if (kvargs == NULL) { + VDEV_LOG(ERR, "unable to parse parameter list: %s\n", + devargs->bus_str); + rte_errno = EINVAL; + return -1; + } + + ret = rte_kvargs_process(kvargs, "driver", + vdev_driver_kv_parse, devargs); + + rte_kvargs_free(kvargs); + return ret; +} diff --git a/drivers/bus/vdev/vdev_private.h b/drivers/bus/vdev/vdev_private.h index ba6dc48ff..da57b84dd 100644 --- a/drivers/bus/vdev/vdev_private.h +++ b/drivers/bus/vdev/vdev_private.h @@ -19,6 +19,12 @@ rte_vdev_dev_iterate(const void *start, const char *str, const struct rte_dev_iterator *it); +int +rte_vdev_parse(const char *name, void *addr); + +int +rte_vdev_devargs_prepare(struct rte_devargs *da); + #ifdef __cplusplus } #endif -- 2.18.0