Commit 17860cca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull VFIO fixes from Alex Williamson:

 - Fix pfnmap batch carryover (Daniel Jordan)

 - Fix nvlink Kconfig dependency (Jason Gunthorpe)

* tag 'vfio-v5.12-rc6' of git://github.com/awilliam/linux-vfio:
  vfio/nvlink: Add missing SPAPR_TCE_IOMMU depends
  vfio/type1: Empty batch for pfnmap pages
parents e720e7d0 e0146a10

drivers/vfio/pci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,6 @@ config VFIO_PCI_IGD 


config VFIO_PCI_NVLINK2

	def_bool y

	depends on VFIO_PCI && PPC_POWERNV

	depends on VFIO_PCI && PPC_POWERNV && SPAPR_TCE_IOMMU

	help

	  VFIO PCI support for P9 Witherspoon machine with NVIDIA V100 GPUs

drivers/vfio/vfio_iommu_type1.c

+6 −0
Original line number Diff line number Diff line
@@ -739,6 +739,12 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr, 
	ret = vfio_lock_acct(dma, lock_acct, false);



unpin_out:

	if (batch->size == 1 && !batch->offset) {

		/* May be a VM_PFNMAP pfn, which the batch can't remember. */

		put_pfn(pfn, dma->prot);

		batch->size = 0;

	}



	if (ret < 0) {

		if (pinned && !rsvd) {

			for (pfn = *pfn_base ; pinned ; pfn++, pinned--)