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

vfio/ccw: Provide a get_region_info op 



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

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarEric Farman <farman@linux.ibm.com>
Link: https://lore.kernel.org/r/12-v2-2a9e24d62f1b+e10a-vfio_get_region_info_op_jgg@nvidia.com


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

drivers/s390/cio/vfio_ccw_ops.c

+26 −18
Original line number Diff line number Diff line
@@ -504,39 +504,46 @@ void vfio_ccw_unregister_dev_regions(struct vfio_ccw_private *private) 
	private->region = NULL;

}



static ssize_t vfio_ccw_mdev_ioctl(struct vfio_device *vdev,

				   unsigned int cmd,

				   unsigned long arg)

static int

vfio_ccw_mdev_ioctl_get_region_info(struct vfio_device *vdev,

				    struct vfio_region_info __user *arg)

{

	struct vfio_ccw_private *private =

		container_of(vdev, struct vfio_ccw_private, vdev);

	int ret = 0;

	struct vfio_region_info info;

	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 = vfio_ccw_mdev_get_device_info(private, &info);

	ret = vfio_ccw_mdev_get_region_info(private, &info, arg);

	if (ret)

		return ret;



		return copy_to_user((void __user *)arg, &info, minsz) ? -EFAULT : 0;

	return copy_to_user(arg, &info, minsz) ? -EFAULT : 0;

}

	case VFIO_DEVICE_GET_REGION_INFO:



static ssize_t vfio_ccw_mdev_ioctl(struct vfio_device *vdev,

				   unsigned int cmd,

				   unsigned long arg)

{

		struct vfio_region_info info;

	struct vfio_ccw_private *private =

		container_of(vdev, struct vfio_ccw_private, vdev);

	int ret = 0;

	unsigned long minsz;



		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;
@@ -544,7 +551,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct vfio_device *vdev, 
		if (info.argsz < minsz)

			return -EINVAL;



		ret = vfio_ccw_mdev_get_region_info(private, &info, arg);

		ret = vfio_ccw_mdev_get_device_info(private, &info);

		if (ret)

			return ret;
@@ -627,6 +634,7 @@ static const struct vfio_device_ops vfio_ccw_dev_ops = { 
	.read = vfio_ccw_mdev_read,

	.write = vfio_ccw_mdev_write,

	.ioctl = vfio_ccw_mdev_ioctl,

	.get_region_info = vfio_ccw_mdev_ioctl_get_region_info,

	.request = vfio_ccw_mdev_request,

	.dma_unmap = vfio_ccw_dma_unmap,

	.bind_iommufd = vfio_iommufd_emulated_bind,