X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fbus%2Fvdev%2Fvdev.c;h=d746149a2e9ac63692520e0acef3884bddd0b890;hb=6f0ef237404b;hp=ef3ad6d99d8d7e708b86cdd58122a7a6acbcf69b;hpb=ac91bc493cdde005bab596576665eb7960dafe29;p=dpdk.git diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index ef3ad6d99d..d746149a2e 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -27,8 +27,6 @@ #define VDEV_MP_KEY "bus_vdev_mp" -int vdev_logtype_bus; - /* Forward declare to access virtual bus name */ static struct rte_bus rte_vdev_bus; @@ -41,7 +39,7 @@ static struct vdev_device_list vdev_device_list = static rte_spinlock_recursive_t vdev_device_list_lock = RTE_SPINLOCK_RECURSIVE_INITIALIZER; -struct vdev_driver_list vdev_driver_list = +static struct vdev_driver_list vdev_driver_list = TAILQ_HEAD_INITIALIZER(vdev_driver_list); struct vdev_custom_scan { @@ -143,17 +141,17 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) struct rte_vdev_driver *driver; int ret; - name = rte_vdev_device_name(dev); + if (rte_dev_is_probed(&dev->device)) + return -EEXIST; - VDEV_LOG(DEBUG, "Search driver %s to probe device %s", name, - rte_vdev_device_name(dev)); + name = rte_vdev_device_name(dev); + VDEV_LOG(DEBUG, "Search driver to probe device %s", name); 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; } @@ -192,7 +190,7 @@ alloc_devargs(const char *name, const char *args) else devargs->args = strdup(""); - ret = snprintf(devargs->name, sizeof(devargs->name), "%s", name); + ret = strlcpy(devargs->name, name, sizeof(devargs->name)); if (ret < 0 || ret >= (int)sizeof(devargs->name)) { free(devargs->args); free(devargs); @@ -203,7 +201,9 @@ alloc_devargs(const char *name, const char *args) } static int -insert_vdev(const char *name, const char *args, struct rte_vdev_device **p_dev) +insert_vdev(const char *name, const char *args, + struct rte_vdev_device **p_dev, + bool init) { struct rte_vdev_device *dev; struct rte_devargs *devargs; @@ -222,17 +222,24 @@ insert_vdev(const char *name, const char *args, struct rte_vdev_device **p_dev) goto fail; } - dev->device.devargs = devargs; + dev->device.bus = &rte_vdev_bus; dev->device.numa_node = SOCKET_ID_ANY; dev->device.name = devargs->name; if (find_vdev(name)) { + /* + * A vdev is expected to have only one port. + * So there is no reason to try probing again, + * even with new arguments. + */ ret = -EEXIST; goto fail; } + if (init) + rte_devargs_insert(&devargs); + dev->device.devargs = devargs; TAILQ_INSERT_TAIL(&vdev_device_list, dev, next); - rte_devargs_insert(devargs); if (p_dev) *p_dev = dev; @@ -249,20 +256,18 @@ int rte_vdev_init(const char *name, const char *args) { struct rte_vdev_device *dev; - struct rte_devargs *devargs; int ret; rte_spinlock_recursive_lock(&vdev_device_list_lock); - ret = insert_vdev(name, args, &dev); + ret = insert_vdev(name, args, &dev, true); if (ret == 0) { ret = vdev_probe_all_drivers(dev); if (ret) { if (ret > 0) 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); - rte_devargs_remove(devargs->bus->name, devargs->name); + rte_devargs_remove(dev->device.devargs); free(dev); } } @@ -290,7 +295,6 @@ int rte_vdev_uninit(const char *name) { struct rte_vdev_device *dev; - struct rte_devargs *devargs; int ret; if (name == NULL) @@ -309,8 +313,7 @@ rte_vdev_uninit(const char *name) goto unlock; TAILQ_REMOVE(&vdev_device_list, dev, next); - devargs = dev->device.devargs; - rte_devargs_remove(devargs->bus->name, devargs->name); + rte_devargs_remove(dev->device.devargs); free(dev); unlock: @@ -382,7 +385,7 @@ 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); - ret = insert_vdev(in->name, NULL, NULL); + ret = insert_vdev(in->name, NULL, NULL, false); if (ret == -EEXIST) VDEV_LOG(DEBUG, "device already exist, %s", in->name); else if (ret < 0) @@ -404,6 +407,10 @@ vdev_scan(void) if (rte_mp_action_register(VDEV_MP_KEY, vdev_action) < 0 && rte_errno != EEXIST) { + /* for primary, unsupported IPC is not an error */ + if (rte_eal_process_type() == RTE_PROC_PRIMARY && + rte_errno == ENOTSUP) + goto scan; VDEV_LOG(ERR, "Failed to add vdev mp action"); return -1; } @@ -424,12 +431,14 @@ vdev_scan(void) mp_rep = &mp_reply.msgs[0]; resp = (struct vdev_param *)mp_rep->param; VDEV_LOG(INFO, "Received %d vdevs", resp->num); + free(mp_reply.msgs); } else VDEV_LOG(ERR, "Failed to request vdev from primary"); /* Fall through to allow private vdevs in secondary process */ } +scan: /* call custom scan callbacks if any */ rte_spinlock_lock(&vdev_custom_scan_lock); TAILQ_FOREACH(custom_scan, &vdev_custom_scans, next) { @@ -460,6 +469,7 @@ vdev_scan(void) continue; } + dev->device.bus = &rte_vdev_bus; dev->device.devargs = devargs; dev->device.numa_node = SOCKET_ID_ANY; dev->device.name = devargs->name; @@ -476,7 +486,7 @@ static int vdev_probe(void) { struct rte_vdev_device *dev; - int ret = 0; + int r, ret = 0; /* call the init function for each virtual device */ TAILQ_FOREACH(dev, &vdev_device_list, next) { @@ -485,10 +495,10 @@ vdev_probe(void) * we call each driver probe. */ - if (dev->device.driver) - continue; - - if (vdev_probe_all_drivers(dev)) { + r = vdev_probe_all_drivers(dev); + if (r != 0) { + if (r == -EEXIST) + continue; VDEV_LOG(ERR, "failed to initialize %s device", rte_vdev_device_name(dev)); ret = -1; @@ -545,10 +555,4 @@ static struct rte_bus rte_vdev_bus = { }; RTE_REGISTER_BUS(vdev, rte_vdev_bus); - -RTE_INIT(vdev_init_log) -{ - vdev_logtype_bus = rte_log_register("bus.vdev"); - if (vdev_logtype_bus >= 0) - rte_log_set_level(vdev_logtype_bus, RTE_LOG_NOTICE); -} +RTE_LOG_REGISTER(vdev_logtype_bus, bus.vdev, NOTICE);