Commit 150ee2f9 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson
Browse files

vfio: Fold VFIO_GROUP_GET_DEVICE_FD into vfio_group_get_device_fd() 



No reason to split it up like this, just have one function to process the
ioctl.

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/5-v2-0f9e632d54fb+d6-vfio_ioctl_split_jgg@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 663eab45

drivers/vfio/vfio_main.c

+11 −13
Original line number Diff line number Diff line
@@ -1178,14 +1178,21 @@ static struct file *vfio_device_open(struct vfio_device *device) 
	return ERR_PTR(ret);

}



static int vfio_group_get_device_fd(struct vfio_group *group, char *buf)

static int vfio_group_ioctl_get_device_fd(struct vfio_group *group,

					  char __user *arg)

{

	struct vfio_device *device;

	struct file *filep;

	char *buf;

	int fdno;

	int ret;



	buf = strndup_user(arg, PAGE_SIZE);

	if (IS_ERR(buf))

		return PTR_ERR(buf);



	device = vfio_device_get_from_name(group, buf);

	kfree(buf);

	if (IS_ERR(device))

		return PTR_ERR(device);
@@ -1215,9 +1222,12 @@ static long vfio_group_fops_unl_ioctl(struct file *filep, 
				      unsigned int cmd, unsigned long arg)

{

	struct vfio_group *group = filep->private_data;

	void __user *uarg = (void __user *)arg;

	long ret = -ENOTTY;



	switch (cmd) {

	case VFIO_GROUP_GET_DEVICE_FD:

		return vfio_group_ioctl_get_device_fd(group, uarg);

	case VFIO_GROUP_GET_STATUS:

	{

		struct vfio_group_status status;
@@ -1267,18 +1277,6 @@ static long vfio_group_fops_unl_ioctl(struct file *filep, 
		ret = vfio_group_unset_container(group);

		up_write(&group->group_rwsem);

		break;

	case VFIO_GROUP_GET_DEVICE_FD:

	{

		char *buf;



		buf = strndup_user((const char __user *)arg, PAGE_SIZE);

		if (IS_ERR(buf))

			return PTR_ERR(buf);



		ret = vfio_group_get_device_fd(group, buf);

		kfree(buf);

		break;

	}

	}



	return ret;