d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bus/vdev: fix find device implementation

Browse Source 
If start is set and a device before it matches the data,
this device is returned.

This induces potentially infinite loops.

Fixes: c7fe1eea8a ("bus: simplify finding starting point")
Cc: stable@dpdk.org

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
This commit is contained in:
Gaetan Rivet 2018-04-27 16:13:06 +02:00 committed by Thomas Monjalon
parent 64de7e4069
commit 3701b792a8
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/bus/vdev/rte_bus_vdev.h
View File

@ -25,6 +25,9 @@ struct rte_vdev_device {
#define RTE_DEV_TO_VDEV(ptr) \
container_of(ptr, struct rte_vdev_device, device)
#define RTE_DEV_TO_VDEV_CONST(ptr) \
container_of(ptr, const struct rte_vdev_device, device)
static inline const char *
rte_vdev_device_name(const struct rte_vdev_device *dev)
{

14
drivers/bus/vdev/vdev.c
View File

@ -495,16 +495,20 @@ static struct rte_device *
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;
}
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);