vfio: fix device hotplug when several devices per group
authorAnatoly Burakov <anatoly.burakov@intel.com>
Tue, 10 Apr 2018 10:23:30 +0000 (11:23 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 12 Apr 2018 23:17:55 +0000 (01:17 +0200)
We only need to perform DMA mapping for first device in first group.
At the time of mapping, we haven't yet added the device into the group,
so the count is expected to be zero.

Fixes: 810bfa64c673 ("vfio: fix index for tracking devices in a group")
Fixes: a9c349e3a100 ("vfio: fix device unplug when several devices per group")
Fixes: 94c0776b1bad ("vfio: support hotplug")
Cc: stable@dpdk.org
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
lib/librte_eal/linuxapp/eal/eal_vfio.c

index 984b1a1..16ee730 100644 (file)
@@ -615,7 +615,8 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
                 * functionality.
                 */
                if (internal_config.process_type == RTE_PROC_PRIMARY &&
-                               vfio_cfg.vfio_active_groups == 1) {
+                               vfio_cfg.vfio_active_groups == 1 &&
+                               vfio_group_device_count(vfio_group_fd) == 0) {
                        const struct vfio_iommu_type *t;
 
                        /* select an IOMMU type which we will be using */