eal: fix possible crash in hotplug

[dpdk.git] / lib / librte_eal / common / eal_common_pci.c

diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 76bbcc8..52fd38c 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -47,7 +47,6 @@
 #include <rte_pci.h>
 #include <rte_per_lcore.h>
 #include <rte_memory.h>
-#include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_eal.h>
 #include <rte_string_fns.h>
@@ -88,6 +87,29 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
        return NULL;
 }
 
+void
+pci_name_set(struct rte_pci_device *dev)
+{
+       struct rte_devargs *devargs;
+
+       /* Each device has its internal, canonical name set. */
+       rte_pci_device_name(&dev->addr,
+                       dev->name, sizeof(dev->name));
+       devargs = pci_devargs_lookup(dev);
+       dev->device.devargs = devargs;
+       /* In blacklist mode, if the device is not blacklisted, no
+        * rte_devargs exists for it.
+        */
+       if (devargs != NULL)
+               /* If an rte_devargs exists, the generic rte_device uses the
+                * given name as its namea
+                */
+               dev->device.name = dev->device.devargs->name;
+       else
+               /* Otherwise, it uses the internal, canonical form. */
+               dev->device.name = dev->name;
+}
+
 /* map a particular resource from a file */
 void *
 pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size,
@@ -197,13 +219,18 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 
        /* no initialization when blacklisted, return without error */
        if (dev->device.devargs != NULL &&
-               dev->device.devargs->type ==
-                       RTE_DEVTYPE_BLACKLISTED) {
+               dev->device.devargs->policy ==
+                       RTE_DEV_BLACKLISTED) {
                RTE_LOG(INFO, EAL, "  Device is blacklisted, not"
                        " initializing\n");
                return 1;
        }
 
+       if (dev->device.numa_node < 0) {
+               RTE_LOG(WARNING, EAL, "  Invalid NUMA socket, default to 0\n");
+               dev->device.numa_node = 0;
+       }
+
        RTE_LOG(INFO, EAL, "  probe driver: %x:%x %s\n", dev->id.vendor_id,
                dev->id.device_id, dr->driver.name);
 
@@ -222,6 +249,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
        ret = dr->probe(dr, dev);
        if (ret) {
                dev->driver = NULL;
+               dev->device.driver = NULL;
                if ((dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) &&
                        /* Don't unmap if device is unsupported and
                         * driver needs mapped resources.
@@ -396,16 +424,12 @@ rte_pci_probe(void)
        FOREACH_DEVICE_ON_PCIBUS(dev) {
                probed++;
 
-               /* set devargs in PCI structure */
-               devargs = pci_devargs_lookup(dev);
-               if (devargs != NULL)
-                       dev->device.devargs = devargs;
-
+               devargs = dev->device.devargs;
                /* probe all or only whitelisted devices */
                if (probe_all)
                        ret = pci_probe_all_drivers(dev);
                else if (devargs != NULL &&
-                       devargs->type == RTE_DEVTYPE_WHITELISTED)
+                       devargs->policy == RTE_DEV_WHITELISTED)
                        ret = pci_probe_all_drivers(dev);
                if (ret < 0) {
                        RTE_LOG(ERR, EAL, "Requested device " PCI_PRI_FMT
@@ -522,34 +546,22 @@ pci_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
 }
 
 static int
-pci_plug(struct rte_device *dev, const char *devargs __rte_unused)
+pci_plug(struct rte_device *dev)
 {
-       struct rte_pci_device *pdev;
-       struct rte_pci_addr *addr;
-
-       addr = &RTE_DEV_TO_PCI(dev)->addr;
-
-       /* Find the current device holding this address in the bus. */
-       FOREACH_DEVICE_ON_PCIBUS(pdev) {
-               if (rte_eal_compare_pci_addr(&pdev->addr, addr) == 0)
-                       return rte_pci_probe_one(addr);
-       }
-
-       rte_errno = ENODEV;
-       return -1;
+       return pci_probe_all_drivers(RTE_DEV_TO_PCI(dev));
 }
 
 static int
 pci_unplug(struct rte_device *dev)
 {
        struct rte_pci_device *pdev;
+       int ret;
 
        pdev = RTE_DEV_TO_PCI(dev);
-       if (rte_pci_detach(&pdev->addr) != 0) {
-               rte_errno = ENODEV;
-               return -1;
-       }
-       return 0;
+       ret = rte_pci_detach_dev(pdev);
+       rte_pci_remove_device(pdev);
+       free(pdev);
+       return ret;
 }
 
 struct rte_pci_bus rte_pci_bus = {