From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id 689835B20 for ; Wed, 19 Sep 2018 18:04:15 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id b19-v6so6876006wme.3 for ; Wed, 19 Sep 2018 09:04:15 -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=LyIKplS9f6Nt6prBvmiliNtk7CBPKndKNWs2mwAkzHU=; b=zBAwA/1kg6/rVH01UWtIBR5ApTdoGUDvHGKuKAFvk+umkbjs0tEKT3X2Ri5mmWtZGE oS4xYdEA8rQPFCPEIzEyeyKVAxSt84XIy7gV/ydU0zWnL3N0ceZNTdQadlwu7/2EfplT V/Q8tM8+u3WiRuC8OnloDbqD+Me+P5CSe7RkTLK1CpTUoTcXrrATV0gmNEEpdxD+BdsY jqWgU+AUdfRbl6dTgWAzN842Fk4LdWG8LQ6APMhKxUHrk+2Gy0w8CtiVDi6Lntv+jDyk +RzgysOrytzy0BoUYIKDBMzKx8iCCgLjJIKLUIxTd4t1aa9GJ82mj/VTxHdL5Izl6mhy VaOw== 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=LyIKplS9f6Nt6prBvmiliNtk7CBPKndKNWs2mwAkzHU=; b=UG9yYyV38egQGlSRFvc+iX9pWRbl+2GIQ7W0ZaDNW5sh/cG46x9B3OjPFbm+eaDgiA jOIZicN3ZrUO+bB20ubbPebtvV1eYM4i4uvU1K/YVIrXpFtcGEe4UcLY84OjiOFCIkY/ a+a4hTLFbUV5P68/MTTDjeNNqB02hiNCUHRMYTrMCLMsgFeP3i4Czauw0k6Ah6tp5ATD fG0K6NnrR0vhV+Cm82i9OCLCyScjiJCgEOro90MoxccuKusoWbL0lQt2Jbepes4BwoL/ nP2g61ekREsXmY049ZWQ+sJuPPS08KEjl3FpWGSzUahE3MycV1kJ+IXad6MAGAvxIwpW 5YDQ== X-Gm-Message-State: APzg51BKz+SSdt+ILl3DN3B5pOXb9vCbSbV21AlovC8OFfYL+6ZUSrBt B9fAGo4nOIJJ2LxGSQRHWK57OeTdyPI= X-Google-Smtp-Source: ANB0VdbX0ap0MUGRTgPmwGW4Z6/Y4lIPiCYma5XwAYkSCsoBT56Rvb+JrNmdl81SsUub901vtvHo5Q== X-Received: by 2002:a1c:a94d:: with SMTP id s74-v6mr20984211wme.39.1537373054578; Wed, 19 Sep 2018 09:04:14 -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 x24-v6sm34983671wrd.13.2018.09.19.09.04.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 09:04:13 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 19 Sep 2018 18:03:40 +0200 Message-Id: <64dbe73a53b28681244e7a752ebff6185526ec55.1537372746.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 v2 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: Wed, 19 Sep 2018 16:04:15 -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 ef3ad6d99..5699e0744 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); @@ -447,6 +447,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) @@ -540,7 +542,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