Commit 719bbd4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v5.12-rc1' of git://github.com/awilliam/linux-vfio 

Pull VFIO updatesfrom Alex Williamson:

 - Virtual address update handling (Steve Sistare)

 - s390/zpci fixes and cleanups (Max Gurtovoy)

 - Fixes for dirty bitmap handling, non-mdev page pinning, and improved
   pinned dirty scope tracking (Keqian Zhu)

 - Batched page pinning enhancement (Daniel Jordan)

 - Page access permission fix (Alex Williamson)

* tag 'vfio-v5.12-rc1' of git://github.com/awilliam/linux-vfio: (21 commits)
  vfio/type1: Batch page pinning
  vfio/type1: Prepare for batched pinning with struct vfio_batch
  vfio/type1: Change success value of vaddr_get_pfn()
  vfio/type1: Use follow_pte()
  vfio/pci: remove CONFIG_VFIO_PCI_ZDEV from Kconfig
  vfio/iommu_type1: Fix duplicate included kthread.h
  vfio-pci/zdev: fix possible segmentation fault issue
  vfio-pci/zdev: remove unused vdev argument
  vfio/pci: Fix handling of pci use accessor return codes
  vfio/iommu_type1: Mantain a counter for non_pinned_groups
  vfio/iommu_type1: Fix some sanity checks in detach group
  vfio/iommu_type1: Populate full dirty when detach non-pinned group
  vfio/type1: block on invalid vaddr
  vfio/type1: implement notify callback
  vfio: iommu driver notify callback
  vfio/type1: implement interfaces to update vaddr
  vfio/type1: massage unmap iteration
  vfio: interfaces to update vaddr
  vfio/type1: implement unmap all
  vfio/type1: unmap cleanup
  ...
parents c4fbde84 4d83de6d

drivers/vfio/pci/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -45,15 +45,3 @@ config VFIO_PCI_NVLINK2 
	depends on VFIO_PCI && PPC_POWERNV

	help

	  VFIO PCI support for P9 Witherspoon machine with NVIDIA V100 GPUs
 


config VFIO_PCI_ZDEV

	bool "VFIO PCI ZPCI device CLP support"

	depends on VFIO_PCI && S390

	default y

	help

	  Enabling this option exposes VFIO capabilities containing hardware

	  configuration for zPCI devices. This enables userspace (e.g. QEMU)

	  to supply proper configuration values instead of hard-coded defaults

	  for zPCI devices passed through via VFIO on s390.



	  Say Y here.

drivers/vfio/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o

vfio-pci-$(CONFIG_VFIO_PCI_IGD) += vfio_pci_igd.o

vfio-pci-$(CONFIG_VFIO_PCI_NVLINK2) += vfio_pci_nvlink2.o

vfio-pci-$(CONFIG_VFIO_PCI_ZDEV) += vfio_pci_zdev.o

vfio-pci-$(CONFIG_S390) += vfio_pci_zdev.o



obj-$(CONFIG_VFIO_PCI) += vfio-pci.o

drivers/vfio/pci/vfio_pci.c

+5 −7
Original line number Diff line number Diff line
@@ -807,6 +807,7 @@ static long vfio_pci_ioctl(void *device_data, 
		struct vfio_device_info info;

		struct vfio_info_cap caps = { .buf = NULL, .size = 0 };

		unsigned long capsz;

		int ret;



		minsz = offsetofend(struct vfio_device_info, num_irqs);
@@ -832,14 +833,11 @@ static long vfio_pci_ioctl(void *device_data, 
		info.num_regions = VFIO_PCI_NUM_REGIONS + vdev->num_regions;

		info.num_irqs = VFIO_PCI_NUM_IRQS;



		if (IS_ENABLED(CONFIG_VFIO_PCI_ZDEV)) {

			int ret = vfio_pci_info_zdev_add_caps(vdev, &caps);



		ret = vfio_pci_info_zdev_add_caps(vdev, &caps);

		if (ret && ret != -ENODEV) {

			pci_warn(vdev->pdev, "Failed to setup zPCI info capabilities\n");

			return ret;

		}

		}



		if (caps.size) {

			info.flags |= VFIO_DEVICE_FLAGS_CAPS;

drivers/vfio/pci/vfio_pci_igd.c

+5 −5
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev, 


		ret = pci_user_read_config_byte(pdev, pos, &val);

		if (ret)

			return pcibios_err_to_errno(ret);

			return ret;



		if (copy_to_user(buf + count - size, &val, 1))

			return -EFAULT;
@@ -141,7 +141,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev, 


		ret = pci_user_read_config_word(pdev, pos, &val);

		if (ret)

			return pcibios_err_to_errno(ret);

			return ret;



		val = cpu_to_le16(val);

		if (copy_to_user(buf + count - size, &val, 2))
@@ -156,7 +156,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev, 


		ret = pci_user_read_config_dword(pdev, pos, &val);

		if (ret)

			return pcibios_err_to_errno(ret);

			return ret;



		val = cpu_to_le32(val);

		if (copy_to_user(buf + count - size, &val, 4))
@@ -171,7 +171,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev, 


		ret = pci_user_read_config_word(pdev, pos, &val);

		if (ret)

			return pcibios_err_to_errno(ret);

			return ret;



		val = cpu_to_le16(val);

		if (copy_to_user(buf + count - size, &val, 2))
@@ -186,7 +186,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev, 


		ret = pci_user_read_config_byte(pdev, pos, &val);

		if (ret)

			return pcibios_err_to_errno(ret);

			return ret;



		if (copy_to_user(buf + count - size, &val, 1))

			return -EFAULT;

drivers/vfio/pci/vfio_pci_private.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static inline int vfio_pci_ibm_npu2_init(struct vfio_pci_device *vdev) 
}

#endif



#ifdef CONFIG_VFIO_PCI_ZDEV

#ifdef CONFIG_S390

extern int vfio_pci_info_zdev_add_caps(struct vfio_pci_device *vdev,

				       struct vfio_info_cap *caps);

#else