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

eal: fix hotplug add and remove

Browse Source 
If hotplug add an already plugged PCI device, it will
cause rte_pci_device->device.name be corrupted due to unexpected
rte_devargs_remove. Also if try to hotplug remove an already
unplugged device, it will cause segment fault due to unexpected
bus->unplug on a rte_device whose driver is NULL.
The patch fix these issues.

Fixes: 7e8b26650146 ("eal: fix hotplug add / remove")
Cc: stable@dpdk.org

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
This commit is contained in:
Qi Zhang 2018-07-12 22:01:41 +08:00 committed by Thomas Monjalon
parent 084ca57284
commit 196e9a486c
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/librte_eal/common/eal_common_dev.c
View File

@ -67,18 +67,6 @@ struct dev_next_ctx {
#define CLSCTX(ptr) \ #define CLSCTX(ptr) \
(((struct dev_next_ctx *)(intptr_t)ptr)->cls_str) (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str)
static int cmp_detached_dev_name(const struct rte_device *dev,
const void *_name)
{
const char *name = _name;
/* skip attached devices */
if (dev->driver != NULL)
return 1;
return strcmp(dev->name, name);
}
static int cmp_dev_name(const struct rte_device *dev, const void *_name) static int cmp_dev_name(const struct rte_device *dev, const void *_name)
{ {
const char *name = _name; const char *name = _name;
@ -176,14 +164,19 @@ int __rte_experimental rte_eal_hotplug_add(const char *busname, const char *devn
if (ret) if (ret)
goto err_devarg; goto err_devarg;
dev = bus->find_device(NULL, cmp_detached_dev_name, devname); dev = bus->find_device(NULL, cmp_dev_name, devname);
if (dev == NULL) { if (dev == NULL) {
RTE_LOG(ERR, EAL, "Cannot find unplugged device (%s)\n", RTE_LOG(ERR, EAL, "Cannot find device (%s)\n",
devname); devname);
ret = -ENODEV; ret = -ENODEV;
goto err_devarg; goto err_devarg;
} }
if (dev->driver != NULL) {
RTE_LOG(ERR, EAL, "Device is already plugged\n");
return -EEXIST;
}
ret = bus->plug(dev); ret = bus->plug(dev);
if (ret) { if (ret) {
RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n", RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
@ -225,6 +218,11 @@ rte_eal_hotplug_remove(const char *busname, const char *devname)
return -EINVAL; return -EINVAL;
} }
if (dev->driver == NULL) {
RTE_LOG(ERR, EAL, "Device is already unplugged\n");
return -ENOENT;
}
ret = bus->unplug(dev); ret = bus->unplug(dev);
if (ret) if (ret)
RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n", RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",