Commit e7500b3e authored by Yishai Hadas's avatar Yishai Hadas Committed by Alex Williamson
Browse files

vfio/pci: Make vfio_pci_regops->rw() return ssize_t 



The only implementation of this in IGD returns a -ERRNO which is
implicitly cast through a size_t and then casted again and returned as a
ssize_t in vfio_pci_rw().

Fix the vfio_pci_regops->rw() return type to be ssize_t so all is
consistent.

Fixes: 28541d41 ("vfio/pci: Add infrastructure for additional device specific regions")
Signed-off-by: default avatarYishai Hadas <yishaih@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Link: https://lore.kernel.org/r/0-v3-5db12d1bf576+c910-vfio_rw_jgg@nvidia.com


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

drivers/vfio/pci/vfio_pci_igd.c

+5 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define OPREGION_RVDS		0x3c2

#define OPREGION_VERSION	0x16



static size_t vfio_pci_igd_rw(struct vfio_pci_device *vdev, char __user *buf,

static ssize_t vfio_pci_igd_rw(struct vfio_pci_device *vdev, char __user *buf,

			       size_t count, loff_t *ppos, bool iswrite)

{

	unsigned int i = VFIO_PCI_OFFSET_TO_INDEX(*ppos) - VFIO_PCI_NUM_REGIONS;
@@ -160,7 +160,7 @@ static int vfio_pci_igd_opregion_init(struct vfio_pci_device *vdev) 
	return ret;

}



static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,

static ssize_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,

				   char __user *buf, size_t count, loff_t *ppos,

				   bool iswrite)

{

drivers/vfio/pci/vfio_pci_private.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct vfio_pci_device; 
struct vfio_pci_region;



struct vfio_pci_regops {

	size_t	(*rw)(struct vfio_pci_device *vdev, char __user *buf,

	ssize_t	(*rw)(struct vfio_pci_device *vdev, char __user *buf,

		      size_t count, loff_t *ppos, bool iswrite);

	void	(*release)(struct vfio_pci_device *vdev,

			   struct vfio_pci_region *region);