pci: fix ioport support for uio_pci_generic on x86
[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_pci.c
index 0a60bb3..dbf12a8 100644 (file)
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
  *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
+ *
+ *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <errno.h>
 #include <dirent.h>
-#include <limits.h>
-#include <sys/queue.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
 
-#include <rte_interrupts.h>
 #include <rte_log.h>
 #include <rte_pci.h>
-#include <rte_common.h>
-#include <rte_launch.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_tailq.h>
-#include <rte_eal.h>
 #include <rte_eal_memconfig.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
 #include <rte_malloc.h>
-#include <rte_string_fns.h>
-#include <rte_debug.h>
+#include <rte_devargs.h>
+#include <rte_memcpy.h>
 
-#include "eal_internal_cfg.h"
 #include "eal_filesystem.h"
 #include "eal_private.h"
+#include "eal_pci_init.h"
 
 /**
  * @file
  * PCI probing under linux
  *
- * This code is used to simulate a PCI probe by parsing information in
- * sysfs. Moreover, when a registered driver matches a device, the
- * kernel driver currently using it is unloaded and replaced by
- * igb_uio module, which is a very minimal userland driver for Intel
- * network card, only providing access to PCI BAR to applications, and
- * enabling bus master.
+ * This code is used to simulate a PCI probe by parsing information in sysfs.
+ * When a registered device matches a driver, it is then initialized with
+ * IGB_UIO driver (or doesn't initialize, if the device wasn't bound to it).
  */
 
-
-#define PROC_MODULES "/proc/modules"
-
-#define IGB_UIO_NAME "igb_uio"
-
-#define UIO_NEWID "/sys/bus/pci/drivers/%s/new_id"
-#define UIO_BIND  "/sys/bus/pci/drivers/%s/bind"
-
-/* maximum time to wait that /dev/uioX appears */
-#define UIO_DEV_WAIT_TIMEOUT 3 /* seconds */
-
-/*
- * For multi-process we need to reproduce all PCI mappings in secondary
- * processes, so save them in a tailq.
- */
-struct uio_resource {
-       TAILQ_ENTRY(uio_resource) next;
-
-       struct rte_pci_addr pci_addr;
-       void *addr;
-       char path[PATH_MAX];
-       unsigned long size;
-       unsigned long offset;
-};
-
-TAILQ_HEAD(uio_res_list, uio_resource);
-
-static struct uio_res_list *uio_res_list = NULL;
-
-/*
- * Check that a kernel module is loaded. Returns 0 on success, or if the
- * parameter is NULL, or -1 if the module is not loaded.
- */
-static int
-pci_uio_check_module(const char *module_name)
+/* unbind kernel driver for this device */
+int
+pci_unbind_kernel_driver(struct rte_pci_device *dev)
 {
+       int n;
        FILE *f;
-       unsigned i;
+       char filename[PATH_MAX];
        char buf[BUFSIZ];
+       struct rte_pci_addr *loc = &dev->addr;
+
+       /* open /sys/bus/pci/devices/AAAA:BB:CC.D/driver */
+       snprintf(filename, sizeof(filename),
+                SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/driver/unbind",
+                loc->domain, loc->bus, loc->devid, loc->function);
 
-       if (module_name == NULL)
+       f = fopen(filename, "w");
+       if (f == NULL) /* device was not bound */
                return 0;
 
-       f = fopen(PROC_MODULES, "r");
-       if (f == NULL) {
-               RTE_LOG(ERR, EAL, "Cannot open "PROC_MODULES"\n");
-               return -1;
+       n = snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n",
+                    loc->domain, loc->bus, loc->devid, loc->function);
+       if ((n < 0) || (n >= (int)sizeof(buf))) {
+               RTE_LOG(ERR, EAL, "%s(): snprintf failed\n", __func__);
+               goto error;
+       }
+       if (fwrite(buf, n, 1, f) == 0) {
+               RTE_LOG(ERR, EAL, "%s(): could not write to %s\n", __func__,
+                               filename);
+               goto error;
        }
 
-       while(fgets(buf, sizeof(buf), f) != NULL) {
-
-               for (i = 0; i < sizeof(buf) && buf[i] != '\0'; i++) {
-                       if (isspace(buf[i]))
-                           buf[i] = '\0';
-               }
+       fclose(f);
+       return 0;
 
-               if (strncmp(buf, module_name, sizeof(buf)) == 0) {
-                       fclose(f);
-                       return 0;
-               }
-       }
+error:
        fclose(f);
-       RTE_LOG(ERR, EAL, "Cannot find %s in "PROC_MODULES"\n", module_name);
        return -1;
 }
 
-/* bind a PCI to the kernel module driver */
 static int
-pci_uio_bind_device(struct rte_pci_device *dev, const char *module_name)
+pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
 {
-       FILE *f;
-       int n;
-       char buf[BUFSIZ];
-       char uio_newid[PATH_MAX];
-       char uio_bind[PATH_MAX];
-       struct rte_pci_addr *loc = &dev->addr;
-
-       RTE_LOG(DEBUG, EAL, "bind PCI device "PCI_PRI_FMT" to %s driver\n",
-               loc->domain, loc->bus, loc->devid, loc->function, module_name);
+       int count;
+       char path[PATH_MAX];
+       char *name;
 
-       n = rte_snprintf(uio_newid, sizeof(uio_newid), UIO_NEWID, module_name);
-       if ((n < 0) || (n >= (int)sizeof(uio_newid))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf uio_newid name\n");
-               return -1;
-       }
-       n = rte_snprintf(uio_bind, sizeof(uio_bind), UIO_BIND, module_name);
-       if ((n < 0) || (n >= (int)sizeof(uio_bind))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf uio_bind name\n");
+       if (!filename || !dri_name)
                return -1;
-       }
 
-       n = rte_snprintf(buf, sizeof(buf), "%x %x\n",
-                       dev->id.vendor_id, dev->id.device_id);
-       if ((n < 0) || (n >= (int)sizeof(buf))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf vendor_id/device_id\n");
+       count = readlink(filename, path, PATH_MAX);
+       if (count >= PATH_MAX)
                return -1;
-       }
 
-       f = fopen(uio_newid, "w");
-       if (f == NULL) {
-               RTE_LOG(ERR, EAL, "Cannot open %s\n", uio_newid);
-               return -1;
-       }
-       if (fwrite(buf, n, 1, f) == 0) {
-               fclose(f);
-               return -1;
-       }
-       fclose(f);
+       /* For device does not have a driver */
+       if (count < 0)
+               return 1;
 
-       f = fopen(uio_bind, "w");
-       if (f == NULL) {
-               RTE_LOG(ERR, EAL, "Cannot open %s\n", uio_bind);
-               return -1;
-       }
-       n = rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n",
-                        loc->domain, loc->bus, loc->devid, loc->function);
-       if ((n < 0) || (n >= (int)sizeof(buf))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf PCI infos\n");
-               fclose(f);
-               return -1;
-       }
-       if (fwrite(buf, n, 1, f) == 0) {
-               fclose(f);
-               return -1;
-       }
+       path[count] = '\0';
 
-       RTE_LOG(DEBUG, EAL, "Device bound\n");
+       name = strrchr(path, '/');
+       if (name) {
+               strncpy(dri_name, name + 1, strlen(name + 1) + 1);
+               return 0;
+       }
 
-       fclose(f);
-       return 0;
+       return -1;
 }
 
-/* map a particular resource from a file */
-static void *
-pci_map_resource(struct rte_pci_device *dev, void *requested_addr, const char *devname,
-               unsigned long offset, unsigned long size)
+/* Map pci device */
+int
+rte_eal_pci_map_device(struct rte_pci_device *dev)
 {
-       unsigned n;
-       int fd;
-       void *mapaddr;
-
-       /*
-        * open devname, and mmap it: it can take some time to
-        * appear, so we wait some time before returning an error
-        */
-       for (n=0; n<UIO_DEV_WAIT_TIMEOUT*10; n++) {
-               fd = open(devname, O_RDWR);
-               if (fd >= 0)
-                       break;
-               if (errno != ENOENT)
-                       break;
-               usleep(100000);
-       }
-       if (fd < 0) {
-               RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", devname, strerror(errno));
-               goto fail;
-       }
-
-       /* Map the PCI memory resource of device */
-       mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
-                       MAP_SHARED, fd, offset);
-       if (mapaddr == MAP_FAILED ||
-                       (requested_addr != NULL && mapaddr != requested_addr)) {
-               RTE_LOG(ERR, EAL, "%s(): cannot mmap %s: %s\n", __func__,
-                       devname, strerror(errno));
-               close(fd);
-               goto fail;
-       }
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               /* save fd if in primary process */
-               dev->intr_handle.fd = fd;
-               dev->intr_handle.type = RTE_INTR_HANDLE_UIO;
-       } else {
-               /* fd is not needed in slave process, close it */
-               dev->intr_handle.fd = -1;
-               dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
-               close(fd);
-       }
-
-       RTE_LOG(DEBUG, EAL, "PCI memory mapped at %p\n", mapaddr);
-
-       return mapaddr;
-
-fail:
-       dev->intr_handle.fd = -1;
-       dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
-
-       return NULL;
+       int ret = -1;
+
+       /* try mapping the NIC resources using VFIO if it exists */
+       switch (dev->kdrv) {
+       case RTE_KDRV_VFIO:
+#ifdef VFIO_PRESENT
+               if (pci_vfio_is_enabled())
+                       ret = pci_vfio_map_resource(dev);
+#endif
+               break;
+       case RTE_KDRV_IGB_UIO:
+       case RTE_KDRV_UIO_GENERIC:
+               /* map resources for devices that use uio */
+               ret = pci_uio_map_resource(dev);
+               break;
+       default:
+               RTE_LOG(DEBUG, EAL,
+                       "  Not managed by a supported kernel driver, skipped\n");
+               ret = 1;
+               break;
+       }
+
+       return ret;
 }
-/* map the PCI resource of a PCI device in virtual memory */
-static int
-pci_uio_map_resource(struct rte_pci_device *dev)
-{
-       struct dirent *e;
-       DIR *dir;
-       char dirname[PATH_MAX];
-       char dirname2[PATH_MAX];
-       char filename[PATH_MAX];
-       char devname[PATH_MAX]; /* contains the /dev/uioX */
-       void *mapaddr;
-       unsigned uio_num;
-       unsigned long size, offset;
-       struct rte_pci_addr *loc = &dev->addr;
-       struct uio_resource *uio_res;
-
-       RTE_LOG(DEBUG, EAL, "map PCI resource for device "PCI_PRI_FMT"\n",
-               loc->domain, loc->bus, loc->devid, loc->function);
-
-       /* secondary processes - use already recorded details */
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-
-                       TAILQ_FOREACH(uio_res, uio_res_list, next) {
-                               /* skip this element if it doesn't match our PCI address */
-                               if (memcmp(&uio_res->pci_addr, &dev->addr, sizeof(dev->addr)))
-                                       continue;
-
-                               if (pci_map_resource(dev, uio_res->addr, uio_res->path, \
-                                               uio_res->offset, uio_res->size) == uio_res->addr)
-                                       return 0;
-                               else {
-                                       RTE_LOG(ERR, EAL, "Cannot mmap device resource\n");
-                                       return -1;
-                               }
-                       }
-                       RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
-                       return -1;
-       }
-
-       /* depending on kernel version, uio can be located in uio/uioX
-        * or uio:uioX */
-
-       rte_snprintf(dirname, sizeof(dirname),
-                "/sys/bus/pci/devices/" PCI_PRI_FMT "/uio",
-                loc->domain, loc->bus, loc->devid, loc->function);
 
-       dir = opendir(dirname);
-       if (dir == NULL) {
-               /* retry with the parent directory */
-               rte_snprintf(dirname, sizeof(dirname),
-                        "/sys/bus/pci/devices/" PCI_PRI_FMT,
-                        loc->domain, loc->bus, loc->devid, loc->function);
-               dir = opendir(dirname);
-
-               if (dir == NULL) {
-                       RTE_LOG(ERR, EAL, "Cannot opendir %s\n", dirname);
-                       return -1;
-               }
+/* Unmap pci device */
+void
+rte_eal_pci_unmap_device(struct rte_pci_device *dev)
+{
+       /* try unmapping the NIC resources using VFIO if it exists */
+       switch (dev->kdrv) {
+       case RTE_KDRV_VFIO:
+               RTE_LOG(ERR, EAL, "Hotplug doesn't support vfio yet\n");
+               break;
+       case RTE_KDRV_IGB_UIO:
+       case RTE_KDRV_UIO_GENERIC:
+               /* unmap resources for devices that use uio */
+               pci_uio_unmap_resource(dev);
+               break;
+       default:
+               RTE_LOG(DEBUG, EAL,
+                       "  Not managed by a supported kernel driver, skipped\n");
+               break;
        }
+}
 
-       /* take the first file starting with "uio" */
-       while ((e = readdir(dir)) != NULL) {
-               int shortprefix_len = sizeof("uio") - 1; /* format could be uio%d ...*/
-               int longprefix_len = sizeof("uio:uio") - 1; /* ... or uio:uio%d */
-               char *endptr;
-
-               if (strncmp(e->d_name, "uio", 3) != 0)
-                       continue;
-
-               /* first try uio%d */
-               errno = 0;
-               uio_num = strtoull(e->d_name + shortprefix_len, &endptr, 10);
-               if (errno == 0 && endptr != e->d_name) {
-                       rte_snprintf(dirname2, sizeof(dirname2),
-                                "%s/uio%u", dirname, uio_num);
-                       break;
-               }
+void *
+pci_find_max_end_va(void)
+{
+       const struct rte_memseg *seg = rte_eal_get_physmem_layout();
+       const struct rte_memseg *last = seg;
+       unsigned i = 0;
 
-               /* then try uio:uio%d */
-               errno = 0;
-               uio_num = strtoull(e->d_name + longprefix_len, &endptr, 10);
-               if (errno == 0 && endptr != e->d_name) {
-                       rte_snprintf(dirname2, sizeof(dirname2),
-                                "%s/uio:uio%u", dirname, uio_num);
+       for (i = 0; i < RTE_MAX_MEMSEG; i++, seg++) {
+               if (seg->addr == NULL)
                        break;
-               }
-       }
-       closedir(dir);
 
-       /* No uio resource found */
-       if (e == NULL)
-               return 0;
+               if (seg->addr > last->addr)
+                       last = seg;
 
-       /* get mapping offset */
-       rte_snprintf(filename, sizeof(filename),
-                "%s/maps/map0/offset", dirname2);
-       if (eal_parse_sysfs_value(filename, &offset) < 0) {
-               RTE_LOG(ERR, EAL, "%s(): cannot parse offset\n",
-                       __func__);
-               return -1;
-       }
-
-       /* get mapping size */
-       rte_snprintf(filename, sizeof(filename),
-                "%s/maps/map0/size", dirname2);
-       if (eal_parse_sysfs_value(filename, &size) < 0) {
-               RTE_LOG(ERR, EAL, "%s(): cannot parse size\n",
-                       __func__);
-               return -1;
        }
-
-       /* open and mmap /dev/uioX */
-       rte_snprintf(devname, sizeof(devname), "/dev/uio%u", uio_num);
-       mapaddr = pci_map_resource(dev, NULL, devname, offset, size);
-       if (mapaddr == NULL)
-               return -1;
-       dev->mem_resource.addr = mapaddr;
-
-       /* save the mapping details for secondary processes*/
-       uio_res = rte_malloc("UIO_RES", sizeof(*uio_res), 0);
-       if (uio_res == NULL){
-               RTE_LOG(ERR, EAL, "%s(): cannot store uio mmap details\n", __func__);
-               return -1;
-       }
-       uio_res->addr = mapaddr;
-       uio_res->offset = offset;
-       uio_res->size = size;
-       rte_snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname);
-       memcpy(&uio_res->pci_addr, &dev->addr, sizeof(uio_res->pci_addr));
-
-       TAILQ_INSERT_TAIL(uio_res_list, uio_res, next);
-
-       return 0;
+       return RTE_PTR_ADD(last->addr, last->len);
 }
 
 /* parse the "resource" sysfs file */
-#define IORESOURCE_MEM  0x00000200
-
 static int
 pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
 {
@@ -434,12 +216,14 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
        for (i = 0; i<PCI_MAX_RESOURCE; i++) {
 
                if (fgets(buf, sizeof(buf), f) == NULL) {
-                       RTE_LOG(ERR, EAL, "%s(): cannot read resource\n", __func__);
+                       RTE_LOG(ERR, EAL,
+                               "%s(): cannot read resource\n", __func__);
                        goto error;
                }
 
                if (rte_strsplit(buf, sizeof(buf), res_info.ptrs, 3, ' ') != 3) {
-                       RTE_LOG(ERR, EAL, "%s(): bad resource format\n", __func__);
+                       RTE_LOG(ERR, EAL,
+                               "%s(): bad resource format\n", __func__);
                        goto error;
                }
                errno = 0;
@@ -447,15 +231,16 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
                end_addr = strtoull(res_info.end_addr, NULL, 16);
                flags = strtoull(res_info.flags, NULL, 16);
                if (errno != 0) {
-                       RTE_LOG(ERR, EAL, "%s(): bad resource format\n", __func__);
+                       RTE_LOG(ERR, EAL,
+                               "%s(): bad resource format\n", __func__);
                        goto error;
                }
 
                if (flags & IORESOURCE_MEM) {
-                       dev->mem_resource.phys_addr = phys_addr;
-                       dev->mem_resource.len = end_addr - phys_addr + 1;
-                       dev->mem_resource.addr = NULL; /* not mapped for now */
-                       break;
+                       dev->mem_resource[i].phys_addr = phys_addr;
+                       dev->mem_resource[i].len = end_addr - phys_addr + 1;
+                       /* not mapped for now */
+                       dev->mem_resource[i].addr = NULL;
                }
        }
        fclose(f);
@@ -466,7 +251,6 @@ error:
        return -1;
 }
 
-
 /* 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,
@@ -475,11 +259,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;
@@ -488,7 +273,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        dev->addr.function = function;
 
        /* get vendor id */
-       rte_snprintf(filename, sizeof(filename), "%s/vendor", dirname);
+       snprintf(filename, sizeof(filename), "%s/vendor", dirname);
        if (eal_parse_sysfs_value(filename, &tmp) < 0) {
                free(dev);
                return -1;
@@ -496,7 +281,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        dev->id.vendor_id = (uint16_t)tmp;
 
        /* get device id */
-       rte_snprintf(filename, sizeof(filename), "%s/device", dirname);
+       snprintf(filename, sizeof(filename), "%s/device", dirname);
        if (eal_parse_sysfs_value(filename, &tmp) < 0) {
                free(dev);
                return -1;
@@ -504,7 +289,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        dev->id.device_id = (uint16_t)tmp;
 
        /* get subsystem_vendor id */
-       rte_snprintf(filename, sizeof(filename), "%s/subsystem_vendor",
+       snprintf(filename, sizeof(filename), "%s/subsystem_vendor",
                 dirname);
        if (eal_parse_sysfs_value(filename, &tmp) < 0) {
                free(dev);
@@ -513,7 +298,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        dev->id.subsystem_vendor_id = (uint16_t)tmp;
 
        /* get subsystem_device id */
-       rte_snprintf(filename, sizeof(filename), "%s/subsystem_device",
+       snprintf(filename, sizeof(filename), "%s/subsystem_device",
                 dirname);
        if (eal_parse_sysfs_value(filename, &tmp) < 0) {
                free(dev);
@@ -521,16 +306,89 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        }
        dev->id.subsystem_device_id = (uint16_t)tmp;
 
+       /* get max_vfs */
+       dev->max_vfs = 0;
+       snprintf(filename, sizeof(filename), "%s/max_vfs", dirname);
+       if (!access(filename, F_OK) &&
+           eal_parse_sysfs_value(filename, &tmp) == 0)
+               dev->max_vfs = (uint16_t)tmp;
+       else {
+               /* for non igb_uio driver, need kernel version >= 3.8 */
+               snprintf(filename, sizeof(filename),
+                        "%s/sriov_numvfs", dirname);
+               if (!access(filename, F_OK) &&
+                   eal_parse_sysfs_value(filename, &tmp) == 0)
+                       dev->max_vfs = (uint16_t)tmp;
+       }
+
+       /* get numa node */
+       snprintf(filename, sizeof(filename), "%s/numa_node",
+                dirname);
+       if (access(filename, R_OK) != 0) {
+               /* if no NUMA support, set default to 0 */
+               dev->numa_node = 0;
+       } else {
+               if (eal_parse_sysfs_value(filename, &tmp) < 0) {
+                       free(dev);
+                       return -1;
+               }
+               dev->numa_node = tmp;
+       }
+
        /* parse resources */
-       rte_snprintf(filename, sizeof(filename), "%s/resource", dirname);
+       snprintf(filename, sizeof(filename), "%s/resource", dirname);
        if (pci_parse_sysfs_resource(filename, dev) < 0) {
                RTE_LOG(ERR, EAL, "%s(): cannot parse resource\n", __func__);
                free(dev);
                return -1;
        }
 
-       /* device is valid, add in list */
-       TAILQ_INSERT_TAIL(&device_list, dev, next);
+       /* parse driver */
+       snprintf(filename, sizeof(filename), "%s/driver", dirname);
+       ret = pci_get_kernel_driver_by_path(filename, driver);
+       if (ret < 0) {
+               RTE_LOG(ERR, EAL, "Fail to get kernel driver\n");
+               free(dev);
+               return -1;
+       }
+
+       if (!ret) {
+               if (!strcmp(driver, "vfio-pci"))
+                       dev->kdrv = RTE_KDRV_VFIO;
+               else if (!strcmp(driver, "igb_uio"))
+                       dev->kdrv = RTE_KDRV_IGB_UIO;
+               else if (!strcmp(driver, "uio_pci_generic"))
+                       dev->kdrv = RTE_KDRV_UIO_GENERIC;
+               else
+                       dev->kdrv = RTE_KDRV_UNKNOWN;
+       } else
+               dev->kdrv = RTE_KDRV_NONE;
+
+       /* 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;
+               int ret;
+
+               TAILQ_FOREACH(dev2, &pci_device_list, next) {
+                       ret = rte_eal_compare_pci_addr(&dev->addr, &dev2->addr);
+                       if (ret > 0)
+                               continue;
+
+                       if (ret < 0) {
+                               TAILQ_INSERT_BEFORE(dev2, dev, next);
+                       } else { /* already registered */
+                               dev2->kdrv = dev->kdrv;
+                               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);
+       }
 
        return 0;
 }
@@ -568,7 +426,7 @@ parse_pci_addr_format(const char *buf, int bufsize, uint16_t *domain,
 
        /* now convert to int values */
        errno = 0;
-       *domain = (uint8_t)strtoul(splitaddr.domain, NULL, 16);
+       *domain = (uint16_t)strtoul(splitaddr.domain, NULL, 16);
        *bus = (uint8_t)strtoul(splitaddr.bus, NULL, 16);
        *devid = (uint8_t)strtoul(splitaddr.devid, NULL, 16);
        *function = (uint8_t)strtoul(splitaddr.function, NULL, 10);
@@ -586,8 +444,8 @@ error:
  * Scan the content of the PCI bus, and the devices in the devices
  * list
  */
-static int
-pci_scan(void)
+int
+rte_eal_pci_scan(void)
 {
        struct dirent *e;
        DIR *dir;
@@ -610,7 +468,7 @@ pci_scan(void)
                                &bus, &devid, &function) != 0)
                        continue;
 
-               rte_snprintf(dirname, sizeof(dirname), "%s/%s", SYSFS_PCI_DEVICES,
+               snprintf(dirname, sizeof(dirname), "%s/%s", SYSFS_PCI_DEVICES,
                         e->d_name);
                if (pci_scan_one(dirname, domain, bus, devid, function) < 0)
                        goto error;
@@ -623,128 +481,282 @@ error:
        return -1;
 }
 
-/* unbind kernel driver for this device */
-static int
-pci_unbind_kernel_driver(struct rte_pci_device *dev)
+#ifdef RTE_PCI_CONFIG
+/*
+ * It is deprecated, all its configurations have been moved into
+ * each PMD respectively.
+ */
+void
+pci_config_space_set(__rte_unused struct rte_pci_device *dev)
 {
-       int n;
-       FILE *f;
-       char filename[PATH_MAX];
-       char buf[BUFSIZ];
-       struct rte_pci_addr *loc = &dev->addr;
-
-       /* open /sys/bus/pci/devices/AAAA:BB:CC.D/driver */
-       rte_snprintf(filename, sizeof(filename),
-                SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/driver/unbind",
-                loc->domain, loc->bus, loc->devid, loc->function);
-
-       RTE_LOG(DEBUG, EAL, "unbind kernel driver %s\n", filename);
-
-       f = fopen(filename, "w");
-       if (f == NULL) /* device was not bound */
-               return 0;
+       RTE_LOG(DEBUG, EAL, "Nothing here, as it is deprecated\n");
+}
+#endif
 
-       n = rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n",
-                    loc->domain, loc->bus, loc->devid, loc->function);
-       if ((n < 0) || (n >= (int)sizeof(buf))) {
-               RTE_LOG(ERR, EAL, "%s(): rte_snprintf failed\n", __func__);
-               goto error;
+/* Read PCI config space. */
+int rte_eal_pci_read_config(const struct rte_pci_device *device,
+                           void *buf, size_t len, off_t offset)
+{
+       const struct rte_intr_handle *intr_handle = &device->intr_handle;
+
+       switch (intr_handle->type) {
+       case RTE_INTR_HANDLE_UIO:
+       case RTE_INTR_HANDLE_UIO_INTX:
+               return pci_uio_read_config(intr_handle, buf, len, offset);
+
+#ifdef VFIO_PRESENT
+       case RTE_INTR_HANDLE_VFIO_MSIX:
+       case RTE_INTR_HANDLE_VFIO_MSI:
+       case RTE_INTR_HANDLE_VFIO_LEGACY:
+               return pci_vfio_read_config(intr_handle, buf, len, offset);
+#endif
+       default:
+               RTE_LOG(ERR, EAL,
+                       "Unknown handle type of fd %d\n",
+                                       intr_handle->fd);
+               return -1;
        }
-       if (fwrite(buf, n, 1, f) == 0)
-               goto error;
-
-       fclose(f);
-       return 0;
+}
 
-error:
-       fclose(f);
-       return -1;
+/* Write PCI config space. */
+int rte_eal_pci_write_config(const struct rte_pci_device *device,
+                            const void *buf, size_t len, off_t offset)
+{
+       const struct rte_intr_handle *intr_handle = &device->intr_handle;
+
+       switch (intr_handle->type) {
+       case RTE_INTR_HANDLE_UIO:
+       case RTE_INTR_HANDLE_UIO_INTX:
+               return pci_uio_write_config(intr_handle, buf, len, offset);
+
+#ifdef VFIO_PRESENT
+       case RTE_INTR_HANDLE_VFIO_MSIX:
+       case RTE_INTR_HANDLE_VFIO_MSI:
+       case RTE_INTR_HANDLE_VFIO_LEGACY:
+               return pci_vfio_write_config(intr_handle, buf, len, offset);
+#endif
+       default:
+               RTE_LOG(ERR, EAL,
+                       "Unknown handle type of fd %d\n",
+                                       intr_handle->fd);
+               return -1;
+       }
 }
 
-/*
- * If vendor/device ID match, call the devinit() function of the
- * driver.
- */
-int
-rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
+#if defined(RTE_ARCH_X86)
+static int
+pci_ioport_map(struct rte_pci_device *dev, int bar __rte_unused,
+              struct rte_pci_ioport *p)
 {
-       struct rte_pci_id *id_table;
-       const char *module_name = NULL;
-       int uio_status = -1;
+       uint16_t start, end;
+       FILE *fp;
+       char *line = NULL;
+       char pci_id[16];
+       int found = 0;
+       size_t linesz;
+
+       snprintf(pci_id, sizeof(pci_id), PCI_PRI_FMT,
+                dev->addr.domain, dev->addr.bus,
+                dev->addr.devid, dev->addr.function);
+
+       fp = fopen("/proc/ioports", "r");
+       if (fp == NULL) {
+               RTE_LOG(ERR, EAL, "%s(): can't open ioports\n", __func__);
+               return -1;
+       }
 
-       if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
-               module_name = IGB_UIO_NAME;
+       while (getdelim(&line, &linesz, '\n', fp) > 0) {
+               char *ptr = line;
+               char *left;
+               int n;
 
-       uio_status = pci_uio_check_module(module_name);
+               n = strcspn(ptr, ":");
+               ptr[n] = 0;
+               left = &ptr[n + 1];
 
-       for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
+               while (*left && isspace(*left))
+                       left++;
 
-               /* check if device's identifiers match the driver's ones */
-               if (id_table->vendor_id != dev->id.vendor_id &&
-                   id_table->vendor_id != PCI_ANY_ID)
-                       continue;
-               if (id_table->device_id != dev->id.device_id &&
-                   id_table->device_id != PCI_ANY_ID)
-                       continue;
-               if (id_table->subsystem_vendor_id != dev->id.subsystem_vendor_id &&
-                   id_table->subsystem_vendor_id != PCI_ANY_ID)
-                       continue;
-               if (id_table->subsystem_device_id != dev->id.subsystem_device_id &&
-                   id_table->subsystem_device_id != PCI_ANY_ID)
-                       continue;
+               if (!strncmp(left, pci_id, strlen(pci_id))) {
+                       found = 1;
 
-               RTE_LOG(DEBUG, EAL, "probe driver: %x:%x %s\n",
-               dev->id.vendor_id, dev->id.device_id, dr->name);
+                       while (*ptr && isspace(*ptr))
+                               ptr++;
 
-               if ((!dev->blacklisted) && (uio_status != 0)) {
-                       rte_exit(1, "The %s module is required by the %s driver\n",
-                                       module_name, dr->name);
-               }
+                       sscanf(ptr, "%04hx-%04hx", &start, &end);
 
-               /* Unbind PCI devices if needed */
-               if ((!dev->blacklisted) &&
-                   (module_name != NULL)) {
-                       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-                       /* unbind current driver, bind ours */
-                               if (pci_unbind_kernel_driver(dev) < 0)
-                                       return -1;
-                               if (pci_uio_bind_device(dev, module_name) < 0)
-                                       return -1;
-                       }
-                       /* map the NIC resources */
-                       if (pci_uio_map_resource(dev) < 0)
-                               return -1;
+                       break;
                }
+       }
 
-               /* reference driver structure */
-               dev->driver = dr;
+       free(line);
+       fclose(fp);
 
-               /* no initialization when blacklisted */
-               if (dev->blacklisted)
-                       return -1;
+       if (!found)
+               return -1;
+
+       dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
+       p->base = start;
+       RTE_LOG(DEBUG, EAL, "PCI Port IO found start=0x%x\n", start);
+
+       return 0;
+}
+#endif
+
+int
+rte_eal_pci_ioport_map(struct rte_pci_device *dev, int bar,
+                      struct rte_pci_ioport *p)
+{
+       int ret = -1;
+
+       switch (dev->kdrv) {
+#ifdef VFIO_PRESENT
+       case RTE_KDRV_VFIO:
+               if (pci_vfio_is_enabled())
+                       ret = pci_vfio_ioport_map(dev, bar, p);
+               break;
+#endif
+       case RTE_KDRV_IGB_UIO:
+               ret = pci_uio_ioport_map(dev, bar, p);
+               break;
+       case RTE_KDRV_UIO_GENERIC:
+#if defined(RTE_ARCH_X86)
+               ret = pci_ioport_map(dev, bar, p);
+#else
+               ret = pci_uio_ioport_map(dev, bar, p);
+#endif
+               break;
+       case RTE_KDRV_NONE:
+#if defined(RTE_ARCH_X86)
+               ret = pci_ioport_map(dev, bar, p);
+#endif
+               break;
+       default:
+               break;
+       }
+
+       if (!ret)
+               p->dev = dev;
+
+       return ret;
+}
 
-               /* call the driver devinit() function */
-               return dr->devinit(dr, dev);
+void
+rte_eal_pci_ioport_read(struct rte_pci_ioport *p,
+                       void *data, size_t len, off_t offset)
+{
+       switch (p->dev->kdrv) {
+#ifdef VFIO_PRESENT
+       case RTE_KDRV_VFIO:
+               pci_vfio_ioport_read(p, data, len, offset);
+               break;
+#endif
+       case RTE_KDRV_IGB_UIO:
+               pci_uio_ioport_read(p, data, len, offset);
+               break;
+       case RTE_KDRV_UIO_GENERIC:
+               pci_uio_ioport_read(p, data, len, offset);
+               break;
+       case RTE_KDRV_NONE:
+#if defined(RTE_ARCH_X86)
+               pci_uio_ioport_read(p, data, len, offset);
+#endif
+               break;
+       default:
+               break;
+       }
+}
 
+void
+rte_eal_pci_ioport_write(struct rte_pci_ioport *p,
+                        const void *data, size_t len, off_t offset)
+{
+       switch (p->dev->kdrv) {
+#ifdef VFIO_PRESENT
+       case RTE_KDRV_VFIO:
+               pci_vfio_ioport_write(p, data, len, offset);
+               break;
+#endif
+       case RTE_KDRV_IGB_UIO:
+               pci_uio_ioport_write(p, data, len, offset);
+               break;
+       case RTE_KDRV_UIO_GENERIC:
+               pci_uio_ioport_write(p, data, len, offset);
+               break;
+       case RTE_KDRV_NONE:
+#if defined(RTE_ARCH_X86)
+               pci_uio_ioport_write(p, data, len, offset);
+#endif
+               break;
+       default:
+               break;
        }
-       return -1;
+}
+
+int
+rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p)
+{
+       int ret = -1;
+
+       switch (p->dev->kdrv) {
+#ifdef VFIO_PRESENT
+       case RTE_KDRV_VFIO:
+               if (pci_vfio_is_enabled())
+                       ret = pci_vfio_ioport_unmap(p);
+               break;
+#endif
+       case RTE_KDRV_IGB_UIO:
+               ret = pci_uio_ioport_unmap(p);
+               break;
+       case RTE_KDRV_UIO_GENERIC:
+#if defined(RTE_ARCH_X86)
+               ret = 0;
+#else
+               ret = pci_uio_ioport_unmap(p);
+#endif
+               break;
+       case RTE_KDRV_NONE:
+#if defined(RTE_ARCH_X86)
+               ret = 0;
+#endif
+               break;
+       default:
+               break;
+       }
+
+       return ret;
 }
 
 /* Init the PCI EAL subsystem */
 int
 rte_eal_pci_init(void)
 {
-       TAILQ_INIT(&driver_list);
-       TAILQ_INIT(&device_list);
-       uio_res_list = RTE_TAILQ_RESERVE_BY_IDX(RTE_TAILQ_PCI, uio_res_list);
+       TAILQ_INIT(&pci_driver_list);
+       TAILQ_INIT(&pci_device_list);
 
        /* for debug purposes, PCI can be disabled */
        if (internal_config.no_pci)
                return 0;
 
-       if (pci_scan() < 0) {
+       if (rte_eal_pci_scan() < 0) {
                RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__);
                return -1;
        }
+#ifdef VFIO_PRESENT
+       pci_vfio_enable();
+
+       if (pci_vfio_is_enabled()) {
+
+               /* if we are primary process, create a thread to communicate with
+                * secondary processes. the thread will use a socket to wait for
+                * requests from secondary process to send open file descriptors,
+                * because VFIO does not allow multiple open descriptors on a group or
+                * VFIO container.
+                */
+               if (internal_config.process_type == RTE_PROC_PRIMARY &&
+                               pci_vfio_mp_sync_setup() < 0)
+                       return -1;
+       }
+#endif
        return 0;
 }