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

vfio: Provide a get_region_info op 



Instead of hooking the general ioctl op, have the core code directly
decode VFIO_DEVICE_GET_REGION_INFO and call an op just for it.

This is intended to allow mechanical changes to the drivers to pull their
VFIO_DEVICE_GET_REGION_INFO int oa function. Later patches will improve
the function signature to consolidate more code.

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


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

drivers/vfio/pci/vfio_pci_core.c

+6 −3
Original line number Diff line number Diff line
@@ -996,9 +996,11 @@ static int vfio_pci_ioctl_get_info(struct vfio_pci_core_device *vdev, 
	return copy_to_user(arg, &info, minsz) ? -EFAULT : 0;

}



static int vfio_pci_ioctl_get_region_info(struct vfio_pci_core_device *vdev,

int vfio_pci_ioctl_get_region_info(struct vfio_device *core_vdev,

				   struct vfio_region_info __user *arg)

{

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);

	unsigned long minsz = offsetofend(struct vfio_region_info, offset);

	struct pci_dev *pdev = vdev->pdev;

	struct vfio_region_info info;
@@ -1132,6 +1134,7 @@ static int vfio_pci_ioctl_get_region_info(struct vfio_pci_core_device *vdev, 


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

}

EXPORT_SYMBOL_GPL(vfio_pci_ioctl_get_region_info);



static int vfio_pci_ioctl_get_irq_info(struct vfio_pci_core_device *vdev,

				       struct vfio_irq_info __user *arg)
@@ -1458,7 +1461,7 @@ long vfio_pci_core_ioctl(struct vfio_device *core_vdev, unsigned int cmd, 
	case VFIO_DEVICE_GET_PCI_HOT_RESET_INFO:

		return vfio_pci_ioctl_get_pci_hot_reset_info(vdev, uarg);

	case VFIO_DEVICE_GET_REGION_INFO:

		return vfio_pci_ioctl_get_region_info(vdev, uarg);

		return vfio_pci_ioctl_get_region_info(core_vdev, uarg);

	case VFIO_DEVICE_IOEVENTFD:

		return vfio_pci_ioctl_ioeventfd(vdev, uarg);

	case VFIO_DEVICE_PCI_HOT_RESET:

drivers/vfio/vfio_main.c

+7 −0
Original line number Diff line number Diff line
@@ -1296,7 +1296,14 @@ static long vfio_device_fops_unl_ioctl(struct file *filep, 
		ret = vfio_ioctl_device_feature(device, uptr);

		break;



	case VFIO_DEVICE_GET_REGION_INFO:

		if (!device->ops->get_region_info)

			goto ioctl_fallback;

		ret = device->ops->get_region_info(device, uptr);

		break;



	default:

ioctl_fallback:

		if (unlikely(!device->ops->ioctl))

			ret = -EINVAL;

		else

include/linux/vfio.h

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ struct vfio_device_ops { 
			 size_t count, loff_t *size);

	long	(*ioctl)(struct vfio_device *vdev, unsigned int cmd,

			 unsigned long arg);

	int	(*get_region_info)(struct vfio_device *vdev,

				   struct vfio_region_info __user *arg);

	int	(*mmap)(struct vfio_device *vdev, struct vm_area_struct *vma);

	void	(*request)(struct vfio_device *vdev, unsigned int count);

	int	(*match)(struct vfio_device *vdev, char *buf);

include/linux/vfio_pci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ long vfio_pci_core_ioctl(struct vfio_device *core_vdev, unsigned int cmd, 
		unsigned long arg);

int vfio_pci_core_ioctl_feature(struct vfio_device *device, u32 flags,

				void __user *arg, size_t argsz);

int vfio_pci_ioctl_get_region_info(struct vfio_device *core_vdev,

				   struct vfio_region_info __user *arg);

ssize_t vfio_pci_core_read(struct vfio_device *core_vdev, char __user *buf,

		size_t count, loff_t *ppos);

ssize_t vfio_pci_core_write(struct vfio_device *core_vdev, const char __user *buf,