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

diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index 30188d1a2ad..b55fb5042f7 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>
@@ -59,6 +60,13 @@ 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";
 
+#define pci_log_debug(vm, dev, f, ...) \
+  vlib_log(VLIB_LOG_LEVEL_DEBUG, pci_main.log_default, "%U: " f, \
+           format_vlib_pci_addr, vlib_pci_get_addr(vm, dev->handle), ## __VA_ARGS__)
+#define pci_log_err(vm, dev, f, ...) \
+  vlib_log(VLIB_LOG_LEVEL_ERR, pci_main.log_default, "%U: " f, \
+           format_vlib_pci_addr, vlib_pci_get_addr(vm, dev->handle), ## __VA_ARGS__)
+
 typedef struct
 {
   int fd;
@@ -72,6 +80,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;
@@ -102,24 +111,16 @@ typedef struct
   /* 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 +128,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,21 +140,22 @@ 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;
@@ -177,9 +169,10 @@ 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;
+  linux_vfio_main_t *lvm = &vfio_main;
   clib_error_t *err;
   vlib_pci_device_info_t *di;
   u8 *f = 0;
@@ -187,7 +180,7 @@ vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
   int fd;
 
   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,
@@ -219,7 +212,7 @@ vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
   {
     static pci_config_header_t all_ones;
     if (all_ones.vendor_id == 0)
-      memset (&all_ones, ~0, sizeof (all_ones));
+      clib_memset (&all_ones, ~0, sizeof (all_ones));
 
     if (!memcmp (&di->config0.header, &all_ones, sizeof (all_ones)))
       {
@@ -270,7 +263,7 @@ vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
   di->driver_name = clib_sysfs_link_to_name ((char *) f);
 
   di->iommu_group = -1;
-  if (lpm->vfio_container_fd != -1)
+  if (lvm->container_fd != -1)
     {
       u8 *tmpstr;
       vec_reset_length (f);
@@ -281,6 +274,17 @@ vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
 	  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);
@@ -349,7 +353,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)
 {
   clib_error_t *error = 0;
   u8 *s = 0, *driver_name = 0;
@@ -360,7 +365,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;
@@ -446,10 +451,11 @@ vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
       if (e->d_name[0] == '.')	/* skip . and .. */
 	continue;
 
-      memset (&ifr, 0, sizeof ifr);
-      memset (&drvinfo, 0, sizeof drvinfo);
+      clib_memset (&ifr, 0, sizeof ifr);
+      clib_memset (&drvinfo, 0, sizeof drvinfo);
       ifr.ifr_data = (char *) &drvinfo;
-      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
+      strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name));
+      ifr.ifr_name[ARRAY_LEN (ifr.ifr_name) - 1] = '\0';
       drvinfo.cmd = ETHTOOL_GDRVINFO;
       if (ioctl (fd, SIOCETHTOOL, &ifr) < 0)
 	{
@@ -463,8 +469,9 @@ vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
       if (strcmp ((char *) s, drvinfo.bus_info))
 	continue;
 
-      memset (&ifr, 0, sizeof (ifr));
-      strncpy (ifr.ifr_name, e->d_name, IFNAMSIZ - 1);
+      clib_memset (&ifr, 0, sizeof (ifr));
+      strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name));
+      ifr.ifr_name[ARRAY_LEN (ifr.ifr_name) - 1] = '\0';
       if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0)
 	{
 	  error = clib_error_return_unix (0, "ioctl fetch intf %s flags",
@@ -541,23 +548,31 @@ 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)
+  pci_log_debug (vm, 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);
 
@@ -591,46 +606,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)
-{
-  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_vfio_unmask_intx (vlib_main_t * vm, linux_pci_device_t * d)
 {
-  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 +641,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 +652,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 +660,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 +689,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;
 
@@ -725,17 +723,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 +742,59 @@ 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);
+      pci_log_debug (vm, 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_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,7 +850,8 @@ error:
 }
 
 clib_error_t *
-vlib_pci_enable_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 fds[count];
@@ -819,12 +867,13 @@ vlib_pci_enable_msix_irq (vlib_pci_dev_handle_t h, u16 start, u16 count)
       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);
 }
 
 clib_error_t *
-vlib_pci_disable_msix_irq (vlib_pci_dev_handle_t h, u16 start, u16 count)
+vlib_pci_disable_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];
@@ -836,122 +885,28 @@ vlib_pci_disable_msix_irq (vlib_pci_dev_handle_t h, u16 start, u16 count)
   for (i = start; i < start + count; i++)
     fds[i] = -1;
 
-  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)
-{
-  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;
-}
-
-static clib_error_t *
-open_vfio_iommu_group (int group)
-{
-  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;
-    }
-
-  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;
-    }
-
-
-  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;
-}
-
 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 +916,26 @@ 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;
     }
 
+  pci_log_debug (vm, p, "%s region_info index:%u size:0x%lx offset:0x%lx "
+		 "flags: %s%s%s(0x%x)", __func__,
+		 reg.index, reg.size, reg.offset,
+		 reg.flags & VFIO_REGION_INFO_FLAG_READ ? "rd " : "",
+		 reg.flags & VFIO_REGION_INFO_FLAG_WRITE ? "wr " : "",
+		 reg.flags & VFIO_REGION_INFO_FLAG_MMAP ? "mmap " : "",
+		 reg.flags);
+
+  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 +945,14 @@ 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)
-    {
-      err = clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_REGION_INFO) "
-				    "'%U'", format_vlib_pci_addr, &di->addr);
-      goto error;
-    }
-  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 +960,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,7 +990,7 @@ 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,
+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);
@@ -1073,6 +1003,8 @@ vlib_pci_map_region_int (vlib_pci_dev_handle_t h,
 
   error = 0;
 
+  pci_log_debug (vm, p, "map region %u to va %p", bar, addr);
+
   if (p->type == LINUX_PCI_DEVICE_TYPE_UIO)
     {
       u8 *file_name;
@@ -1114,6 +1046,13 @@ vlib_pci_map_region_int (vlib_pci_dev_handle_t h,
       fd = p->fd;
       size = reg.size;
       offset = reg.offset;
+      pci_log_debug (vm, p, "%s region_info index:%u size:0x%lx offset:0x%lx "
+		     "flags: %s%s%s(0x%x)", __func__,
+		     reg.index, reg.size, reg.offset,
+		     reg.flags & VFIO_REGION_INFO_FLAG_READ ? "rd " : "",
+		     reg.flags & VFIO_REGION_INFO_FLAG_WRITE ? "wr " : "",
+		     reg.flags & VFIO_REGION_INFO_FLAG_MMAP ? "mmap " : "",
+		     reg.flags);
     }
   else
     ASSERT (0);
@@ -1139,16 +1078,135 @@ 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 (h, resource, 0 /* addr */ , result));
+  return (vlib_pci_map_region_int (vm, h, resource, 0 /* addr */ , result));
 }
 
 clib_error_t *
-vlib_pci_map_region_fixed (vlib_pci_dev_handle_t h, u32 resource, u8 * addr,
-			   void **result)
+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, addr, result));
+  return (vlib_pci_map_region_int (vm, h, resource, addr, result));
+}
+
+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;
+  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)
+    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;
+
+  pci_log_debug (vm, 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 (strncmp ("vfio-pci", (char *) di->driver_name, 8) == 0)
+    err = add_device_vfio (vm, p, di, 0);
+  else if (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)
+    {
+      pci_log_err (vm, 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;
+      clib_file_del_by_index (&file_main, irq->clib_file_index);
+      close (p->config_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);
+	  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;
+      munmap (res->addr, res->size);
+      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 +1221,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 +1244,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,10 +1318,8 @@ 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;
 
@@ -1271,29 +1328,12 @@ linux_pci_init (vlib_main_t * vm)
 
   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);