[dpdk-dev] [PATCH v1 10/13] bus/vdev: pre-process declarative vdev devargs

Gaetan Rivet gaetan.rivet at 6wind.com
Thu Aug 30 15:42:01 CEST 2018


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 <gaetan.rivet at 6wind.com>
---
 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 <string.h>
+
 #include <rte_dev.h>
 #include <rte_bus.h>
 #include <rte_bus_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_errno.h>
+#include <rte_devargs.h>
 
 #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



More information about the dev mailing list