vfio: Test kvm pointer in _vfio_device_get_kvm_safe()

This saves some lines when adding the kvm get logic for the vfio_device
cdev path.

This also renames _vfio_device_get_kvm_safe() to be vfio_device_get_kvm_safe().

Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Tested-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Yanting Jiang <yanting.jiang@intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20230718135551.6592-20-yi.l.liu@intel.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index 41a09a2df69021f9daa9336f2806b9634eaeafe0..5c17ad81231374eec268ddaf1642b5d0b10108f6 100644 (file)
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -160,12 +160,7 @@ out_unlock:
 static void vfio_device_group_get_kvm_safe(struct vfio_device *device)
 {
        spin_lock(&device->group->kvm_ref_lock);
-       if (!device->group->kvm)
-               goto unlock;
-
-       _vfio_device_get_kvm_safe(device, device->group->kvm);
-
-unlock:
+       vfio_device_get_kvm_safe(device, device->group->kvm);
        spin_unlock(&device->group->kvm_ref_lock);
 }
 

diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index fb8f2fac3d2308e270fadf6eb827018d6d3b76f1..c2aa6538259285051bd4d065fb111fbc6fbc0896 100644 (file)
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -340,11 +340,11 @@ enum { vfio_noiommu = false };
 #endif
 
 #ifdef CONFIG_HAVE_KVM
-void _vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm);
+void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm);
 void vfio_device_put_kvm(struct vfio_device *device);
 #else
-static inline void _vfio_device_get_kvm_safe(struct vfio_device *device,
-                                            struct kvm *kvm)
+static inline void vfio_device_get_kvm_safe(struct vfio_device *device,
+                                           struct kvm *kvm)
 {
 }
 

diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 8a9ebcc6980bdf4e6c42c395fce1019230672734..5f7c3151d8c083bbb6f64580c67dc95e6cbdcfef 100644 (file)
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -373,7 +373,7 @@ void vfio_unregister_group_dev(struct vfio_device *device)
 EXPORT_SYMBOL_GPL(vfio_unregister_group_dev);
 
 #ifdef CONFIG_HAVE_KVM
-void _vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm)
+void vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm)
 {
        void (*pfn)(struct kvm *kvm);
        bool (*fn)(struct kvm *kvm);
@@ -381,6 +381,9 @@ void _vfio_device_get_kvm_safe(struct vfio_device *device, struct kvm *kvm)
 
        lockdep_assert_held(&device->dev_set->lock);
 
+       if (!kvm)
+               return;
+
        pfn = symbol_get(kvm_put_kvm);
        if (WARN_ON(!pfn))
                return;