KVM: use 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 5731aac
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/5731aacd.failed

Use the new pfnmap API to allow huge MMIO mappings for VMs.  The rest work
is done perfectly on the other side (host_pfn_mapping_level()).

Link: https://lkml.kernel.org/r/[email protected]
	Signed-off-by: Peter Xu <[email protected]>
	Cc: Paolo Bonzini <[email protected]>
	Cc: Sean Christopherson <[email protected]>
	Cc: Alexander Gordeev <[email protected]>
	Cc: Alex Williamson <[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: Jason Gunthorpe <[email protected]>
	Cc: Matthew Wilcox <[email protected]>
	Cc: Niklas Schnelle <[email protected]>
	Cc: Ryan Roberts <[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 5731aac)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	virt/kvm/kvm_main.c

Author: PlaidCat

ciq/ciq_backports/kernel-5.14.0-570.26.1.el9_6/5731aacd.failed

@@ -0,0 +1,80 @@
+KVM: use 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 5731aacd54a883dd2c1a5e8c85e1fe78fc728dc7
+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/5731aacd.failed
+
+Use the new pfnmap API to allow huge MMIO mappings for VMs.  The rest work
+is done perfectly on the other side (host_pfn_mapping_level()).
+
+Link: https://lkml.kernel.org/r/[email protected]
+	Signed-off-by: Peter Xu <[email protected]>
+	Cc: Paolo Bonzini <[email protected]>
+	Cc: Sean Christopherson <[email protected]>
+	Cc: Alexander Gordeev <[email protected]>
+	Cc: Alex Williamson <[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: Jason Gunthorpe <[email protected]>
+	Cc: Matthew Wilcox <[email protected]>
+	Cc: Niklas Schnelle <[email protected]>
+	Cc: Ryan Roberts <[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 5731aacd54a883dd2c1a5e8c85e1fe78fc728dc7)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	virt/kvm/kvm_main.c
+diff --cc virt/kvm/kvm_main.c
+index b163a079fe65,f416d5e3f9c0..000000000000
+--- a/virt/kvm/kvm_main.c
++++ b/virt/kvm/kvm_main.c
+@@@ -2878,13 -2860,11 +2878,15 @@@ static int hva_to_pfn_remapped(struct v
+  			       unsigned long addr, bool write_fault,
+  			       bool *writable, kvm_pfn_t *p_pfn)
+  {
++ 	struct follow_pfnmap_args args = { .vma = vma, .address = addr };
+  	kvm_pfn_t pfn;
+- 	pte_t *ptep;
+- 	pte_t pte;
+- 	spinlock_t *ptl;
+  	int r;
+  
+++<<<<<<< HEAD
+ +	r = follow_pte(vma->vm_mm, addr, &ptep, &ptl);
+++=======
++ 	r = follow_pfnmap_start(&args);
+++>>>>>>> 5731aacd54a8 (KVM: use follow_pfnmap API)
+  	if (r) {
+  		/*
+  		 * get_user_pages fails for VM_IO and VM_PFNMAP vmas and does
+@@@ -2899,7 -2879,7 +2901,11 @@@
+  		if (r)
+  			return r;
+  
+++<<<<<<< HEAD
+ +		r = follow_pte(vma->vm_mm, addr, &ptep, &ptl);
+++=======
++ 		r = follow_pfnmap_start(&args);
+++>>>>>>> 5731aacd54a8 (KVM: use follow_pfnmap API)
+  		if (r)
+  			return r;
+  	}
+* Unmerged path virt/kvm/kvm_main.c