kvm-use-follow_pfnmap-api.patch removed from -mm tree
The quilt patch titled
Subject: KVM: use follow_pfnmap API
has been removed from the -mm tree. Its filename was
kvm-use-follow_pfnmap-api.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: KVM: use follow_pfnmap API
Date: Mon, 26 Aug 2024 16:43:44 -0400
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()).
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]>
---
virt/kvm/kvm_main.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
virt/kvm/kvm_main.c renamed from virt/kvm/kvm_main.c~kvm-use-follow_pfnmap-api +7 -12
@@ -2860,13 +2860,11 @@ static int hva_to_pfn_remapped(struct vm 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; - r =follow_pte (vma, addr, &ptep, &ptl); + r =follow_pfnmap_start (&args);if (r) {/* * get_user_pages fails for VM_IO and VM_PFNMAP vmas and does
@@ -2881,21 +2879,19 @@ static int hva_to_pfn_remapped(struct vmif (r)return r; - r =follow_pte (vma, addr, &ptep, &ptl); + r =follow_pfnmap_start (&args);if (r)return r; } - pte =ptep_get (ptep); - -if (write_fault && !pte_write (pte)) { +if (write_fault && !args.writable) { pfn =KVM_PFN_ERR_RO_FAULT ; goto out; }if (writable) - *writable =pte_write (pte); - pfn =pte_pfn (pte); + *writable = args.writable; + pfn = args.pfn;/* * Get a reference here because callers of *hva_to_pfn* and
@@ -2916,9 +2912,8 @@ static int hva_to_pfn_remapped(struct vm*/ if (!kvm_try_get_pfn (pfn)) r = -EFAULT ; - out: -pte_unmap_unlock (ptep, ptl); +follow_pfnmap_end (&args); *p_pfn = pfn;return r;
_
Patches currently in -mm which might be from [email protected] are