Commit 29afd0c7 authored by Julian Ruess's avatar Julian Ruess Committed by Alex Williamson
Browse files

vfio/pci: Rename vfio_config_do_rw() to vfio_pci_config_rw_single() and export it 



A follow-up patch adds a new variant driver for s390 ISM devices. Since
this device uses a 256 TiB BAR 0 that is never mapped, the variant
driver needs its own ISM_VFIO_PCI_OFFSET_MASK. To minimally mirror the
functionality of vfio_pci_config_rw() with such a custom mask, export
vfio_config_do_rw(). To better distinguish the now exported function
from vfio_pci_config_rw(), rename it to vfio_pci_config_rw_single()
emphasizing that it does a single config space read or write.

Reviewed-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarJulian Ruess <julianr@linux.ibm.com>
Link: https://lore.kernel.org/r/20260325-vfio_pci_ism-v8-1-ddc504cde914@linux.ibm.com


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

drivers/vfio/pci/vfio_pci_config.c

+5 −3
Original line number Diff line number Diff line
@@ -1880,8 +1880,9 @@ static size_t vfio_pci_cap_remaining_dword(struct vfio_pci_core_device *vdev, 
	return i;

}



static ssize_t vfio_config_do_rw(struct vfio_pci_core_device *vdev, char __user *buf,

				 size_t count, loff_t *ppos, bool iswrite)

ssize_t vfio_pci_config_rw_single(struct vfio_pci_core_device *vdev,

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

				  bool iswrite)

{

	struct pci_dev *pdev = vdev->pdev;

	struct perm_bits *perm;
@@ -1970,6 +1971,7 @@ static ssize_t vfio_config_do_rw(struct vfio_pci_core_device *vdev, char __user 


	return ret;

}

EXPORT_SYMBOL_GPL(vfio_pci_config_rw_single);



ssize_t vfio_pci_config_rw(struct vfio_pci_core_device *vdev, char __user *buf,

			   size_t count, loff_t *ppos, bool iswrite)
@@ -1981,7 +1983,7 @@ ssize_t vfio_pci_config_rw(struct vfio_pci_core_device *vdev, char __user *buf, 
	pos &= VFIO_PCI_OFFSET_MASK;



	while (count) {

		ret = vfio_config_do_rw(vdev, buf, count, &pos, iswrite);

		ret = vfio_pci_config_rw_single(vdev, buf, count, &pos, iswrite);

		if (ret < 0)

			return ret;

drivers/vfio/pci/vfio_pci_priv.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_core_device *vdev, uint32_t flags, 
ssize_t vfio_pci_config_rw(struct vfio_pci_core_device *vdev, char __user *buf,

			   size_t count, loff_t *ppos, bool iswrite);



ssize_t vfio_pci_config_rw_single(struct vfio_pci_core_device *vdev,

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

				  bool iswrite);



ssize_t vfio_pci_bar_rw(struct vfio_pci_core_device *vdev, char __user *buf,

			size_t count, loff_t *ppos, bool iswrite);