Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1662774

[PATCH 2/7] kvm-vfio: Decouple only when we match a group

Show all headers | View raw

Unset-KVM and decrement-assignment only when we find the group in our
list.  Otherwise we can get out of sync if the user triggers this for
groups that aren't currently on our list.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 virt/kvm/vfio.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c
index d32f239eb471..db9036ef8c73 100644
--- a/virt/kvm/vfio.c
+++ b/virt/kvm/vfio.c
@@ -201,18 +201,16 @@ static int kvm_vfio_set_group(struct kvm_device *dev, long attr, u64 arg)
 				continue;
 
 			list_del(&kvg->node);
+			kvm_arch_end_assignment(dev->kvm);
+			kvm_vfio_group_set_kvm(kvg->vfio_group, NULL);
 			kvm_vfio_group_put_external_user(kvg->vfio_group);
 			kfree(kvg);
 			ret = 0;
 			break;
 		}
 
-		kvm_arch_end_assignment(dev->kvm);
-
 		mutex_unlock(&kv->lock);
 
-		kvm_vfio_group_set_kvm(vfio_group, NULL);
-
 		kvm_vfio_group_put_external_user(vfio_group);
 
 		kvm_vfio_update_coherency(dev);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] vfio: Fix release ordering races and use driver_override Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:00 +0200
  [PATCH 3/7] vfio: New external user group/file match Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 3/7] vfio: New external user group/file match Paolo Bonzini <pbonzini@redhat.com> - 2017-06-12 18:30 +0200
    Re: [PATCH 3/7] vfio: New external user group/file match Auger Eric <eric.auger@redhat.com> - 2017-06-14 14:50 +0200
  [PATCH 6/7] vfio: Register pci, platform, amba, and mdev bus drivers Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 6/7] vfio: Register pci, platform, amba, and mdev bus  drivers Auger Eric <eric.auger@redhat.com> - 2017-06-14 15:20 +0200
  [PATCH 2/7] kvm-vfio: Decouple only when we match a group Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 2/7] kvm-vfio: Decouple only when we match a group Paolo Bonzini <pbonzini@redhat.com> - 2017-06-12 18:30 +0200
    Re: [PATCH 2/7] kvm-vfio: Decouple only when we match a group Auger Eric <eric.auger@redhat.com> - 2017-06-14 14:40 +0200
  [PATCH 7/7] vfio: Use driver_override to avert binding to  compromising drivers Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 7/7] vfio: Use driver_override to avert binding to  compromising drivers Auger Eric <eric.auger@redhat.com> - 2017-06-19 16:10 +0200
  [PATCH 1/7] vfio: Fix group release deadlock Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 1/7] vfio: Fix group release deadlock Auger Eric <eric.auger@redhat.com> - 2017-06-14 14:40 +0200
  [PATCH 5/7] vfio: Create interface for vfio bus drivers to register Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 5/7] vfio: Create interface for vfio bus drivers to  register Auger Eric <eric.auger@redhat.com> - 2017-06-14 15:20 +0200
  [PATCH 4/7] iommu: Add driver-not-bound notification Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 4/7] iommu: Add driver-not-bound notification Joerg Roedel <joro@8bytes.org> - 2017-06-10 00:30 +0200
      Re: [PATCH 4/7] iommu: Add driver-not-bound notification Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:50 +0200
        Re: [PATCH 4/7] iommu: Add driver-not-bound notification Joerg Roedel <joro@8bytes.org> - 2017-06-10 23:50 +0200
    Re: [PATCH 4/7] iommu: Add driver-not-bound notification Auger Eric <eric.auger@redhat.com> - 2017-06-14 15:00 +0200

csiph-web