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

vfio/mbochs: Provide a get_region_info op 



Move it out of mbochs_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/8-v2-2a9e24d62f1b+e10a-vfio_get_region_info_op_jgg@nvidia.com


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

samples/vfio-mdev/mbochs.c

+31 −25
Original line number Diff line number Diff line
@@ -1185,56 +1185,61 @@ static int mbochs_get_gfx_dmabuf(struct mdev_state *mdev_state, u32 id) 
	return dma_buf_fd(dmabuf->buf, 0);

}



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

			 unsigned long arg)

static int mbochs_ioctl_get_region_info(struct vfio_device *vdev,

					struct vfio_region_info __user *arg)

{

	struct mdev_state *mdev_state =

		container_of(vdev, struct mdev_state, vdev);

	int ret = 0;

	struct vfio_region_info_ext info;

	unsigned long minsz, outsz;

	int ret;



	switch (cmd) {

	case VFIO_DEVICE_GET_INFO:

	{

		struct vfio_device_info info;



		minsz = offsetofend(struct vfio_device_info, num_irqs);

	minsz = offsetofend(typeof(info), base.offset);



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

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

		return -EFAULT;



		if (info.argsz < minsz)

	outsz = info.base.argsz;

	if (outsz < minsz)

		return -EINVAL;

	if (outsz > sizeof(info))

		return -EINVAL;



		ret = mbochs_get_device_info(&info);

	ret = mbochs_get_region_info(mdev_state, &info);

	if (ret)

		return ret;



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

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

		return -EFAULT;



	return 0;

}

	case VFIO_DEVICE_GET_REGION_INFO:



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

			 unsigned long arg)

{

		struct vfio_region_info_ext info;

	struct mdev_state *mdev_state =

		container_of(vdev, struct mdev_state, vdev);

	int ret = 0;

	unsigned long minsz;



		minsz = offsetofend(typeof(info), base.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;



		outsz = info.base.argsz;

		if (outsz < minsz)

			return -EINVAL;

		if (outsz > sizeof(info))

		if (info.argsz < minsz)

			return -EINVAL;



		ret = mbochs_get_region_info(mdev_state, &info);

		ret = mbochs_get_device_info(&info);

		if (ret)

			return ret;



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

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

			return -EFAULT;



		return 0;
@@ -1376,6 +1381,7 @@ static const struct vfio_device_ops mbochs_dev_ops = { 
	.read = mbochs_read,

	.write = mbochs_write,

	.ioctl = mbochs_ioctl,

	.get_region_info = mbochs_ioctl_get_region_info,

	.mmap = mbochs_mmap,

	.bind_iommufd	= vfio_iommufd_emulated_bind,

	.unbind_iommufd	= vfio_iommufd_emulated_unbind,