ethdev: do not scan all PCI devices on attach
authorDavid Marchand <david.marchand@6wind.com>
Tue, 20 Sep 2016 12:41:23 +0000 (18:11 +0530)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Mon, 3 Oct 2016 14:33:29 +0000 (16:33 +0200)
No need to scan all devices, we only need to update the device being
attached.

Signed-off-by: David Marchand <david.marchand@6wind.com>
Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
lib/librte_eal/common/eal_common_pci.c
lib/librte_ether/rte_ethdev.c

index db8cba0..bef7ee8 100644 (file)
@@ -341,6 +341,12 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr)
        if (addr == NULL)
                return -1;
 
+       /* update current pci device in global list, kernel bindings might have
+        * changed since last time we looked at it.
+        */
+       if (pci_update_device(addr) < 0)
+               goto err_return;
+
        TAILQ_FOREACH(dev, &pci_device_list, next) {
                if (rte_eal_compare_pci_addr(&dev->addr, addr))
                        continue;
@@ -353,9 +359,9 @@ rte_eal_pci_probe_one(const struct rte_pci_addr *addr)
        return -1;
 
 err_return:
-       RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
-                       " cannot be used\n", dev->addr.domain, dev->addr.bus,
-                       dev->addr.devid, dev->addr.function);
+       RTE_LOG(WARNING, EAL,
+               "Requested device " PCI_PRI_FMT " cannot be used\n",
+               addr->domain, addr->bus, addr->devid, addr->function);
        return -1;
 }
 
index 0753b42..11329cf 100644 (file)
@@ -468,9 +468,6 @@ rte_eth_dev_is_detachable(uint8_t port_id)
 static int
 rte_eth_dev_attach_pdev(struct rte_pci_addr *addr, uint8_t *port_id)
 {
-       /* re-construct pci_device_list */
-       if (rte_eal_pci_scan())
-               goto err;
        /* Invoke probe func of the driver can handle the new device. */
        if (rte_eal_pci_probe_one(addr))
                goto err;