vfio: use the new follow_pfnmap API

jira LE-3557
Rebuild_History Non-Buildable kernel-5.14.0-570.26.1.el9_6
commit-author Peter Xu <[email protected]>
commit a77f948
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-5.14.0-570.26.1.el9_6/a77f9489.failed

Use the new API that can understand huge pfn mappings.

Link: https://lkml.kernel.org/r/[email protected]
	Signed-off-by: Peter Xu <[email protected]>
	Cc: Alex Williamson <[email protected]>
	Cc: Jason Gunthorpe <[email protected]>
	Cc: Alexander Gordeev <[email protected]>
	Cc: Aneesh Kumar K.V <[email protected]>
	Cc: Borislav Petkov <[email protected]>
	Cc: Catalin Marinas <[email protected]>
	Cc: Christian Borntraeger <[email protected]>
	Cc: Dave Hansen <[email protected]>
	Cc: David Hildenbrand <[email protected]>
	Cc: Gavin Shan <[email protected]>
	Cc: Gerald Schaefer <[email protected]>
	Cc: Heiko Carstens <[email protected]>
	Cc: Ingo Molnar <[email protected]>
	Cc: Matthew Wilcox <[email protected]>
	Cc: Niklas Schnelle <[email protected]>
	Cc: Paolo Bonzini <[email protected]>
	Cc: Ryan Roberts <[email protected]>
	Cc: Sean Christopherson <[email protected]>
	Cc: Sven Schnelle <[email protected]>
	Cc: Thomas Gleixner <[email protected]>
	Cc: Vasily Gorbik <[email protected]>
	Cc: Will Deacon <[email protected]>
	Cc: Zi Yan <[email protected]>
	Signed-off-by: Andrew Morton <[email protected]>
(cherry picked from commit a77f948)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	drivers/vfio/vfio_iommu_type1.c

Author: PlaidCat

ciq/ciq_backports/kernel-5.14.0-570.26.1.el9_6/a77f9489.failed

@@ -0,0 +1,78 @@
+vfio: use the new follow_pfnmap API
+
+jira LE-3557
+Rebuild_History Non-Buildable kernel-5.14.0-570.26.1.el9_6
+commit-author Peter Xu <[email protected]>
+commit a77f9489f1d7873a56e1d6640cc0c4865f64176b
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-570.26.1.el9_6/a77f9489.failed
+
+Use the new API that can understand huge pfn mappings.
+
+Link: https://lkml.kernel.org/r/[email protected]
+	Signed-off-by: Peter Xu <[email protected]>
+	Cc: Alex Williamson <[email protected]>
+	Cc: Jason Gunthorpe <[email protected]>
+	Cc: Alexander Gordeev <[email protected]>
+	Cc: Aneesh Kumar K.V <[email protected]>
+	Cc: Borislav Petkov <[email protected]>
+	Cc: Catalin Marinas <[email protected]>
+	Cc: Christian Borntraeger <[email protected]>
+	Cc: Dave Hansen <[email protected]>
+	Cc: David Hildenbrand <[email protected]>
+	Cc: Gavin Shan <[email protected]>
+	Cc: Gerald Schaefer <[email protected]>
+	Cc: Heiko Carstens <[email protected]>
+	Cc: Ingo Molnar <[email protected]>
+	Cc: Matthew Wilcox <[email protected]>
+	Cc: Niklas Schnelle <[email protected]>
+	Cc: Paolo Bonzini <[email protected]>
+	Cc: Ryan Roberts <[email protected]>
+	Cc: Sean Christopherson <[email protected]>
+	Cc: Sven Schnelle <[email protected]>
+	Cc: Thomas Gleixner <[email protected]>
+	Cc: Vasily Gorbik <[email protected]>
+	Cc: Will Deacon <[email protected]>
+	Cc: Zi Yan <[email protected]>
+	Signed-off-by: Andrew Morton <[email protected]>
+(cherry picked from commit a77f9489f1d7873a56e1d6640cc0c4865f64176b)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	drivers/vfio/vfio_iommu_type1.c
+diff --cc drivers/vfio/vfio_iommu_type1.c
+index 6c6586af7953,bf391b40e576..000000000000
+--- a/drivers/vfio/vfio_iommu_type1.c
++++ b/drivers/vfio/vfio_iommu_type1.c
+@@@ -515,12 -513,10 +515,14 @@@ static int follow_fault_pfn(struct vm_a
+  			    unsigned long vaddr, unsigned long *pfn,
+  			    bool write_fault)
+  {
+- 	pte_t *ptep;
+- 	pte_t pte;
+- 	spinlock_t *ptl;
++ 	struct follow_pfnmap_args args = { .vma = vma, .address = vaddr };
+  	int ret;
+  
+++<<<<<<< HEAD
+ +	ret = follow_pte(vma->vm_mm, vaddr, &ptep, &ptl);
+++=======
++ 	ret = follow_pfnmap_start(&args);
+++>>>>>>> a77f9489f1d7 (vfio: use the new follow_pfnmap API)
+  	if (ret) {
+  		bool unlocked = false;
+  
+@@@ -534,7 -530,7 +536,11 @@@
+  		if (ret)
+  			return ret;
+  
+++<<<<<<< HEAD
+ +		ret = follow_pte(vma->vm_mm, vaddr, &ptep, &ptl);
+++=======
++ 		ret = follow_pfnmap_start(&args);
+++>>>>>>> a77f9489f1d7 (vfio: use the new follow_pfnmap API)
+  		if (ret)
+  			return ret;
+  	}
+* Unmerged path drivers/vfio/vfio_iommu_type1.c