Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / drivers / vfio / vfio.c

diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 12c264d..fcc12f3 100644 (file)
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -139,23 +139,8 @@ EXPORT_SYMBOL_GPL(vfio_unregister_iommu_driver);
  */
 static int vfio_alloc_group_minor(struct vfio_group *group)
 {
-       int ret, minor;
-
-again:
-       if (unlikely(idr_pre_get(&vfio.group_idr, GFP_KERNEL) == 0))
-               return -ENOMEM;
-
        /* index 0 is used by /dev/vfio/vfio */
-       ret = idr_get_new_above(&vfio.group_idr, group, 1, &minor);
-       if (ret == -EAGAIN)
-               goto again;
-       if (ret || minor > MINORMASK) {
-               if (minor > MINORMASK)
-                       idr_remove(&vfio.group_idr, minor);
-               return -ENOSPC;
-       }
-
-       return minor;
+       return idr_alloc(&vfio.group_idr, group, 1, MINORMASK + 1, GFP_KERNEL);
 }
 
 static void vfio_free_group_minor(int minor)
@@ -442,7 +427,7 @@ static struct vfio_device *vfio_group_get_device(struct vfio_group *group,
  * a device.  It's not always practical to leave a device within a group
  * driverless as it could get re-bound to something unsafe.
  */
-static const char * const vfio_driver_whitelist[] = { "pci-stub" };
+static const char * const vfio_driver_whitelist[] = { "pci-stub", "pcieport" };
 
 static bool vfio_whitelisted_driver(struct device_driver *drv)
 {
@@ -642,33 +627,16 @@ int vfio_add_group_dev(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(vfio_add_group_dev);
 
-/* Test whether a struct device is present in our tracking */
-static bool vfio_dev_present(struct device *dev)
+/* Given a referenced group, check if it contains the device */
+static bool vfio_dev_present(struct vfio_group *group, struct device *dev)
 {
-       struct iommu_group *iommu_group;
-       struct vfio_group *group;
        struct vfio_device *device;
 
-       iommu_group = iommu_group_get(dev);
-       if (!iommu_group)
-               return false;
-
-       group = vfio_group_get_from_iommu(iommu_group);
-       if (!group) {
-               iommu_group_put(iommu_group);
-               return false;
-       }
-
        device = vfio_group_get_device(group, dev);
-       if (!device) {
-               vfio_group_put(group);
-               iommu_group_put(iommu_group);
+       if (!device)
                return false;
-       }
 
        vfio_device_put(device);
-       vfio_group_put(group);
-       iommu_group_put(iommu_group);
        return true;
 }
 
@@ -682,10 +650,18 @@ void *vfio_del_group_dev(struct device *dev)
        struct iommu_group *iommu_group = group->iommu_group;
        void *device_data = device->device_data;
 
+       /*
+        * The group exists so long as we have a device reference.  Get
+        * a group reference and use it to scan for the device going away.
+        */
+       vfio_group_get(group);
+
        vfio_device_put(device);
 
        /* TODO send a signal to encourage this to be released */
-       wait_event(vfio.release_q, !vfio_dev_present(dev));
+       wait_event(vfio.release_q, !vfio_dev_present(group, dev));
+
+       vfio_group_put(group);
 
        iommu_group_put(iommu_group);