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

vfio/mdpy: Provide a get_region_info op 



Move it out of mdpy_ioctl() and re-indent it.

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Acked-by: default avatarPranjal Shrivastava <praan@google.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/7-v2-2a9e24d62f1b+e10a-vfio_get_region_info_op_jgg@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex@shazbot.org>
parent 07877552

samples/vfio-mdev/mdpy.c

+29 −24
Original line number Diff line number Diff line
@@ -512,45 +512,48 @@ static int mdpy_query_gfx_plane(struct mdev_state *mdev_state, 
	return 0;

}



static long mdpy_ioctl(struct vfio_device *vdev, unsigned int cmd,

		       unsigned long arg)

static int mdpy_ioctl_get_region_info(struct vfio_device *vdev,

				      struct vfio_region_info __user *arg)

{

	int ret = 0;

	unsigned long minsz;

	struct mdev_state *mdev_state =

		container_of(vdev, struct mdev_state, vdev);

	struct vfio_region_info info;

	void *cap_type = NULL;

	u16 cap_type_id = 0;

	unsigned long minsz;

	int ret;



	switch (cmd) {

	case VFIO_DEVICE_GET_INFO:

	{

		struct vfio_device_info info;



		minsz = offsetofend(struct vfio_device_info, num_irqs);

	minsz = offsetofend(struct vfio_region_info, offset);



		if (copy_from_user(&info, (void __user *)arg, minsz))

	if (copy_from_user(&info, arg, minsz))

		return -EFAULT;



	if (info.argsz < minsz)

		return -EINVAL;



		ret = mdpy_get_device_info(&info);

	ret = mdpy_get_region_info(mdev_state, &info, &cap_type_id, &cap_type);

	if (ret)

		return ret;



		memcpy(&mdev_state->dev_info, &info, sizeof(info));



		if (copy_to_user((void __user *)arg, &info, minsz))

	if (copy_to_user(arg, &info, minsz))

		return -EFAULT;



	return 0;

}

	case VFIO_DEVICE_GET_REGION_INFO:



static long mdpy_ioctl(struct vfio_device *vdev, unsigned int cmd,

		       unsigned long arg)

{

		struct vfio_region_info info;

		u16 cap_type_id = 0;

		void *cap_type = NULL;

	int ret = 0;

	unsigned long minsz;

	struct mdev_state *mdev_state =

		container_of(vdev, struct mdev_state, vdev);



		minsz = offsetofend(struct vfio_region_info, offset);

	switch (cmd) {

	case VFIO_DEVICE_GET_INFO:

	{

		struct vfio_device_info info;



		minsz = offsetofend(struct vfio_device_info, num_irqs);



		if (copy_from_user(&info, (void __user *)arg, minsz))

			return -EFAULT;
@@ -558,11 +561,12 @@ static long mdpy_ioctl(struct vfio_device *vdev, unsigned int cmd, 
		if (info.argsz < minsz)

			return -EINVAL;



		ret = mdpy_get_region_info(mdev_state, &info, &cap_type_id,

					   &cap_type);

		ret = mdpy_get_device_info(&info);

		if (ret)

			return ret;



		memcpy(&mdev_state->dev_info, &info, sizeof(info));



		if (copy_to_user((void __user *)arg, &info, minsz))

			return -EFAULT;
@@ -665,6 +669,7 @@ static const struct vfio_device_ops mdpy_dev_ops = { 
	.read = mdpy_read,

	.write = mdpy_write,

	.ioctl = mdpy_ioctl,

	.get_region_info = mdpy_ioctl_get_region_info,

	.mmap = mdpy_mmap,

	.bind_iommufd	= vfio_iommufd_emulated_bind,

	.unbind_iommufd	= vfio_iommufd_emulated_unbind,