pci: consolidate address comparisons

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_pci.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
index a4fd5f5..06bfc1a 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -41,6 +41,7 @@
 #include <rte_eal_memconfig.h>
 #include <rte_malloc.h>
 #include <rte_devargs.h>
+#include <rte_memcpy.h>
 
 #include "rte_pci_dev_ids.h"
 #include "eal_filesystem.h"
@@ -97,6 +98,35 @@ error:
        return -1;
 }
 
+static int
+pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
+{
+       int count;
+       char path[PATH_MAX];
+       char *name;
+
+       if (!filename || !dri_name)
+               return -1;
+
+       count = readlink(filename, path, PATH_MAX);
+       if (count >= PATH_MAX)
+               return -1;
+
+       /* For device does not have a driver */
+       if (count < 0)
+               return 1;
+
+       path[count] = '\0';
+
+       name = strrchr(path, '/');
+       if (name) {
+               strncpy(dri_name, name + 1, strlen(name + 1) + 1);
+               return 0;
+       }
+
+       return -1;
+}
+
 void *
 pci_find_max_end_va(void)
 {
@@ -199,20 +229,6 @@ error:
        return -1;
 }
 
-/* Compare two PCI device addresses. */
-static int
-pci_addr_comparison(struct rte_pci_addr *addr, struct rte_pci_addr *addr2)
-{
-       uint64_t dev_addr = (addr->domain << 24) + (addr->bus << 16) + (addr->devid << 8) + addr->function;
-       uint64_t dev_addr2 = (addr2->domain << 24) + (addr2->bus << 16) + (addr2->devid << 8) + addr2->function;
-
-       if (dev_addr > dev_addr2)
-               return 1;
-       else
-               return 0;
-}
-
-
 /* Scan one pci sysfs entry, and fill the devices list from it. */
 static int
 pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
@@ -221,11 +237,12 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        char filename[PATH_MAX];
        unsigned long tmp;
        struct rte_pci_device *dev;
+       char driver[PATH_MAX];
+       int ret;
 
        dev = malloc(sizeof(*dev));
-       if (dev == NULL) {
+       if (dev == NULL)
                return -1;
-       }
 
        memset(dev, 0, sizeof(*dev));
        dev->addr.domain = domain;
@@ -304,19 +321,49 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
                return -1;
        }
 
+       /* parse driver */
+       snprintf(filename, sizeof(filename), "%s/driver", dirname);
+       ret = pci_get_kernel_driver_by_path(filename, driver);
+       if (!ret) {
+               if (!strcmp(driver, "vfio-pci"))
+                       dev->pt_driver = RTE_PT_VFIO;
+               else if (!strcmp(driver, "igb_uio"))
+                       dev->pt_driver = RTE_PT_IGB_UIO;
+               else if (!strcmp(driver, "uio_pci_generic"))
+                       dev->pt_driver = RTE_PT_UIO_GENERIC;
+               else
+                       dev->pt_driver = RTE_PT_UNKNOWN;
+       } else if (ret < 0) {
+               RTE_LOG(ERR, EAL, "Fail to get kernel driver\n");
+               free(dev);
+               return -1;
+       } else
+               dev->pt_driver = RTE_PT_UNKNOWN;
+
        /* device is valid, add in list (sorted) */
        if (TAILQ_EMPTY(&pci_device_list)) {
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }
        else {
                struct rte_pci_device *dev2 = NULL;
+               int ret;
 
                TAILQ_FOREACH(dev2, &pci_device_list, next) {
-                       if (pci_addr_comparison(&dev->addr, &dev2->addr))
+                       ret = rte_eal_compare_pci_addr(&dev->addr, &dev2->addr);
+                       if (ret > 0)
                                continue;
-                       else {
+                       else if (ret < 0) {
                                TAILQ_INSERT_BEFORE(dev2, dev, next);
                                return 0;
+                       } else { /* already registered */
+                               /* update pt_driver */
+                               dev2->pt_driver = dev->pt_driver;
+                               dev2->max_vfs = dev->max_vfs;
+                               memmove(dev2->mem_resource,
+                                       dev->mem_resource,
+                                       sizeof(dev->mem_resource));
+                               free(dev);
+                               return 0;
                        }
                }
                TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
@@ -506,25 +553,29 @@ pci_config_space_set(struct rte_pci_device *dev)
 static int
 pci_map_device(struct rte_pci_device *dev)
 {
-       int ret, mapped = 0;
+       int ret = -1;
 
        /* try mapping the NIC resources using VFIO if it exists */
+       switch (dev->pt_driver) {
+       case RTE_PT_VFIO:
 #ifdef VFIO_PRESENT
-       if (pci_vfio_is_enabled()) {
-               ret = pci_vfio_map_resource(dev);
-               if (ret == 0)
-                       mapped = 1;
-               else if (ret < 0)
-                       return ret;
-       }
+               if (pci_vfio_is_enabled())
+                       ret = pci_vfio_map_resource(dev);
 #endif
-       /* map resources for devices that use uio_pci_generic or igb_uio */
-       if (!mapped) {
+               break;
+       case RTE_PT_IGB_UIO:
+       case RTE_PT_UIO_GENERIC:
+               /* map resources for devices that use uio */
                ret = pci_uio_map_resource(dev);
-               if (ret != 0)
-                       return ret;
+               break;
+       default:
+               RTE_LOG(DEBUG, EAL, "  Not managed by known pt driver,"
+                       " skipped\n");
+               ret = 1;
+               break;
        }
-       return 0;
+
+       return ret;
 }
 
 /*