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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 5 years ago 17860cca e720e7d0

+7 -1

2 changed files

expand all

drivers

vfio

pci

Kconfig

vfio_iommu_type1.c

+1 -1

drivers/vfio/pci/Kconfig

··· 42 42 43 43 config VFIO_PCI_NVLINK2 44 44 def_bool y 45 - depends on VFIO_PCI && PPC_POWERNV 45 + depends on VFIO_PCI && PPC_POWERNV && SPAPR_TCE_IOMMU 46 46 help 47 47 VFIO PCI support for P9 Witherspoon machine with NVIDIA V100 GPUs

drivers/vfio/vfio_iommu_type1.c

··· 739 739 ret = vfio_lock_acct(dma, lock_acct, false); 740 740 741 741 unpin_out: 742 + if (batch->size == 1 && !batch->offset) { 743 + /* May be a VM_PFNMAP pfn, which the batch can't remember. */ 744 + put_pfn(pfn, dma->prot); 745 + batch->size = 0; 746 + } 747 + 742 748 if (ret < 0) { 743 749 if (pinned && !rsvd) { 744 750 for (pfn = *pfn_base ; pinned ; pfn++, pinned--)