[PATCH 03/10] vfio: Rename vfio_device_assign/unassign_container()

[Yi Liu]

On 2022/10/26 02:17, Jason Gunthorpe wrote:
> These functions don't really assign anything anymore, they just increment
> some refcounts and do a sanity check. Call them
> vfio_group_[un]use_container()
> 
> Signed-off-by: Jason Gunthorpe <jgg at nvidia.com>
> ---
>   drivers/vfio/container.c | 14 ++++++--------
>   drivers/vfio/vfio.h      |  4 ++--
>   drivers/vfio/vfio_main.c |  6 +++---
>   3 files changed, 11 insertions(+), 13 deletions(-)

Reviewed-by: Yi Liu <yi.l.liu at intel.com>

> diff --git a/drivers/vfio/container.c b/drivers/vfio/container.c
> index dd79a66ec62cad..499777930b08fa 100644
> --- a/drivers/vfio/container.c
> +++ b/drivers/vfio/container.c
> @@ -511,10 +511,8 @@ void vfio_group_detach_container(struct vfio_group *group)
>   	vfio_container_put(container);
>   }
>   
> -int vfio_device_assign_container(struct vfio_device *device)
> +int vfio_group_use_container(struct vfio_group *group)
>   {
> -	struct vfio_group *group = device->group;
> -
>   	lockdep_assert_held(&group->group_lock);
>   
>   	if (!group->container || !group->container->iommu_driver ||
> @@ -529,13 +527,13 @@ int vfio_device_assign_container(struct vfio_device *device)
>   	return 0;
>   }
>   
> -void vfio_device_unassign_container(struct vfio_device *device)
> +void vfio_group_unuse_container(struct vfio_group *group)
>   {
> -	lockdep_assert_held_write(&device->group->group_lock);
> +	lockdep_assert_held(&group->group_lock);
>   
> -	WARN_ON(device->group->container_users <= 1);
> -	device->group->container_users--;
> -	fput(device->group->opened_file);
> +	WARN_ON(group->container_users <= 1);
> +	group->container_users--;
> +	fput(group->opened_file);
>   }
>   
>   /*
> diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
> index bcad54bbab08c4..f95f4925b83bbd 100644
> --- a/drivers/vfio/vfio.h
> +++ b/drivers/vfio/vfio.h
> @@ -112,8 +112,8 @@ void vfio_unregister_iommu_driver(const struct vfio_iommu_driver_ops *ops);
>   bool vfio_assert_device_open(struct vfio_device *device);
>   
>   struct vfio_container *vfio_container_from_file(struct file *filep);
> -int vfio_device_assign_container(struct vfio_device *device);
> -void vfio_device_unassign_container(struct vfio_device *device);
> +int vfio_group_use_container(struct vfio_group *group);
> +void vfio_group_unuse_container(struct vfio_group *group);
>   int vfio_container_attach_group(struct vfio_container *container,
>   				struct vfio_group *group);
>   void vfio_group_detach_container(struct vfio_group *group);
> diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
> index 204443ba3b3cd9..8d809ecd982b39 100644
> --- a/drivers/vfio/vfio_main.c
> +++ b/drivers/vfio/vfio_main.c
> @@ -749,7 +749,7 @@ static int vfio_device_first_open(struct vfio_device *device)
>   	 * it during close_device.
>   	 */
>   	mutex_lock(&device->group->group_lock);
> -	ret = vfio_device_assign_container(device);
> +	ret = vfio_group_use_container(device->group);
>   	if (ret)
>   		goto err_module_put;
>   
> @@ -764,7 +764,7 @@ static int vfio_device_first_open(struct vfio_device *device)
>   	return 0;
>   
>   err_container:
> -	vfio_device_unassign_container(device);
> +	vfio_group_unuse_container(device->group);
>   err_module_put:
>   	device->kvm = NULL;
>   	mutex_unlock(&device->group->group_lock);
> @@ -781,7 +781,7 @@ static void vfio_device_last_close(struct vfio_device *device)
>   	if (device->ops->close_device)
>   		device->ops->close_device(device);
>   	device->kvm = NULL;
> -	vfio_device_unassign_container(device);
> +	vfio_group_unuse_container(device->group);
>   	mutex_unlock(&device->group->group_lock);
>   	module_put(device->dev->driver->owner);
>   }

-- 
Regards,
Yi Liu