Commit 32e09228 authored by Yi Liu's avatar Yi Liu Committed by Jason Gunthorpe

vfio: Create wrappers for group register/unregister

This avoids decoding group fields in the common functions used by
vfio_device registration, and prepares for further moving the vfio group
specific code into separate file.

Link: https://lore.kernel.org/r/20221201145535.589687-4-yi.l.liu@intel.comReviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Tested-by: default avatarLixiao Yang <lixiao.yang@intel.com>
Tested-by: default avatarYu He <yu.he@intel.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent dcb93d03
...@@ -514,6 +514,20 @@ static struct vfio_group *vfio_group_find_or_alloc(struct device *dev) ...@@ -514,6 +514,20 @@ static struct vfio_group *vfio_group_find_or_alloc(struct device *dev)
return group; return group;
} }
static void vfio_device_group_register(struct vfio_device *device)
{
mutex_lock(&device->group->device_lock);
list_add(&device->group_next, &device->group->device_list);
mutex_unlock(&device->group->device_lock);
}
static void vfio_device_group_unregister(struct vfio_device *device)
{
mutex_lock(&device->group->device_lock);
list_del(&device->group_next);
mutex_unlock(&device->group->device_lock);
}
static int __vfio_register_dev(struct vfio_device *device, static int __vfio_register_dev(struct vfio_device *device,
struct vfio_group *group) struct vfio_group *group)
{ {
...@@ -552,9 +566,7 @@ static int __vfio_register_dev(struct vfio_device *device, ...@@ -552,9 +566,7 @@ static int __vfio_register_dev(struct vfio_device *device,
/* Refcounting can't start until the driver calls register */ /* Refcounting can't start until the driver calls register */
refcount_set(&device->refcount, 1); refcount_set(&device->refcount, 1);
mutex_lock(&group->device_lock); vfio_device_group_register(device);
list_add(&device->group_next, &group->device_list);
mutex_unlock(&group->device_lock);
return 0; return 0;
err_out: err_out:
...@@ -614,7 +626,6 @@ static struct vfio_device *vfio_device_get_from_name(struct vfio_group *group, ...@@ -614,7 +626,6 @@ static struct vfio_device *vfio_device_get_from_name(struct vfio_group *group,
* removed. Open file descriptors for the device... */ * removed. Open file descriptors for the device... */
void vfio_unregister_group_dev(struct vfio_device *device) void vfio_unregister_group_dev(struct vfio_device *device)
{ {
struct vfio_group *group = device->group;
unsigned int i = 0; unsigned int i = 0;
bool interrupted = false; bool interrupted = false;
long rc; long rc;
...@@ -642,9 +653,7 @@ void vfio_unregister_group_dev(struct vfio_device *device) ...@@ -642,9 +653,7 @@ void vfio_unregister_group_dev(struct vfio_device *device)
} }
} }
mutex_lock(&group->device_lock); vfio_device_group_unregister(device);
list_del(&device->group_next);
mutex_unlock(&group->device_lock);
/* Balances device_add in register path */ /* Balances device_add in register path */
device_del(&device->device); device_del(&device->device);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment