git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eal/windows: initialize hugepage info
[dpdk.git]
/
drivers
/
bus
/
vdev
/
vdev.c
diff --git
a/drivers/bus/vdev/vdev.c
b/drivers/bus/vdev/vdev.c
index
6139dd5
..
a89ea23
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 "rte_bus_vdev.h"
#include "vdev_logs.h"
+#include "vdev_private.h"
#define VDEV_MP_KEY "bus_vdev_mp"
#define VDEV_MP_KEY "bus_vdev_mp"
@@
-40,7
+41,7
@@
static struct vdev_device_list vdev_device_list =
static rte_spinlock_recursive_t vdev_device_list_lock =
RTE_SPINLOCK_RECURSIVE_INITIALIZER;
static rte_spinlock_recursive_t vdev_device_list_lock =
RTE_SPINLOCK_RECURSIVE_INITIALIZER;
-struct vdev_driver_list vdev_driver_list =
+st
atic st
ruct vdev_driver_list vdev_driver_list =
TAILQ_HEAD_INITIALIZER(vdev_driver_list);
struct vdev_custom_scan {
TAILQ_HEAD_INITIALIZER(vdev_driver_list);
struct vdev_custom_scan {
@@
-142,17
+143,17
@@
vdev_probe_all_drivers(struct rte_vdev_device *dev)
struct rte_vdev_driver *driver;
int ret;
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;
if (vdev_parse(name, &driver))
return -1;
- dev->device.driver = &driver->driver;
ret = driver->probe(dev);
ret = driver->probe(dev);
- if (ret)
- dev->device.driver =
NULL
;
+ if (ret
== 0
)
+ dev->device.driver =
&driver->driver
;
return ret;
}
return ret;
}
@@
-191,7
+192,7
@@
alloc_devargs(const char *name, const char *args)
else
devargs->args = strdup("");
else
devargs->args = strdup("");
- ret = s
nprintf(devargs->name, sizeof(devargs->name), "%s", name
);
+ ret = s
trlcpy(devargs->name, name, sizeof(devargs->name)
);
if (ret < 0 || ret >= (int)sizeof(devargs->name)) {
free(devargs->args);
free(devargs);
if (ret < 0 || ret >= (int)sizeof(devargs->name)) {
free(devargs->args);
free(devargs);
@@
-202,7
+203,9
@@
alloc_devargs(const char *name, const char *args)
}
static int
}
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;
{
struct rte_vdev_device *dev;
struct rte_devargs *devargs;
@@
-221,17
+224,24
@@
insert_vdev(const char *name, const char *args, struct rte_vdev_device **p_dev)
goto fail;
}
goto fail;
}
- dev->device.
devargs = devarg
s;
+ dev->device.
bus = &rte_vdev_bu
s;
dev->device.numa_node = SOCKET_ID_ANY;
dev->device.name = devargs->name;
if (find_vdev(name)) {
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;
}
ret = -EEXIST;
goto fail;
}
+ if (init)
+ rte_devargs_insert(&devargs);
+ dev->device.devargs = devargs;
TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
- rte_devargs_insert(devargs);
if (p_dev)
*p_dev = dev;
if (p_dev)
*p_dev = dev;
@@
-248,20
+258,18
@@
int
rte_vdev_init(const char *name, const char *args)
{
struct rte_vdev_device *dev;
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);
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 */
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);
TAILQ_REMOVE(&vdev_device_list, dev, next);
- rte_devargs_remove(dev
args->bus->name, devargs->name
);
+ rte_devargs_remove(dev
->device.devargs
);
free(dev);
}
}
free(dev);
}
}
@@
-289,7
+297,6
@@
int
rte_vdev_uninit(const char *name)
{
struct rte_vdev_device *dev;
rte_vdev_uninit(const char *name)
{
struct rte_vdev_device *dev;
- struct rte_devargs *devargs;
int ret;
if (name == NULL)
int ret;
if (name == NULL)
@@
-308,8
+315,7
@@
rte_vdev_uninit(const char *name)
goto unlock;
TAILQ_REMOVE(&vdev_device_list, dev, next);
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:
free(dev);
unlock:
@@
-346,6
+352,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;
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);
strlcpy(mp_resp.name, VDEV_MP_KEY, sizeof(mp_resp.name));
mp_resp.len_param = sizeof(*ou);
@@
-380,7
+387,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);
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, false);
+ 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:
VDEV_LOG(ERR, "failed to add vdev, %s", in->name);
break;
default:
@@
-399,6
+409,10
@@
vdev_scan(void)
if (rte_mp_action_register(VDEV_MP_KEY, vdev_action) < 0 &&
rte_errno != EEXIST) {
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;
}
VDEV_LOG(ERR, "Failed to add vdev mp action");
return -1;
}
@@
-419,12
+433,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);
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 */
}
} 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) {
/* call custom scan callbacks if any */
rte_spinlock_lock(&vdev_custom_scan_lock);
TAILQ_FOREACH(custom_scan, &vdev_custom_scans, next) {
@@
-455,6
+471,7
@@
vdev_scan(void)
continue;
}
continue;
}
+ dev->device.bus = &rte_vdev_bus;
dev->device.devargs = devargs;
dev->device.numa_node = SOCKET_ID_ANY;
dev->device.name = devargs->name;
dev->device.devargs = devargs;
dev->device.numa_node = SOCKET_ID_ANY;
dev->device.name = devargs->name;
@@
-471,7
+488,7
@@
static int
vdev_probe(void)
{
struct rte_vdev_device *dev;
vdev_probe(void)
{
struct rte_vdev_device *dev;
- int ret = 0;
+ int r
, r
et = 0;
/* call the init function for each virtual device */
TAILQ_FOREACH(dev, &vdev_device_list, next) {
/* call the init function for each virtual device */
TAILQ_FOREACH(dev, &vdev_device_list, next) {
@@
-480,10
+497,10
@@
vdev_probe(void)
* we call each driver probe.
*/
* 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;
VDEV_LOG(ERR, "failed to initialize %s device",
rte_vdev_device_name(dev));
ret = -1;
@@
-493,9
+510,9
@@
vdev_probe(void)
return ret;
}
return ret;
}
-st
atic st
ruct 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;
{
const struct rte_vdev_device *vstart;
struct rte_vdev_device *dev;
@@
-532,10
+549,11
@@
vdev_unplug(struct rte_device *dev)
static struct rte_bus rte_vdev_bus = {
.scan = vdev_scan,
.probe = vdev_probe,
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,
.plug = vdev_plug,
.unplug = vdev_unplug,
.parse = vdev_parse,
+ .dev_iterate = rte_vdev_dev_iterate,
};
RTE_REGISTER_BUS(vdev, rte_vdev_bus);
};
RTE_REGISTER_BUS(vdev, rte_vdev_bus);