Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio

Pull vfio update from Alex Williamson:
 - convert to misc driver to support module auto loading
 - remove unnecessary and dangerous use of device_lock

* tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Don't use device_lock around AER interrupt setup
  vfio: Convert control interface to misc driver
  misc: Reserve minor for VFIO

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 2319d206f630..7ba042498857 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -872,9 +872,13 @@ static pci_ers_result_t vfio_pci_aer_err_detected(struct pci_dev *pdev,
                 return PCI_ERS_RESULT_DISCONNECT;
         }
 
+        mutex_lock(&vdev->igate);
+
         if (vdev->err_trigger)
                 eventfd_signal(vdev->err_trigger, 1);
 
+        mutex_unlock(&vdev->igate);
+
         vfio_device_put(device);
 
         return PCI_ERS_RESULT_CAN_RECOVER;