bus/vdev: implement method to find device

[dpdk.git] / lib / librte_eal / common / eal_common_vdev.c

diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index 70da608..9bb7427 100644 (file)
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <sys/queue.h>
 
 #include <rte_eal.h>
@@ -52,33 +53,65 @@ static struct vdev_device_list vdev_device_list =
 struct vdev_driver_list vdev_driver_list =
        TAILQ_HEAD_INITIALIZER(vdev_driver_list);
 
-static void rte_vdev_bus_register(void);
-
 /* register a driver */
 void
-rte_eal_vdrv_register(struct rte_vdev_driver *driver)
+rte_vdev_register(struct rte_vdev_driver *driver)
 {
-       rte_vdev_bus_register();
-
        TAILQ_INSERT_TAIL(&vdev_driver_list, driver, next);
-       rte_eal_driver_register(&driver->driver);
 }
 
 /* unregister a driver */
 void
-rte_eal_vdrv_unregister(struct rte_vdev_driver *driver)
+rte_vdev_unregister(struct rte_vdev_driver *driver)
 {
-       rte_eal_driver_unregister(&driver->driver);
        TAILQ_REMOVE(&vdev_driver_list, driver, next);
 }
 
+/*
+ * Parse "driver" devargs without adding a dependency on rte_kvargs.h
+ */
+static char *parse_driver_arg(const char *args)
+{
+       const char *c;
+       char *str;
+
+       if (!args || args[0] == '\0')
+               return NULL;
+
+       c = args;
+
+       do {
+               if (strncmp(c, "driver=", 7) == 0) {
+                       c += 7;
+                       break;
+               }
+
+               c = strchr(c, ',');
+               if (c)
+                       c++;
+       } while (c);
+
+       if (c)
+               str = strdup(c);
+       else
+               str = NULL;
+
+       return str;
+}
+
 static int
 vdev_probe_all_drivers(struct rte_vdev_device *dev)
 {
-       const char *name = rte_vdev_device_name(dev);
-       const char *args = rte_vdev_device_args(dev);
+       const char *name;
+       char *drv_name;
        struct rte_vdev_driver *driver;
-       int ret;
+       int ret = 1;
+
+       drv_name = parse_driver_arg(rte_vdev_device_args(dev));
+       name = drv_name ? drv_name : rte_vdev_device_name(dev);
+
+       RTE_LOG(DEBUG, EAL, "Search driver %s to probe device %s\n", name,
+               rte_vdev_device_name(dev));
 
        TAILQ_FOREACH(driver, &vdev_driver_list, next) {
                /*
@@ -90,10 +123,10 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
                if (!strncmp(driver->driver.name, name,
                            strlen(driver->driver.name))) {
                        dev->device.driver = &driver->driver;
-                       ret = driver->probe(name, args);
+                       ret = driver->probe(dev);
                        if (ret)
                                dev->device.driver = NULL;
-                       return ret;
+                       goto out;
                }
        }
 
@@ -103,14 +136,16 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
                    !strncmp(driver->driver.alias, name,
                            strlen(driver->driver.alias))) {
                        dev->device.driver = &driver->driver;
-                       ret = driver->probe(name, args);
+                       ret = driver->probe(dev);
                        if (ret)
                                dev->device.driver = NULL;
-                       return ret;
+                       break;
                }
        }
 
-       return 1;
+out:
+       free(drv_name);
+       return ret;
 }
 
 static struct rte_vdev_device *
@@ -156,7 +191,7 @@ alloc_devargs(const char *name, const char *args)
 }
 
 int
-rte_eal_vdev_init(const char *name, const char *args)
+rte_vdev_init(const char *name, const char *args)
 {
        struct rte_vdev_device *dev;
        struct rte_devargs *devargs;
@@ -181,6 +216,7 @@ rte_eal_vdev_init(const char *name, const char *args)
 
        dev->device.devargs = devargs;
        dev->device.numa_node = SOCKET_ID_ANY;
+       dev->device.name = devargs->virt.drv_name;
 
        ret = vdev_probe_all_drivers(dev);
        if (ret) {
@@ -191,7 +227,6 @@ rte_eal_vdev_init(const char *name, const char *args)
 
        TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
 
-       rte_eal_device_insert(&dev->device);
        TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
        return 0;
 
@@ -215,11 +250,11 @@ vdev_remove_driver(struct rte_vdev_device *dev)
 
        driver = container_of(dev->device.driver, const struct rte_vdev_driver,
                driver);
-       return driver->remove(name);
+       return driver->remove(dev);
 }
 
 int
-rte_eal_vdev_uninit(const char *name)
+rte_vdev_uninit(const char *name)
 {
        struct rte_vdev_device *dev;
        struct rte_devargs *devargs;
@@ -239,7 +274,6 @@ rte_eal_vdev_uninit(const char *name)
                return ret;
 
        TAILQ_REMOVE(&vdev_device_list, dev, next);
-       rte_eal_device_remove(&dev->device);
 
        TAILQ_REMOVE(&devargs_list, devargs, next);
 
@@ -272,8 +306,8 @@ vdev_scan(void)
 
                dev->device.devargs = devargs;
                dev->device.numa_node = SOCKET_ID_ANY;
+               dev->device.name = devargs->virt.drv_name;
 
-               rte_eal_device_insert(&dev->device);
                TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
        }
 
@@ -285,12 +319,6 @@ vdev_probe(void)
 {
        struct rte_vdev_device *dev;
 
-       /*
-        * Note that the dev_driver_list is populated here
-        * from calls made to rte_eal_driver_register from constructor functions
-        * embedded into PMD modules via the RTE_PMD_REGISTER_VDEV macro
-        */
-
        /* call the init function for each virtual device */
        TAILQ_FOREACH(dev, &vdev_device_list, next) {
 
@@ -307,21 +335,29 @@ vdev_probe(void)
        return 0;
 }
 
+static struct rte_device *
+vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
+                const void *data)
+{
+       struct rte_vdev_device *dev;
+       bool start_found = !start;
+
+       TAILQ_FOREACH(dev, &vdev_device_list, next) {
+               if (start_found == 0) {
+                       if (&dev->device == start)
+                               start_found = 1;
+                       continue;
+               }
+               if (cmp(&dev->device, data) == 0)
+                       return &dev->device;
+       }
+       return NULL;
+}
+
 static struct rte_bus rte_vdev_bus = {
        .scan = vdev_scan,
        .probe = vdev_probe,
+       .find_device = vdev_find_device,
 };
 
-RTE_INIT(rte_vdev_bus_register);
-
-static void rte_vdev_bus_register(void)
-{
-       static int registered;
-
-       if (registered)
-               return;
-
-       registered = 1;
-       rte_vdev_bus.name = RTE_STR(virtual);
-       rte_bus_register(&rte_vdev_bus);
-}
+RTE_REGISTER_BUS(VIRTUAL_BUS_NAME, rte_vdev_bus);