]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915/gvt: Add missing vfio_unregister_group_dev() call
authorJason Gunthorpe <jgg@nvidia.com>
Thu, 29 Sep 2022 17:48:35 +0000 (14:48 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Nov 2022 09:03:48 +0000 (10:03 +0100)
commit f423fa1bc9fe1978e6b9f54927411b62cb43eb04 upstream.

When converting to directly create the vfio_device the mdev driver has to
put a vfio_register_emulated_iommu_dev() in the probe() and a pairing
vfio_unregister_group_dev() in the remove.

This was missed for gvt, add it.

Cc: stable@vger.kernel.org
Fixes: 978cf586ac35 ("drm/i915/gvt: convert to use vfio_register_emulated_iommu_dev")
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/0-v1-013609965fe8+9d-vfio_gvt_unregister_jgg@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com> # v6.0 backport
Signed-off-by: Alex Williamson <alex.williamson@redhat.com> # v6.0 backport
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/gvt/kvmgt.c

index e3cd5894647777b008629184dd41c24cb822ee4d..de89946c4817f214af0e55c76119eff21d19e2a6 100644 (file)
@@ -1595,6 +1595,9 @@ static void intel_vgpu_remove(struct mdev_device *mdev)
 
        if (WARN_ON_ONCE(vgpu->attached))
                return;
+
+       vfio_unregister_group_dev(&vgpu->vfio_device);
+       vfio_uninit_group_dev(&vgpu->vfio_device);
        intel_gvt_destroy_vgpu(vgpu);
 }