vfio/pci: Hold igate across releasing eventfd contexts
authorAlex Williamson <alex.williamson@redhat.com>
Mon, 27 Jul 2020 19:43:38 +0000 (13:43 -0600)
committerAlex Williamson <alex.williamson@redhat.com>
Mon, 27 Jul 2020 19:43:38 +0000 (13:43 -0600)
No need to release and immediately re-acquire igate while clearing
out the eventfd ctxs.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
drivers/vfio/pci/vfio_pci.c

index b0258b7..dabca04 100644 (file)
@@ -523,14 +523,12 @@ static void vfio_pci_release(void *device_data)
                vfio_pci_vf_token_user_add(vdev, -1);
                vfio_spapr_pci_eeh_release(vdev->pdev);
                vfio_pci_disable(vdev);
+
                mutex_lock(&vdev->igate);
                if (vdev->err_trigger) {
                        eventfd_ctx_put(vdev->err_trigger);
                        vdev->err_trigger = NULL;
                }
-               mutex_unlock(&vdev->igate);
-
-               mutex_lock(&vdev->igate);
                if (vdev->req_trigger) {
                        eventfd_ctx_put(vdev->req_trigger);
                        vdev->req_trigger = NULL;