eal: add function to query device status

[dpdk.git] / drivers / bus / vdev / vdev.c

diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 38ed70a..f666099 100644 (file)
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -23,6 +23,7 @@
 
 #include "rte_bus_vdev.h"
 #include "vdev_logs.h"
+#include "vdev_private.h"
 
 #define VDEV_MP_KEY    "bus_vdev_mp"
 
@@ -36,7 +37,9 @@ TAILQ_HEAD(vdev_device_list, rte_vdev_device);
 
 static struct vdev_device_list vdev_device_list =
        TAILQ_HEAD_INITIALIZER(vdev_device_list);
-static rte_spinlock_t vdev_device_list_lock = RTE_SPINLOCK_INITIALIZER;
+/* The lock needs to be recursive because a vdev can manage another vdev. */
+static rte_spinlock_recursive_t vdev_device_list_lock =
+       RTE_SPINLOCK_RECURSIVE_INITIALIZER;
 
 struct vdev_driver_list vdev_driver_list =
        TAILQ_HEAD_INITIALIZER(vdev_driver_list);
@@ -142,15 +145,14 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
 
        name = rte_vdev_device_name(dev);
 
-       VDEV_LOG(DEBUG, "Search driver %s to probe device %s\n", name,
+       VDEV_LOG(DEBUG, "Search driver %s to probe device %s", name,
                rte_vdev_device_name(dev));
 
        if (vdev_parse(name, &driver))
                return -1;
-       dev->device.driver = &driver->driver;
        ret = driver->probe(dev);
-       if (ret)
-               dev->device.driver = NULL;
+       if (ret == 0)
+               dev->device.driver = &driver->driver;
        return ret;
 }
 
@@ -229,7 +231,7 @@ insert_vdev(const char *name, const char *args, struct rte_vdev_device **p_dev)
        }
 
        TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
-       TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
+       rte_devargs_insert(devargs);
 
        if (p_dev)
                *p_dev = dev;
@@ -246,26 +248,22 @@ int
 rte_vdev_init(const char *name, const char *args)
 {
        struct rte_vdev_device *dev;
-       struct rte_devargs *devargs;
        int ret;
 
-       rte_spinlock_lock(&vdev_device_list_lock);
+       rte_spinlock_recursive_lock(&vdev_device_list_lock);
        ret = insert_vdev(name, args, &dev);
        if (ret == 0) {
                ret = vdev_probe_all_drivers(dev);
                if (ret) {
                        if (ret > 0)
-                               VDEV_LOG(ERR, "no driver found for %s\n", name);
+                               VDEV_LOG(ERR, "no driver found for %s", name);
                        /* If fails, remove it from vdev list */
-                       devargs = dev->device.devargs;
                        TAILQ_REMOVE(&vdev_device_list, dev, next);
-                       TAILQ_REMOVE(&devargs_list, devargs, next);
-                       free(devargs->args);
-                       free(devargs);
+                       rte_devargs_remove(dev->device.devargs);
                        free(dev);
                }
        }
-       rte_spinlock_unlock(&vdev_device_list_lock);
+       rte_spinlock_recursive_unlock(&vdev_device_list_lock);
        return ret;
 }
 
@@ -276,7 +274,7 @@ vdev_remove_driver(struct rte_vdev_device *dev)
        const struct rte_vdev_driver *driver;
 
        if (!dev->device.driver) {
-               VDEV_LOG(DEBUG, "no driver attach to device %s\n", name);
+               VDEV_LOG(DEBUG, "no driver attach to device %s", name);
                return 1;
        }
 
@@ -289,13 +287,12 @@ int
 rte_vdev_uninit(const char *name)
 {
        struct rte_vdev_device *dev;
-       struct rte_devargs *devargs;
        int ret;
 
        if (name == NULL)
                return -EINVAL;
 
-       rte_spinlock_lock(&vdev_device_list_lock);
+       rte_spinlock_recursive_lock(&vdev_device_list_lock);
 
        dev = find_vdev(name);
        if (!dev) {
@@ -308,14 +305,11 @@ rte_vdev_uninit(const char *name)
                goto unlock;
 
        TAILQ_REMOVE(&vdev_device_list, dev, next);
-       devargs = dev->device.devargs;
-       TAILQ_REMOVE(&devargs_list, devargs, next);
-       free(devargs->args);
-       free(devargs);
+       rte_devargs_remove(dev->device.devargs);
        free(dev);
 
 unlock:
-       rte_spinlock_unlock(&vdev_device_list_lock);
+       rte_spinlock_recursive_unlock(&vdev_device_list_lock);
        return ret;
 }
 
@@ -348,6 +342,7 @@ vdev_action(const struct rte_mp_msg *mp_msg, const void *peer)
        const struct vdev_param *in = (const struct vdev_param *)mp_msg->param;
        const char *devname;
        int num;
+       int ret;
 
        strlcpy(mp_resp.name, VDEV_MP_KEY, sizeof(mp_resp.name));
        mp_resp.len_param = sizeof(*ou);
@@ -359,7 +354,7 @@ vdev_action(const struct rte_mp_msg *mp_msg, const void *peer)
                ou->num = 1;
                num = 0;
 
-               rte_spinlock_lock(&vdev_device_list_lock);
+               rte_spinlock_recursive_lock(&vdev_device_list_lock);
                TAILQ_FOREACH(dev, &vdev_device_list, next) {
                        devname = rte_vdev_device_name(dev);
                        if (strlen(devname) == 0) {
@@ -373,7 +368,7 @@ vdev_action(const struct rte_mp_msg *mp_msg, const void *peer)
                                         devname, strerror(rte_errno));
                        num++;
                }
-               rte_spinlock_unlock(&vdev_device_list_lock);
+               rte_spinlock_recursive_unlock(&vdev_device_list_lock);
 
                ou->type = VDEV_SCAN_REP;
                ou->num = num;
@@ -382,7 +377,10 @@ vdev_action(const struct rte_mp_msg *mp_msg, const void *peer)
                break;
        case VDEV_SCAN_ONE:
                VDEV_LOG(INFO, "receive vdev, %s", in->name);
-               if (insert_vdev(in->name, NULL, NULL) < 0)
+               ret = insert_vdev(in->name, NULL, NULL);
+               if (ret == -EEXIST)
+                       VDEV_LOG(DEBUG, "device already exist, %s", in->name);
+               else if (ret < 0)
                        VDEV_LOG(ERR, "failed to add vdev, %s", in->name);
                break;
        default:
@@ -433,7 +431,7 @@ vdev_scan(void)
                if (custom_scan->callback != NULL)
                        /*
                         * the callback should update devargs list
-                        * by calling rte_eal_devargs_insert() with
+                        * by calling rte_devargs_insert() with
                         *     devargs.bus = rte_bus_find_by_name("vdev");
                         *     devargs.type = RTE_DEVTYPE_VIRTUAL;
                         *     devargs.policy = RTE_DEV_WHITELISTED;
@@ -443,30 +441,28 @@ vdev_scan(void)
        rte_spinlock_unlock(&vdev_custom_scan_lock);
 
        /* for virtual devices we scan the devargs_list populated via cmdline */
-       TAILQ_FOREACH(devargs, &devargs_list, next) {
-
-               if (devargs->bus != &rte_vdev_bus)
-                       continue;
+       RTE_EAL_DEVARGS_FOREACH("vdev", devargs) {
 
                dev = calloc(1, sizeof(*dev));
                if (!dev)
                        return -1;
 
-               rte_spinlock_lock(&vdev_device_list_lock);
+               rte_spinlock_recursive_lock(&vdev_device_list_lock);
 
                if (find_vdev(devargs->name)) {
-                       rte_spinlock_unlock(&vdev_device_list_lock);
+                       rte_spinlock_recursive_unlock(&vdev_device_list_lock);
                        free(dev);
                        continue;
                }
 
+               dev->device.bus = &rte_vdev_bus;
                dev->device.devargs = devargs;
                dev->device.numa_node = SOCKET_ID_ANY;
                dev->device.name = devargs->name;
 
                TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
 
-               rte_spinlock_unlock(&vdev_device_list_lock);
+               rte_spinlock_recursive_unlock(&vdev_device_list_lock);
        }
 
        return 0;
@@ -485,11 +481,11 @@ vdev_probe(void)
                 * we call each driver probe.
                 */
 
-               if (dev->device.driver)
+               if (rte_dev_is_probed(&dev->device))
                        continue;
 
                if (vdev_probe_all_drivers(dev)) {
-                       VDEV_LOG(ERR, "failed to initialize %s device\n",
+                       VDEV_LOG(ERR, "failed to initialize %s device",
                                rte_vdev_device_name(dev));
                        ret = -1;
                }
@@ -498,22 +494,26 @@ vdev_probe(void)
        return ret;
 }
 
-static struct rte_device *
-vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
-                const void *data)
+struct rte_device *
+rte_vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
+                    const void *data)
 {
+       const struct rte_vdev_device *vstart;
        struct rte_vdev_device *dev;
 
-       rte_spinlock_lock(&vdev_device_list_lock);
-       TAILQ_FOREACH(dev, &vdev_device_list, next) {
-               if (start && &dev->device == start) {
-                       start = NULL;
-                       continue;
-               }
+       rte_spinlock_recursive_lock(&vdev_device_list_lock);
+       if (start != NULL) {
+               vstart = RTE_DEV_TO_VDEV_CONST(start);
+               dev = TAILQ_NEXT(vstart, next);
+       } else {
+               dev = TAILQ_FIRST(&vdev_device_list);
+       }
+       while (dev != NULL) {
                if (cmp(&dev->device, data) == 0)
                        break;
+               dev = TAILQ_NEXT(dev, next);
        }
-       rte_spinlock_unlock(&vdev_device_list_lock);
+       rte_spinlock_recursive_unlock(&vdev_device_list_lock);
 
        return dev ? &dev->device : NULL;
 }
@@ -533,10 +533,11 @@ vdev_unplug(struct rte_device *dev)
 static struct rte_bus rte_vdev_bus = {
        .scan = vdev_scan,
        .probe = vdev_probe,
-       .find_device = vdev_find_device,
+       .find_device = rte_vdev_find_device,
        .plug = vdev_plug,
        .unplug = vdev_unplug,
        .parse = vdev_parse,
+       .dev_iterate = rte_vdev_dev_iterate,
 };
 
 RTE_REGISTER_BUS(vdev, rte_vdev_bus);