| Message ID | 0-v2-459be47fb870+c0-vfio_rw_jgg@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] vfio_pci_core: Make vfio_pci_regops->rw() return ssize_t | expand |
On Tue, Jul 20 2021, Jason Gunthorpe <jgg@nvidia.com> wrote: > From: Yishai Hadas <yishaih@nvidia.com> > > 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: 28541d41c9e0 ("vfio/pci: Add infrastructure for additional device specific regions") > Signed-off-by: Yishai Hadas <yishaih@nvidia.com> This is missing your s-o-b... > --- > drivers/vfio/pci/vfio_pci_igd.c | 10 +++++----- > drivers/vfio/pci/vfio_pci_private.h | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > v2: > - Diff fixed to be against v5.14-rc1, woops Could you please also fix the subject prefix? The change itself looks good to me.
diff --git a/drivers/vfio/pci/vfio_pci_igd.c b/drivers/vfio/pci/vfio_pci_igd.c index 228df565e9bc40..aa0a29fd276285 100644 --- a/drivers/vfio/pci/vfio_pci_igd.c +++ b/drivers/vfio/pci/vfio_pci_igd.c @@ -25,8 +25,8 @@ #define OPREGION_RVDS 0x3c2 #define OPREGION_VERSION 0x16 -static size_t vfio_pci_igd_rw(struct vfio_pci_device *vdev, char __user *buf, - size_t count, loff_t *ppos, bool iswrite) +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; void *base = vdev->region[i].data; @@ -160,9 +160,9 @@ 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, - char __user *buf, size_t count, loff_t *ppos, - bool iswrite) +static ssize_t vfio_pci_igd_cfg_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; struct pci_dev *pdev = vdev->region[i].data; diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h index 5a36272cecbf94..bbc56c857ef081 100644 --- a/drivers/vfio/pci/vfio_pci_private.h +++ b/drivers/vfio/pci/vfio_pci_private.h @@ -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);