X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Flinux%2Fpci.c;h=69d26fd7d64e5e39ec4035395bc2e71fb94be035;hb=38c619115;hp=30188d1a2addb2fc312d21cbfcca8ced676e692a;hpb=599a16bf8afeee9937cf3b12f2385a454d956bc7;p=vpp.git

diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index 30188d1a2ad..69d26fd7d64 100644
--- a/src/vlib/linux/pci.c
+++ b/src/vlib/linux/pci.c
@@ -42,6 +42,7 @@
 #include <vlib/vlib.h>
 #include <vlib/pci/pci.h>
 #include <vlib/unix/unix.h>
+#include <vlib/linux/vfio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -54,11 +55,24 @@
 #include <linux/vfio.h>
 #include <sys/eventfd.h>
 
+#define SYSFS_DEVICES_PCI "/sys/devices/pci"
 static const char *sysfs_pci_dev_path = "/sys/bus/pci/devices";
 static const char *sysfs_pci_drv_path = "/sys/bus/pci/drivers";
 static char *sysfs_mod_vfio_noiommu =
   "/sys/module/vfio/parameters/enable_unsafe_noiommu_mode";
 
+VLIB_REGISTER_LOG_CLASS (pci_log, static) = {
+  .class_name = "pci",
+  .subclass_name = "linux",
+};
+
+#define log_debug(p, f, ...)                                                  \
+  vlib_log (VLIB_LOG_LEVEL_DEBUG, pci_log.class, "%U: " f,                    \
+	    format_vlib_pci_log, p->handle, ##__VA_ARGS__)
+#define log_err(p, f, ...)                                                    \
+  vlib_log (VLIB_LOG_LEVEL_ERR, pci_log.class, "%U: " f, format_vlib_pci_log, \
+	    p->handle, ##__VA_ARGS__)
+
 typedef struct
 {
   int fd;
@@ -72,6 +86,7 @@ typedef struct
   u32 clib_file_index;
   union
   {
+    pci_intx_handler_function_t *intx_handler;
     pci_msix_handler_function_t *msix_handler;
   };
 } linux_pci_irq_t;
@@ -88,6 +103,7 @@ typedef struct
   linux_pci_device_type_t type;
   vlib_pci_dev_handle_t handle;
   vlib_pci_addr_t addr;
+  u32 numa_node;
 
   /* Resource file descriptors. */
   linux_pci_region_t *regions;
@@ -99,27 +115,23 @@ typedef struct
   /* Device File descriptor */
   int fd;
 
+  /* read/write file descriptor for io bar */
+  int io_fd;
+  u64 io_offset;
+
   /* Minor device for uio device. */
   u32 uio_minor;
 
-  /* Index given by clib_file_add. */
-  u32 clib_file_index;
-
-  /* Interrupt handler */
-  void (*interrupt_handler) (vlib_pci_dev_handle_t h);
+  /* Interrupt handlers */
+  linux_pci_irq_t intx_irq;
   linux_pci_irq_t *msix_irqs;
 
   /* private data */
   uword private_data;
 
-} linux_pci_device_t;
+  u8 supports_va_dma;
 
-typedef struct
-{
-  int group;
-  int fd;
-  int refcnt;
-} linux_pci_vfio_iommu_group_t;
+} linux_pci_device_t;
 
 /* Pool of PCI devices. */
 typedef struct
@@ -127,16 +139,6 @@ typedef struct
   vlib_main_t *vlib_main;
   linux_pci_device_t *linux_pci_devices;
 
-  /* VFIO */
-  int vfio_container_fd;
-  int vfio_iommu_mode;
-
-  /* pool of IOMMU groups */
-  linux_pci_vfio_iommu_group_t *iommu_groups;
-
-  /* iommu group pool index by group id  hash */
-  uword *iommu_pool_index_by_group;
-
 } linux_pci_main_t;
 
 extern linux_pci_main_t linux_pci_main;
@@ -149,26 +151,52 @@ linux_pci_get_device (vlib_pci_dev_handle_t h)
 }
 
 uword
-vlib_pci_get_private_data (vlib_pci_dev_handle_t h)
+vlib_pci_get_private_data (vlib_main_t * vm, vlib_pci_dev_handle_t h)
 {
   linux_pci_device_t *d = linux_pci_get_device (h);
   return d->private_data;
 }
 
 void
-vlib_pci_set_private_data (vlib_pci_dev_handle_t h, uword private_data)
+vlib_pci_set_private_data (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+			   uword private_data)
 {
   linux_pci_device_t *d = linux_pci_get_device (h);
   d->private_data = private_data;
 }
 
 vlib_pci_addr_t *
-vlib_pci_get_addr (vlib_pci_dev_handle_t h)
+vlib_pci_get_addr (vlib_main_t * vm, vlib_pci_dev_handle_t h)
 {
   linux_pci_device_t *d = linux_pci_get_device (h);
   return &d->addr;
 }
 
+u32
+vlib_pci_get_numa_node (vlib_main_t * vm, vlib_pci_dev_handle_t h)
+{
+  linux_pci_device_t *d = linux_pci_get_device (h);
+  return d->numa_node;
+}
+
+u32
+vlib_pci_get_num_msix_interrupts (vlib_main_t * vm, vlib_pci_dev_handle_t h)
+{
+  linux_pci_device_t *d = linux_pci_get_device (h);
+
+  if (d->type == LINUX_PCI_DEVICE_TYPE_VFIO)
+    {
+      struct vfio_irq_info ii = { 0 };
+
+      ii.argsz = sizeof (struct vfio_irq_info);
+      ii.index = VFIO_PCI_MSIX_IRQ_INDEX;
+      if (ioctl (d->fd, VFIO_DEVICE_GET_IRQ_INFO, &ii) < 0)
+	return 0;
+      return ii.count;
+    }
+  return 0;
+}
+
 /* Call to allocate/initialize the pci subsystem.
    This is not an init function so that users can explicitly enable
    pci only when it's needed. */
@@ -177,17 +205,19 @@ clib_error_t *pci_bus_init (vlib_main_t * vm);
 linux_pci_main_t linux_pci_main;
 
 vlib_pci_device_info_t *
-vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
+vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr,
+			  clib_error_t ** error)
 {
-  linux_pci_main_t *lpm = &linux_pci_main;
   clib_error_t *err;
   vlib_pci_device_info_t *di;
   u8 *f = 0;
   u32 tmp;
   int fd;
+  u8 *tmpstr;
+  clib_bitmap_t *bmp = 0;
 
   di = clib_mem_alloc (sizeof (vlib_pci_device_info_t));
-  memset (di, 0, sizeof (vlib_pci_device_info_t));
+  clib_memset (di, 0, sizeof (vlib_pci_device_info_t));
   di->addr.as_u32 = addr->as_u32;
 
   u8 *dev_dir_name = format (0, "%s/%U", sysfs_pci_dev_path,
@@ -208,41 +238,33 @@ vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
 
   /* You can only read more that 64 bytes of config space as root; so we try to
      read the full space but fall back to just the first 64 bytes. */
-  if (read (fd, &di->config_data, sizeof (di->config_data)) <
-      sizeof (di->config0))
+  if (read (fd, &di->config, sizeof (di->config)) <
+      sizeof (vlib_pci_config_hdr_t))
     {
       err = clib_error_return_unix (0, "read `%s'", f);
       close (fd);
       goto error;
     }
 
-  {
-    static pci_config_header_t all_ones;
-    if (all_ones.vendor_id == 0)
-      memset (&all_ones, ~0, sizeof (all_ones));
-
-    if (!memcmp (&di->config0.header, &all_ones, sizeof (all_ones)))
-      {
-	err = clib_error_return (0, "invalid PCI config for `%s'", f);
-	close (fd);
-	goto error;
-      }
-  }
-
-  if (di->config0.header.header_type == 0)
-    pci_config_type0_little_to_host (&di->config0);
-  else
-    pci_config_type1_little_to_host (&di->config1);
-
   di->numa_node = -1;
   vec_reset_length (f);
   f = format (f, "%v/numa_node%c", dev_dir_name, 0);
-  err = clib_sysfs_read ((char *) f, "%u", &di->numa_node);
+  err = clib_sysfs_read ((char *) f, "%d", &di->numa_node);
   if (err)
     {
       di->numa_node = -1;
       clib_error_free (err);
     }
+  if (di->numa_node == -1)
+    {
+      /* if '/sys/bus/pci/devices/<device id>/numa_node' returns -1 and
+         it is a SMP system, set numa_node to 0. */
+      if ((err = clib_sysfs_read ("/sys/devices/system/node/online", "%U",
+				  unformat_bitmap_list, &bmp)))
+	clib_error_free (err);
+      if (clib_bitmap_count_set_bits (bmp) == 1)
+	di->numa_node = 0;
+    }
 
   vec_reset_length (f);
   f = format (f, "%v/class%c", dev_dir_name, 0);
@@ -266,23 +288,37 @@ vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
   di->device_id = tmp;
 
   vec_reset_length (f);
-  f = format (f, "%v/driver%c", dev_dir_name, 0);
-  di->driver_name = clib_sysfs_link_to_name ((char *) f);
+  f = format (f, "%v/revision%c", dev_dir_name, 0);
+  err = clib_sysfs_read ((char *) f, "0x%x", &tmp);
+  if (err)
+    goto error;
+  di->revision = tmp;
+
+  di->driver_name =
+    clib_file_get_resolved_basename ("%v/driver", dev_dir_name);
+  if (!di->driver_name)
+    di->driver_name = format (0, "<NONE>%c", 0);
 
   di->iommu_group = -1;
-  if (lpm->vfio_container_fd != -1)
+  tmpstr = clib_file_get_resolved_basename ("%v/iommu_group", dev_dir_name);
+  if (tmpstr)
     {
-      u8 *tmpstr;
-      vec_reset_length (f);
-      f = format (f, "%v/iommu_group%c", dev_dir_name, 0);
-      tmpstr = clib_sysfs_link_to_name ((char *) f);
-      if (tmpstr)
-	{
-	  di->iommu_group = atoi ((char *) tmpstr);
-	  vec_free (tmpstr);
-	}
+      di->iommu_group = atoi ((char *) tmpstr);
+      vec_free (tmpstr);
     }
 
+  vec_reset_length (f);
+  f = format (f, "%v/iommu_group/name%c", dev_dir_name, 0);
+  err = clib_sysfs_read ((char *) f, "%s", &tmpstr);
+  if (err == 0)
+    {
+      if (strncmp ((char *) tmpstr, "vfio-noiommu", 12) == 0)
+	di->flags |= VLIB_PCI_DEVICE_INFO_F_NOIOMMU;
+      vec_free (tmpstr);
+    }
+  else
+    clib_error_free (err);
+
   close (fd);
 
   vec_reset_length (f);
@@ -303,7 +339,7 @@ vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
 	    break;
 
 	  len = (tag[2] << 8) | tag[1];
-	  vec_validate (data, len);
+	  vec_validate (data, len - 1);
 
 	  if (read (fd, data, len) != len)
 	    {
@@ -329,6 +365,7 @@ error:
   di = 0;
 
 done:
+  vec_free (bmp);
   vec_free (f);
   vec_free (dev_dir_name);
   if (error)
@@ -338,6 +375,64 @@ done:
   return di;
 }
 
+clib_error_t *__attribute__ ((weak))
+vlib_pci_get_device_root_bus (vlib_pci_addr_t *addr, vlib_pci_addr_t *root_bus)
+{
+  u8 *rel_path = 0, *abs_path = 0, *link_path = 0;
+  unformat_input_t input;
+  int fd = open (sysfs_pci_dev_path, O_RDONLY);
+  ssize_t size = 0;
+  u32 domain = 0, bus;
+  clib_error_t *err = NULL;
+
+  if (fd < 0)
+    return clib_error_return_unix (0, "failed to open %s", sysfs_pci_dev_path);
+
+  vec_alloc (rel_path, PATH_MAX);
+  vec_alloc (abs_path, PATH_MAX);
+
+  link_path =
+    format (0, "%s/%U", sysfs_pci_dev_path, format_vlib_pci_addr, addr);
+  size = readlinkat (fd, (char *) link_path, (char *) rel_path, PATH_MAX);
+  if (size < 0)
+    {
+      err = clib_error_return_unix (0, "failed to read %s", rel_path);
+      goto done;
+    }
+
+  rel_path[size] = '\0';
+  vec_free (link_path);
+
+  link_path = format (0, "%s/%s", sysfs_pci_dev_path, rel_path);
+  if (!realpath ((char *) link_path, (char *) abs_path))
+    {
+      err = clib_error_return_unix (0, "failed to resolve %s", link_path);
+      goto done;
+    }
+
+  unformat_init_string (&input, (char *) abs_path,
+			clib_strnlen ((char *) abs_path, PATH_MAX));
+
+  if (!unformat (&input, SYSFS_DEVICES_PCI "%x:%x/%s", &domain, &bus,
+		 link_path))
+    {
+      err = clib_error_return (0, "unknown input '%U'", format_unformat_error,
+			       input);
+      goto done;
+    }
+
+  root_bus->domain = domain;
+  root_bus->bus = bus;
+
+done:
+  vec_free (abs_path);
+  vec_free (link_path);
+  vec_free (rel_path);
+  close (fd);
+
+  return err;
+}
+
 static int
 directory_exists (char *path)
 {
@@ -349,7 +444,8 @@ directory_exists (char *path)
 }
 
 clib_error_t *
-vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
+vlib_pci_bind_to_uio (vlib_main_t *vm, vlib_pci_addr_t *addr,
+		      char *uio_drv_name, int force)
 {
   clib_error_t *error = 0;
   u8 *s = 0, *driver_name = 0;
@@ -360,7 +456,7 @@ vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
   u8 *dev_dir_name = format (0, "%s/%U", sysfs_pci_dev_path,
 			     format_vlib_pci_addr, addr);
 
-  di = vlib_pci_get_device_info (addr, &error);
+  di = vlib_pci_get_device_info (vm, addr, &error);
 
   if (error)
     return error;
@@ -381,7 +477,7 @@ vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
 					 "is bound to IOMMU group and "
 					 "vfio-pci driver is not loaded",
 					 format_vlib_pci_addr, addr);
-	      goto done;
+	      goto err0;
 	    }
 	  else
 	    uio_drv_name = "vfio-pci";
@@ -402,89 +498,94 @@ vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
 	      error = clib_error_return (0, "Skipping PCI device %U: missing "
 					 "kernel VFIO or UIO driver",
 					 format_vlib_pci_addr, addr);
-	      goto done;
+	      goto err0;
 	    }
 	  clib_error_free (error);
 	}
     }
 
-  s = format (s, "%v/driver%c", dev_dir_name, 0);
-  driver_name = clib_sysfs_link_to_name ((char *) s);
-  vec_reset_length (s);
+  driver_name = clib_file_get_resolved_basename ("%v/driver", dev_dir_name);
 
   if (driver_name &&
       ((strcmp ("vfio-pci", (char *) driver_name) == 0) ||
        (strcmp ("uio_pci_generic", (char *) driver_name) == 0) ||
        (strcmp ("igb_uio", (char *) driver_name) == 0)))
-    goto done;
+    goto err0;
 
-  /* walk trough all linux interfaces and if interface belonging to
-     this device is founf check if interface is admin up  */
-  dir = opendir ("/sys/class/net");
-  s = format (s, "%U%c", format_vlib_pci_addr, addr, 0);
-
-  if (!dir)
+  if (!force)
     {
-      error = clib_error_return (0, "Skipping PCI device %U: failed to "
-				 "read /sys/class/net",
-				 format_vlib_pci_addr, addr);
-      goto done;
-    }
+      /* walk trough all linux interfaces and if interface belonging to
+	 this device is found check if interface is admin up  */
+      dir = opendir ("/sys/class/net");
+      s = format (s, "%U%c", format_vlib_pci_addr, addr, 0);
 
-  fd = socket (PF_INET, SOCK_DGRAM, 0);
-  if (fd < 0)
-    {
-      error = clib_error_return_unix (0, "socket");
-      goto done;
-    }
-
-  while ((e = readdir (dir)))
-    {
-      struct ifreq ifr;
-      struct ethtool_drvinfo drvinfo;
-
-      if (e->d_name[0] == '.')	/* skip . and .. */
-	continue;
-
-      memset (&ifr, 0, sizeof ifr);
-      memset (&drvinfo, 0, sizeof drvinfo);
-      ifr.ifr_data = (char *) &drvinfo;
-      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
-      drvinfo.cmd = ETHTOOL_GDRVINFO;
-      if (ioctl (fd, SIOCETHTOOL, &ifr) < 0)
+      if (!dir)
 	{
-	  /* Some interfaces (eg "lo") don't support this ioctl */
-	  if ((errno != ENOTSUP) && (errno != ENODEV))
-	    clib_unix_warning ("ioctl fetch intf %s bus info error",
-			       e->d_name);
-	  continue;
+	  error = clib_error_return (0,
+				     "Skipping PCI device %U: failed to "
+				     "read /sys/class/net",
+				     format_vlib_pci_addr, addr);
+	  goto err0;
 	}
 
-      if (strcmp ((char *) s, drvinfo.bus_info))
-	continue;
-
-      memset (&ifr, 0, sizeof (ifr));
-      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
-      if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0)
+      fd = socket (PF_INET, SOCK_DGRAM, 0);
+      if (fd < 0)
 	{
-	  error = clib_error_return_unix (0, "ioctl fetch intf %s flags",
-					  e->d_name);
-	  close (fd);
-	  goto done;
+	  error = clib_error_return_unix (0, "socket");
+	  goto err1;
 	}
 
-      if (ifr.ifr_flags & IFF_UP)
+      while ((e = readdir (dir)))
 	{
-	  error = clib_error_return (0, "Skipping PCI device %U as host "
-				     "interface %s is up",
-				     format_vlib_pci_addr, addr, e->d_name);
-	  close (fd);
-	  goto done;
+	  struct ifreq ifr;
+	  struct ethtool_drvinfo drvinfo;
+
+	  if (e->d_name[0] == '.') /* skip . and .. */
+	    continue;
+
+	  clib_memset (&ifr, 0, sizeof ifr);
+	  clib_memset (&drvinfo, 0, sizeof drvinfo);
+	  ifr.ifr_data = (char *) &drvinfo;
+	  clib_strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name) - 1);
+
+	  drvinfo.cmd = ETHTOOL_GDRVINFO;
+	  if (ioctl (fd, SIOCETHTOOL, &ifr) < 0)
+	    {
+	      /* Some interfaces (eg "lo") don't support this ioctl */
+	      if ((errno != ENOTSUP) && (errno != ENODEV))
+		clib_unix_warning ("ioctl fetch intf %s bus info error",
+				   e->d_name);
+	      continue;
+	    }
+
+	  if (strcmp ((char *) s, drvinfo.bus_info))
+	    continue;
+
+	  clib_memset (&ifr, 0, sizeof (ifr));
+	  clib_strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name) - 1);
+
+	  if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0)
+	    {
+	      error = clib_error_return_unix (0, "ioctl fetch intf %s flags",
+					      e->d_name);
+	      close (fd);
+	      goto err1;
+	    }
+
+	  if (ifr.ifr_flags & IFF_UP)
+	    {
+	      vlib_log (VLIB_LOG_LEVEL_WARNING, pci_main.log_default,
+			"Skipping PCI device %U as host "
+			"interface %s is up",
+			format_vlib_pci_addr, addr, e->d_name);
+	      close (fd);
+	      goto err1;
+	    }
 	}
-    }
 
-  close (fd);
-  vec_reset_length (s);
+      close (fd);
+      vec_reset_length (s);
+    }
 
   s = format (s, "%v/driver/unbind%c", dev_dir_name, 0);
   clib_sysfs_write ((char *) s, "%U", format_vlib_pci_addr, addr);
@@ -516,8 +617,9 @@ vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
       vec_reset_length (s);
     }
 
-done:
+err1:
   closedir (dir);
+err0:
   vec_free (s);
   vec_free (dev_dir_name);
   vec_free (driver_name);
@@ -541,23 +643,30 @@ scan_uio_dir (void *arg, u8 * path_name, u8 * file_name)
 }
 
 static clib_error_t *
-vfio_set_irqs (linux_pci_device_t * p, u32 index, u32 start, u32 count,
-	       u32 flags, int *efds)
+vfio_set_irqs (vlib_main_t * vm, linux_pci_device_t * p, u32 index, u32 start,
+	       u32 count, u32 flags, int *efds)
 {
   int data_len = efds ? count * sizeof (int) : 0;
   u8 buf[sizeof (struct vfio_irq_set) + data_len];
-  struct vfio_irq_info irq_info = { 0 };
+  struct vfio_irq_info ii = { 0 };
   struct vfio_irq_set *irq_set = (struct vfio_irq_set *) buf;
 
 
-  irq_info.argsz = sizeof (struct vfio_irq_info);
-  irq_info.index = index;
+  ii.argsz = sizeof (struct vfio_irq_info);
+  ii.index = index;
 
-  if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info) < 0)
+  if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &ii) < 0)
     return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_IRQ_INFO) "
 				   "'%U'", format_vlib_pci_addr, &p->addr);
 
-  if (irq_info.count < start + count)
+  log_debug (p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)", __func__,
+	     ii.index, ii.count,
+	     ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "",
+	     ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "",
+	     ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "",
+	     ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "", ii.flags);
+
+  if (ii.count < start + count)
     return clib_error_return_unix (0, "vfio_set_irq: unexistng interrupt on "
 				   "'%U'", format_vlib_pci_addr, &p->addr);
 
@@ -565,7 +674,7 @@ vfio_set_irqs (linux_pci_device_t * p, u32 index, u32 start, u32 count,
   if (efds)
     {
       flags |= VFIO_IRQ_SET_DATA_EVENTFD;
-      clib_memcpy (&irq_set->data, efds, data_len);
+      clib_memcpy_fast (&irq_set->data, efds, data_len);
     }
   else
     flags |= VFIO_IRQ_SET_DATA_NONE;
@@ -591,46 +700,27 @@ vfio_set_irqs (linux_pci_device_t * p, u32 index, u32 start, u32 count,
 static clib_error_t *
 linux_pci_uio_read_ready (clib_file_t * uf)
 {
+  vlib_main_t *vm = vlib_get_main ();
   int __attribute__ ((unused)) rv;
   vlib_pci_dev_handle_t h = uf->private_data;
   linux_pci_device_t *p = linux_pci_get_device (h);
+  linux_pci_irq_t *irq = &p->intx_irq;
 
   u32 icount;
   rv = read (uf->file_descriptor, &icount, 4);
 
-  if (p->interrupt_handler)
-    p->interrupt_handler (h);
+  if (irq->intx_handler)
+    irq->intx_handler (vm, h);
 
-  vlib_pci_intr_enable (h);
+  vlib_pci_intr_enable (vm, h);
 
   return /* no error */ 0;
 }
 
 static clib_error_t *
-linux_pci_vfio_unmask_intx (linux_pci_device_t * d)
+linux_pci_vfio_unmask_intx (vlib_main_t * vm, linux_pci_device_t * d)
 {
-  clib_error_t *err = 0;
-  struct vfio_irq_set i = {
-    .argsz = sizeof (struct vfio_irq_set),
-    .start = 0,
-    .count = 1,
-    .index = VFIO_PCI_INTX_IRQ_INDEX,
-    .flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_UNMASK,
-  };
-
-  if (ioctl (d->fd, VFIO_DEVICE_SET_IRQS, &i) < 0)
-    {
-      err = clib_error_return_unix (0, "ioctl(VFIO_DEVICE_SET_IRQS) '%U'",
-				    format_vlib_pci_addr, &d->addr);
-    }
-  return err;
-}
-
-clib_error_t *
-vlib_pci_vfio_unmask_msix (vlib_pci_dev_handle_t h, u32 start, u32 count)
-{
-  linux_pci_device_t *p = linux_pci_get_device (h);
-  return vfio_set_irqs (p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
+  return vfio_set_irqs (vm, d, VFIO_PCI_INTX_IRQ_INDEX, 0, 1,
 			VFIO_IRQ_SET_ACTION_UNMASK, 0);
 }
 
@@ -645,6 +735,7 @@ linux_pci_uio_error_ready (clib_file_t * uf)
 static clib_error_t *
 linux_pci_vfio_msix_read_ready (clib_file_t * uf)
 {
+  vlib_main_t *vm = vlib_get_main ();
   int __attribute__ ((unused)) rv;
   vlib_pci_dev_handle_t h = uf->private_data >> 16;
   u16 line = uf->private_data & 0xffff;
@@ -655,7 +746,7 @@ linux_pci_vfio_msix_read_ready (clib_file_t * uf)
   rv = read (uf->file_descriptor, &icount, sizeof (icount));
 
   if (irq->msix_handler)
-    irq->msix_handler (h, line);
+    irq->msix_handler (vm, h, line);
 
   return /* no error */ 0;
 }
@@ -663,17 +754,19 @@ linux_pci_vfio_msix_read_ready (clib_file_t * uf)
 static clib_error_t *
 linux_pci_vfio_intx_read_ready (clib_file_t * uf)
 {
+  vlib_main_t *vm = vlib_get_main ();
   int __attribute__ ((unused)) rv;
   vlib_pci_dev_handle_t h = uf->private_data;
   linux_pci_device_t *p = linux_pci_get_device (h);
+  linux_pci_irq_t *irq = &p->intx_irq;
 
   u64 icount;
   rv = read (uf->file_descriptor, &icount, sizeof (icount));
 
-  if (p->interrupt_handler)
-    p->interrupt_handler (h);
+  if (irq->intx_handler)
+    irq->intx_handler (vm, h);
 
-  linux_pci_vfio_unmask_intx (p);
+  linux_pci_vfio_unmask_intx (vm, p);
 
   return /* no error */ 0;
 }
@@ -690,11 +783,10 @@ static clib_error_t *
 add_device_uio (vlib_main_t * vm, linux_pci_device_t * p,
 		vlib_pci_device_info_t * di, pci_device_registration_t * r)
 {
+  linux_pci_main_t *lpm = &linux_pci_main;
   clib_error_t *err = 0;
-  clib_file_t t = { 0 };
   u8 *s = 0;
 
-  p->addr.as_u32 = di->addr.as_u32;
   p->fd = -1;
   p->type = LINUX_PCI_DEVICE_TYPE_UIO;
 
@@ -711,8 +803,8 @@ add_device_uio (vlib_main_t * vm, linux_pci_device_t * p,
       goto error;
     }
 
-  s = format (0, "%s/%U/uio", sysfs_pci_dev_path,
-	      format_vlib_pci_addr, &di->addr);
+  s = format (0, "%s/%U/uio%c", sysfs_pci_dev_path,
+	      format_vlib_pci_addr, &di->addr, 0);
   foreach_directory_file ((char *) s, scan_uio_dir, p,	/* scan_dirs */
 			  1);
   vec_reset_length (s);
@@ -725,17 +817,14 @@ add_device_uio (vlib_main_t * vm, linux_pci_device_t * p,
       goto error;
     }
 
-  t.read_function = linux_pci_uio_read_ready;
-  t.file_descriptor = p->fd;
-  t.error_function = linux_pci_uio_error_ready;
-  t.private_data = p->handle;
+  if (r && r->interrupt_handler)
+    vlib_pci_register_intx_handler (vm, p->handle, r->interrupt_handler);
 
-  p->clib_file_index = clib_file_add (&file_main, &t);
-  p->interrupt_handler = r->interrupt_handler;
-  err = r->init_function (vm, p->handle);
+  if (r && r->init_function)
+    err = r->init_function (lpm->vlib_main, p->handle);
 
 error:
-  free (s);
+  vec_free (s);
   if (err)
     {
       if (p->config_fd != -1)
@@ -747,7 +836,79 @@ error:
 }
 
 clib_error_t *
-vlib_pci_register_msix_handler (vlib_pci_dev_handle_t h, u32 start, u32 count,
+vlib_pci_register_intx_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+				pci_intx_handler_function_t * intx_handler)
+{
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  clib_file_t t = { 0 };
+  linux_pci_irq_t *irq = &p->intx_irq;
+  ASSERT (irq->fd == -1);
+
+  if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
+    {
+      struct vfio_irq_info ii = { 0 };
+      ii.argsz = sizeof (struct vfio_irq_info);
+      ii.index = VFIO_PCI_INTX_IRQ_INDEX;
+      if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &ii) < 0)
+	return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_IRQ_INFO) '"
+				       "%U'", format_vlib_pci_addr, &p->addr);
+      log_debug (
+	p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)", __func__, ii.index,
+	ii.count, ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "",
+	ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "",
+	ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "",
+	ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "", ii.flags);
+      if (ii.count != 1)
+	return clib_error_return (0, "INTx interrupt does not exist on device"
+				  "'%U'", format_vlib_pci_addr, &p->addr);
+
+      irq->fd = eventfd (0, EFD_NONBLOCK);
+      if (irq->fd == -1)
+	return clib_error_return_unix (0, "eventfd");
+
+      t.file_descriptor = irq->fd;
+      t.read_function = linux_pci_vfio_intx_read_ready;
+    }
+  else if (p->type == LINUX_PCI_DEVICE_TYPE_UIO)
+    {
+      t.file_descriptor = p->fd;
+      t.read_function = linux_pci_uio_read_ready;
+    }
+  else
+    return 0;
+
+  t.error_function = linux_pci_uio_error_ready;
+  t.private_data = p->handle;
+  t.description = format (0, "PCI %U INTx", format_vlib_pci_addr, &p->addr);
+  irq->clib_file_index = clib_file_add (&file_main, &t);
+  irq->intx_handler = intx_handler;
+  return 0;
+}
+
+clib_error_t *
+vlib_pci_unregister_intx_handler (vlib_main_t *vm, vlib_pci_dev_handle_t h)
+{
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  linux_pci_irq_t *irq = &p->intx_irq;
+
+  if (irq->intx_handler == 0)
+    return 0;
+
+  clib_file_del_by_index (&file_main, irq->clib_file_index);
+  if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
+    {
+      close (irq->fd);
+      irq->fd = -1;
+    }
+
+  irq->intx_handler = 0;
+
+  return 0;
+}
+
+clib_error_t *
+vlib_pci_register_msix_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+				u32 start, u32 count,
 				pci_msix_handler_function_t * msix_handler)
 {
   clib_error_t *err = 0;
@@ -803,155 +964,101 @@ error:
 }
 
 clib_error_t *
-vlib_pci_enable_msix_irq (vlib_pci_dev_handle_t h, u16 start, u16 count)
+vlib_pci_unregister_msix_handler (vlib_main_t *vm, vlib_pci_dev_handle_t h,
+				  u32 start, u32 count)
 {
+  clib_error_t *err = 0;
   linux_pci_device_t *p = linux_pci_get_device (h);
-  int fds[count];
-  int i;
+  u32 i;
 
   if (p->type != LINUX_PCI_DEVICE_TYPE_VFIO)
     return clib_error_return (0, "vfio driver is needed for MSI-X interrupt "
-			      "support");
+				 "support");
 
   for (i = start; i < start + count; i++)
     {
       linux_pci_irq_t *irq = vec_elt_at_index (p->msix_irqs, i);
-      fds[i] = irq->fd;
+
+      if (irq->fd != -1)
+	{
+	  clib_file_del_by_index (&file_main, irq->clib_file_index);
+	  close (irq->fd);
+	  irq->fd = -1;
+	}
     }
 
-  return vfio_set_irqs (p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
-			VFIO_IRQ_SET_ACTION_TRIGGER, fds);
+  return err;
 }
 
 clib_error_t *
-vlib_pci_disable_msix_irq (vlib_pci_dev_handle_t h, u16 start, u16 count)
+vlib_pci_enable_msix_irq (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+			  u16 start, u16 count)
 {
   linux_pci_device_t *p = linux_pci_get_device (h);
-  int i, fds[count];
+  int fds[count];
+  int i;
 
   if (p->type != LINUX_PCI_DEVICE_TYPE_VFIO)
     return clib_error_return (0, "vfio driver is needed for MSI-X interrupt "
 			      "support");
 
   for (i = start; i < start + count; i++)
-    fds[i] = -1;
+    {
+      linux_pci_irq_t *irq = vec_elt_at_index (p->msix_irqs, i);
+      fds[i] = irq->fd;
+    }
 
-  return vfio_set_irqs (p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
+  return vfio_set_irqs (vm, p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
 			VFIO_IRQ_SET_ACTION_TRIGGER, fds);
 }
 
-static linux_pci_vfio_iommu_group_t *
-get_vfio_iommu_group (int group)
+uword
+vlib_pci_get_msix_file_index (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+			      u16 index)
 {
-  linux_pci_main_t *lpm = &linux_pci_main;
-  uword *p;
-
-  p = hash_get (lpm->iommu_pool_index_by_group, group);
-
-  return p ? pool_elt_at_index (lpm->iommu_groups, p[0]) : 0;
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  linux_pci_irq_t *irq = vec_elt_at_index (p->msix_irqs, index);
+  if (irq->fd == -1)
+    return ~0;
+  return irq->clib_file_index;
 }
 
-static clib_error_t *
-open_vfio_iommu_group (int group)
+clib_error_t *
+vlib_pci_disable_msix_irq (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+			   u16 start, u16 count)
 {
-  linux_pci_main_t *lpm = &linux_pci_main;
-  linux_pci_vfio_iommu_group_t *g;
-  clib_error_t *err = 0;
-  struct vfio_group_status group_status;
-  u8 *s = 0;
-  int fd;
-
-  g = get_vfio_iommu_group (group);
-  if (g)
-    {
-      g->refcnt++;
-      return 0;
-    }
-  s = format (s, "/dev/vfio/%u%c", group, 0);
-  fd = open ((char *) s, O_RDWR);
-  if (fd < 0)
-    return clib_error_return_unix (0, "open '%s'", s);
-
-  group_status.argsz = sizeof (group_status);
-  if (ioctl (fd, VFIO_GROUP_GET_STATUS, &group_status) < 0)
-    {
-      err = clib_error_return_unix (0, "ioctl(VFIO_GROUP_GET_STATUS) '%s'",
-				    s);
-      goto error;
-    }
-
-  if (!(group_status.flags & VFIO_GROUP_FLAGS_VIABLE))
-    {
-      err = clib_error_return (0, "iommu group %d is not viable (not all "
-			       "devices in this group bound to vfio-pci)",
-			       group);
-      goto error;
-    }
-
-  if (ioctl (fd, VFIO_GROUP_SET_CONTAINER, &lpm->vfio_container_fd) < 0)
-    {
-      err = clib_error_return_unix (0, "ioctl(VFIO_GROUP_SET_CONTAINER) '%s'",
-				    s);
-      goto error;
-    }
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  int i, fds[count];
 
-  if (lpm->vfio_iommu_mode == 0)
-    {
-      if (ioctl (lpm->vfio_container_fd, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU) <
-	  0)
-	{
-	  err = clib_error_return_unix (0, "ioctl(VFIO_SET_IOMMU) "
-					"'/dev/vfio/vfio'");
-	  goto error;
-	}
-      lpm->vfio_iommu_mode = VFIO_TYPE1_IOMMU;
-    }
+  if (p->type != LINUX_PCI_DEVICE_TYPE_VFIO)
+    return clib_error_return (0, "vfio driver is needed for MSI-X interrupt "
+			      "support");
 
+  for (i = start; i < start + count; i++)
+    fds[i] = -1;
 
-  pool_get (lpm->iommu_groups, g);
-  g->fd = fd;
-  g->refcnt = 1;
-  hash_set (lpm->iommu_pool_index_by_group, group, g - lpm->iommu_groups);
-  vec_free (s);
-  return 0;
-error:
-  close (fd);
-  return err;
+  return vfio_set_irqs (vm, p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
+			VFIO_IRQ_SET_ACTION_TRIGGER, fds);
 }
 
 static clib_error_t *
 add_device_vfio (vlib_main_t * vm, linux_pci_device_t * p,
 		 vlib_pci_device_info_t * di, pci_device_registration_t * r)
 {
-  linux_pci_vfio_iommu_group_t *g;
+  linux_pci_main_t *lpm = &linux_pci_main;
   struct vfio_device_info device_info = { 0 };
   struct vfio_region_info reg = { 0 };
-  struct vfio_irq_info irq_info = { 0 };
   clib_error_t *err = 0;
   u8 *s = 0;
+  int is_noiommu;
 
-  p->addr.as_u32 = di->addr.as_u32;
   p->type = LINUX_PCI_DEVICE_TYPE_VFIO;
 
-  if (di->driver_name == 0 ||
-      (strcmp ("vfio-pci", (char *) di->driver_name) != 0))
-    return clib_error_return (0, "Device '%U' (iommu group %d) not bound to "
-			      "vfio-pci", format_vlib_pci_addr, &di->addr,
-			      di->iommu_group);
-
-  if ((err = open_vfio_iommu_group (di->iommu_group)))
+  if ((err = linux_vfio_group_get_device_fd (&p->addr, &p->fd, &is_noiommu)))
     return err;
 
-  g = get_vfio_iommu_group (di->iommu_group);
-
-  s = format (s, "%U%c", format_vlib_pci_addr, &di->addr, 0);
-  if ((p->fd = ioctl (g->fd, VFIO_GROUP_GET_DEVICE_FD, (char *) s)) < 0)
-    {
-      err = clib_error_return_unix (0, "ioctl(VFIO_GROUP_GET_DEVICE_FD) '%U'",
-				    format_vlib_pci_addr, &di->addr);
-      goto error;
-    }
-  vec_reset_length (s);
+  if (is_noiommu == 0)
+    p->supports_va_dma = 1;
 
   device_info.argsz = sizeof (device_info);
   if (ioctl (p->fd, VFIO_DEVICE_GET_INFO, &device_info) < 0)
@@ -961,15 +1068,20 @@ add_device_vfio (vlib_main_t * vm, linux_pci_device_t * p,
       goto error;
     }
 
-  irq_info.argsz = sizeof (struct vfio_irq_info);
-  irq_info.index = VFIO_PCI_INTX_IRQ_INDEX;
-  if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info) < 0)
+  reg.argsz = sizeof (struct vfio_region_info);
+  reg.index = VFIO_PCI_CONFIG_REGION_INDEX;
+  if (ioctl (p->fd, VFIO_DEVICE_GET_REGION_INFO, &reg) < 0)
     {
-      err = clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_IRQ_INFO) "
-				    "'%U'", format_vlib_pci_addr, &di->addr);
+      err = clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_INFO) '%U'",
+				    format_vlib_pci_addr, &di->addr);
       goto error;
     }
 
+  log_debug (p, "%s %U", __func__, format_vfio_region_info, &reg);
+
+  p->config_offset = reg.offset;
+  p->config_fd = p->fd;
+
   /* reset if device supports it */
   if (device_info.flags & VFIO_DEVICE_FLAGS_RESET)
     if (ioctl (p->fd, VFIO_DEVICE_RESET) < 0)
@@ -979,51 +1091,29 @@ add_device_vfio (vlib_main_t * vm, linux_pci_device_t * p,
 	goto error;
       }
 
-  if ((irq_info.flags & VFIO_IRQ_INFO_EVENTFD) && irq_info.count == 1)
+  if (r && r->interrupt_handler)
     {
-      u8 buf[sizeof (struct vfio_irq_set) + sizeof (int)] = { 0 };
-      struct vfio_irq_set *irq_set = (struct vfio_irq_set *) buf;
-      clib_file_t t = { 0 };
-      int efd = eventfd (0, EFD_NONBLOCK);
-
-      irq_set->argsz = sizeof (buf);
-      irq_set->count = 1;
-      irq_set->index = VFIO_PCI_INTX_IRQ_INDEX;
-      irq_set->flags =
-	VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;
-      clib_memcpy (&irq_set->data, &efd, sizeof (int));
-
-      if (ioctl (p->fd, VFIO_DEVICE_SET_IRQS, irq_set) < 0)
-	{
-	  err = clib_error_return_unix (0, "ioctl(VFIO_DEVICE_SET_IRQS) '%U'",
-					format_vlib_pci_addr, &di->addr);
-	  goto error;
-	}
-
-      t.read_function = linux_pci_vfio_intx_read_ready;
-      t.file_descriptor = efd;
-      t.error_function = linux_pci_vfio_error_ready;
-      t.private_data = p->handle;
-      p->clib_file_index = clib_file_add (&file_main, &t);
-
-      /* unmask the interrupt */
-      linux_pci_vfio_unmask_intx (p);
+      vlib_pci_register_intx_handler (vm, p->handle, r->interrupt_handler);
+      linux_pci_vfio_unmask_intx (vm, p);
     }
 
-  p->interrupt_handler = r->interrupt_handler;
-
-  reg.argsz = sizeof (struct vfio_region_info);
-  reg.index = VFIO_PCI_CONFIG_REGION_INDEX;
-  if (ioctl (p->fd, VFIO_DEVICE_GET_REGION_INFO, &reg) < 0)
+  if (p->supports_va_dma)
     {
-      err = clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_REGION_INFO) "
-				    "'%U'", format_vlib_pci_addr, &di->addr);
-      goto error;
+      vlib_buffer_pool_t *bp;
+      /* *INDENT-OFF* */
+      vec_foreach (bp, vm->buffer_main->buffer_pools)
+	{
+	  u32 i;
+	  vlib_physmem_map_t *pm;
+	  pm = vlib_physmem_get_map (vm, bp->physmem_map_index);
+	  for (i = 0; i < pm->n_pages; i++)
+	    vfio_map_physmem_page (vm, pm->base + (i << pm->log2_page_size));
+	}
+      /* *INDENT-ON* */
     }
-  p->config_offset = reg.offset;
-  p->config_fd = p->fd;
 
-  err = r->init_function (vm, p->handle);
+  if (r && r->init_function)
+    err = r->init_function (lpm->vlib_main, p->handle);
 
 error:
   vec_free (s);
@@ -1031,15 +1121,16 @@ error:
     {
       if (p->fd != -1)
 	close (p->fd);
-      if (p->config_fd != -1)
+      if (p->config_fd != -1 && p->config_fd != p->fd)
 	close (p->config_fd);
+      p->config_fd = p->fd = -1;
     }
   return err;
 }
 
 /* Configuration space read/write. */
 clib_error_t *
-vlib_pci_read_write_config (vlib_pci_dev_handle_t h,
+vlib_pci_read_write_config (vlib_main_t * vm, vlib_pci_dev_handle_t h,
 			    vlib_read_or_write_t read_or_write,
 			    uword address, void *data, u32 n_bytes)
 {
@@ -1060,14 +1151,13 @@ vlib_pci_read_write_config (vlib_pci_dev_handle_t h,
 }
 
 static clib_error_t *
-vlib_pci_map_region_int (vlib_pci_dev_handle_t h,
-			 u32 bar, u8 * addr, void **result)
+vlib_pci_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 bar, int *fd,
+		 u64 * size, u64 * offset)
 {
   linux_pci_device_t *p = linux_pci_get_device (h);
-  int fd = -1;
-  clib_error_t *error;
-  int flags = MAP_SHARED;
-  u64 size = 0, offset = 0;
+  clib_error_t *error = 0;
+  int _fd = -1;
+  u64 _size = 0, _offset = 0;
 
   ASSERT (bar <= 5);
 
@@ -1080,49 +1170,94 @@ vlib_pci_map_region_int (vlib_pci_dev_handle_t h,
       file_name = format (0, "%s/%U/resource%d%c", sysfs_pci_dev_path,
 			  format_vlib_pci_addr, &p->addr, bar, 0);
 
-      fd = open ((char *) file_name, O_RDWR);
-      if (fd < 0)
+      _fd = open ((char *) file_name, O_RDWR);
+      if (_fd < 0)
 	{
 	  error = clib_error_return_unix (0, "open `%s'", file_name);
 	  vec_free (file_name);
 	  return error;
 	}
 
-      if (fstat (fd, &stat_buf) < 0)
+      if (fstat (_fd, &stat_buf) < 0)
 	{
 	  error = clib_error_return_unix (0, "fstat `%s'", file_name);
 	  vec_free (file_name);
-	  close (fd);
+	  close (_fd);
 	  return error;
 	}
 
       vec_free (file_name);
-      if (addr != 0)
-	flags |= MAP_FIXED;
-      size = stat_buf.st_size;
-      offset = 0;
+      _size = stat_buf.st_size;
+      _offset = 0;
     }
   else if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
     {
-      struct vfio_region_info reg = { 0 };
-      reg.argsz = sizeof (struct vfio_region_info);
-      reg.index = bar;
-      if (ioctl (p->fd, VFIO_DEVICE_GET_REGION_INFO, &reg) < 0)
+      struct vfio_region_info *r;
+      u32 sz = sizeof (struct vfio_region_info);
+    again:
+      r = clib_mem_alloc (sz);
+      clib_memset (r, 0, sz);
+      r->argsz = sz;
+      r->index = bar;
+      if (ioctl (p->fd, VFIO_DEVICE_GET_REGION_INFO, r) < 0)
 	return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_INFO) "
 				       "'%U'", format_vlib_pci_addr,
 				       &p->addr);
-      fd = p->fd;
-      size = reg.size;
-      offset = reg.offset;
+      if (sz != r->argsz)
+	{
+	  sz = r->argsz;
+	  clib_mem_free (r);
+	  goto again;
+	}
+      _fd = p->fd;
+      _size = r->size;
+      _offset = r->offset;
+      log_debug (p, "%s %U", __func__, format_vfio_region_info, r);
+      clib_mem_free (r);
     }
   else
     ASSERT (0);
 
-  *result = mmap (addr, size, PROT_READ | PROT_WRITE, flags, fd, offset);
-  if (*result == (void *) -1)
+  *fd = _fd;
+  *size = _size;
+  *offset = _offset;
+
+  return error;
+}
+
+static clib_error_t *
+vlib_pci_map_region_int (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+			 u32 bar, u8 * addr, void **result)
+{
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  int fd = -1;
+  clib_error_t *error;
+  u64 size = 0, offset = 0;
+  vlib_pci_config_reg_command_t command;
+
+  log_debug (p, "map region %u to va %p", bar, addr);
+
+  if ((error = vlib_pci_read_config_u16 (vm, h, 4, &command.as_u16)))
+    return error;
+
+  if (!(command.mem_space))
+    {
+      log_debug (p, "setting memory enable bit");
+      command.mem_space = 1;
+      if ((error = vlib_pci_write_config_u16 (vm, h, 4, &command.as_u16)))
+	return error;
+    }
+
+  if ((error = vlib_pci_region (vm, h, bar, &fd, &size, &offset)))
+    return error;
+
+  *result = clib_mem_vm_map_shared (addr, size, fd, offset,
+				    "PCIe %U region %u", format_vlib_pci_addr,
+				    vlib_pci_get_addr (vm, h), bar);
+  if (*result == CLIB_MEM_VM_MAP_FAILED)
     {
       error = clib_error_return_unix (0, "mmap `BAR%u'", bar);
-      if (p->type == LINUX_PCI_DEVICE_TYPE_UIO)
+      if (p->type == LINUX_PCI_DEVICE_TYPE_UIO && (fd != -1))
 	close (fd);
       return error;
     }
@@ -1139,16 +1274,206 @@ vlib_pci_map_region_int (vlib_pci_dev_handle_t h,
 }
 
 clib_error_t *
-vlib_pci_map_region (vlib_pci_dev_handle_t h, u32 resource, void **result)
+vlib_pci_map_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 resource,
+		     void **result)
+{
+  return (vlib_pci_map_region_int (vm, h, resource, 0 /* addr */ , result));
+}
+
+clib_error_t *
+vlib_pci_map_region_fixed (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+			   u32 resource, u8 * addr, void **result)
 {
-  return (vlib_pci_map_region_int (h, resource, 0 /* addr */ , result));
+  return (vlib_pci_map_region_int (vm, h, resource, addr, result));
 }
 
 clib_error_t *
-vlib_pci_map_region_fixed (vlib_pci_dev_handle_t h, u32 resource, u8 * addr,
-			   void **result)
+vlib_pci_io_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 resource)
 {
-  return (vlib_pci_map_region_int (h, resource, addr, result));
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  clib_error_t *error = 0;
+  int fd = -1;
+  u64 size = 0, offset = 0;
+
+  if ((error = vlib_pci_region (vm, h, resource, &fd, &size, &offset)))
+    return error;
+
+  p->io_fd = fd;
+  p->io_offset = offset;
+  return error;
+}
+
+clib_error_t *
+vlib_pci_read_write_io (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+			vlib_read_or_write_t read_or_write,
+			uword offset, void *data, u32 length)
+{
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  int n = 0;
+
+  if (read_or_write == VLIB_READ)
+    n = pread (p->io_fd, data, length, p->io_offset + offset);
+  else
+    n = pwrite (p->io_fd, data, length, p->io_offset + offset);
+
+  if (n != length)
+    return clib_error_return_unix (0, "%s",
+				   read_or_write == VLIB_READ
+				   ? "read" : "write");
+  return 0;
+}
+
+clib_error_t *
+vlib_pci_map_dma (vlib_main_t * vm, vlib_pci_dev_handle_t h, void *ptr)
+{
+  linux_pci_device_t *p = linux_pci_get_device (h);
+
+  if (!p->supports_va_dma)
+    return 0;
+
+  return vfio_map_physmem_page (vm, ptr);
+}
+
+int
+vlib_pci_supports_virtual_addr_dma (vlib_main_t * vm, vlib_pci_dev_handle_t h)
+{
+  linux_pci_device_t *p = linux_pci_get_device (h);
+
+  return p->supports_va_dma != 0;
+}
+
+clib_error_t *
+vlib_pci_device_open (vlib_main_t * vm, vlib_pci_addr_t * addr,
+		      pci_device_id_t ids[], vlib_pci_dev_handle_t * handle)
+{
+  linux_pci_main_t *lpm = &linux_pci_main;
+  vlib_pci_device_info_t *di;
+  linux_pci_device_t *p;
+  clib_error_t *err = 0;
+  pci_device_id_t *i;
+
+  di = vlib_pci_get_device_info (vm, addr, &err);
+
+  if (err)
+    return err;
+
+  if (ids)
+    {
+      for (i = ids; i->vendor_id != 0; i++)
+	if (i->vendor_id == di->vendor_id && i->device_id == di->device_id)
+	  break;
+
+      if (i->vendor_id == 0)
+	{
+	  vlib_pci_free_device_info (di);
+	  return clib_error_return (0, "Wrong vendor or device id");
+	}
+    }
+
+  pool_get (lpm->linux_pci_devices, p);
+  p->handle = p - lpm->linux_pci_devices;
+  p->addr.as_u32 = di->addr.as_u32;
+  p->intx_irq.fd = -1;
+  p->intx_irq.clib_file_index = -1;
+  p->numa_node = di->numa_node;
+  /*
+   * pci io bar read/write fd
+   */
+  p->io_fd = -1;
+
+  log_debug (p, "open vid:0x%04x did:0x%04x driver:%s iommu_group:%d",
+	     di->vendor_id, di->device_id, di->driver_name, di->iommu_group);
+
+  if (clib_strncmp ("vfio-pci", (char *) di->driver_name, 8) == 0)
+    err = add_device_vfio (vm, p, di, 0);
+  else if (clib_strncmp ("uio_pci_generic", (char *) di->driver_name, 8) == 0)
+    err = add_device_uio (vm, p, di, 0);
+  else
+    err = clib_error_create ("device not bound to 'vfio-pci' or "
+			     "'uio_pci_generic' kernel module");
+  if (err)
+    goto error;
+
+  *handle = p->handle;
+
+error:
+  vlib_pci_free_device_info (di);
+  if (err)
+    {
+      log_err (p, "%U", format_clib_error, err);
+      clib_memset (p, 0, sizeof (linux_pci_device_t));
+      pool_put (lpm->linux_pci_devices, p);
+    }
+
+  return err;
+}
+
+void
+vlib_pci_device_close (vlib_main_t * vm, vlib_pci_dev_handle_t h)
+{
+  linux_pci_main_t *lpm = &linux_pci_main;
+  linux_pci_device_t *p = linux_pci_get_device (h);
+  linux_pci_irq_t *irq;
+  linux_pci_region_t *res;
+  clib_error_t *err = 0;
+
+  if (p->type == LINUX_PCI_DEVICE_TYPE_UIO)
+    {
+      irq = &p->intx_irq;
+      if (irq->clib_file_index != -1)
+	clib_file_del_by_index (&file_main, irq->clib_file_index);
+      close (p->config_fd);
+      if (p->io_fd != -1)
+	close (p->io_fd);
+    }
+  else if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
+    {
+      irq = &p->intx_irq;
+      /* close INTx irqs */
+      if (irq->fd != -1)
+	{
+	  err = vfio_set_irqs (vm, p, VFIO_PCI_INTX_IRQ_INDEX, 0, 0,
+			       VFIO_IRQ_SET_ACTION_TRIGGER, 0);
+	  clib_error_free (err);
+	  if (irq->clib_file_index != -1)
+	    clib_file_del_by_index (&file_main, irq->clib_file_index);
+	  close (irq->fd);
+	}
+
+      /* close MSI-X irqs */
+      if (vec_len (p->msix_irqs))
+	{
+	  err = vfio_set_irqs (vm, p, VFIO_PCI_MSIX_IRQ_INDEX, 0, 0,
+			       VFIO_IRQ_SET_ACTION_TRIGGER, 0);
+	  clib_error_free (err);
+          /* *INDENT-OFF* */
+	  vec_foreach (irq, p->msix_irqs)
+	    {
+	      if (irq->fd == -1)
+		continue;
+	      clib_file_del_by_index (&file_main, irq->clib_file_index);
+	      close (irq->fd);
+	    }
+          /* *INDENT-ON* */
+	  vec_free (p->msix_irqs);
+	}
+    }
+
+  /* *INDENT-OFF* */
+  vec_foreach (res, p->regions)
+    {
+      if (res->size == 0)
+	continue;
+      clib_mem_vm_unmap (res->addr);
+      if (res->fd != -1)
+        close (res->fd);
+    }
+  /* *INDENT-ON* */
+  vec_free (p->regions);
+
+  close (p->fd);
+  clib_memset (p, 0, sizeof (linux_pci_device_t));
+  pool_put (lpm->linux_pci_devices, p);
 }
 
 void
@@ -1163,6 +1488,7 @@ init_device_from_registered (vlib_main_t * vm, vlib_pci_device_info_t * di)
 
   pool_get (lpm->linux_pci_devices, p);
   p->handle = p - lpm->linux_pci_devices;
+  p->intx_irq.fd = -1;
 
   r = pm->pci_device_registrations;
 
@@ -1185,7 +1511,7 @@ init_device_from_registered (vlib_main_t * vm, vlib_pci_device_info_t * di)
     }
 
   /* No driver, close the PCI config-space FD */
-  memset (p, 0, sizeof (linux_pci_device_t));
+  clib_memset (p, 0, sizeof (linux_pci_device_t));
   pool_put (lpm->linux_pci_devices, p);
 }
 
@@ -1259,41 +1585,18 @@ clib_error_t *
 linux_pci_init (vlib_main_t * vm)
 {
   vlib_pci_main_t *pm = &pci_main;
-  linux_pci_main_t *lpm = &linux_pci_main;
   vlib_pci_addr_t *addr = 0, *addrs;
-  clib_error_t *error;
-  int fd;
 
   pm->vlib_main = vm;
 
-  if ((error = vlib_call_init_function (vm, unix_input_init)))
-    return error;
-
   ASSERT (sizeof (vlib_pci_addr_t) == sizeof (u32));
 
-  fd = open ("/dev/vfio/vfio", O_RDWR);
-
-  if ((fd != -1) && (ioctl (fd, VFIO_GET_API_VERSION) != VFIO_API_VERSION))
-    {
-      close (fd);
-      fd = -1;
-    }
-
-  if ((fd != -1) && (ioctl (fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU) == 0))
-    {
-      close (fd);
-      fd = -1;
-    }
-
-  lpm->vfio_container_fd = fd;
-  lpm->iommu_pool_index_by_group = hash_create (0, sizeof (uword));
-
   addrs = vlib_pci_get_all_dev_addrs ();
   /* *INDENT-OFF* */
   vec_foreach (addr, addrs)
     {
       vlib_pci_device_info_t *d;
-      if ((d = vlib_pci_get_device_info (addr, 0)))
+      if ((d = vlib_pci_get_device_info (vm, addr, 0)))
 	{
 	  init_device_from_registered (vm, d);
 	  vlib_pci_free_device_info (d);
@@ -1301,10 +1604,15 @@ linux_pci_init (vlib_main_t * vm)
     }
   /* *INDENT-ON* */
 
-  return error;
+  return 0;
 }
 
-VLIB_INIT_FUNCTION (linux_pci_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (linux_pci_init) =
+{
+  .runs_after = VLIB_INITS("unix_input_init"),
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON