diff --git a/files/ppc64le-kvm-support.patch b/files/ppc64le-kvm-support.patch index 241560a..4f8883f 100644 --- a/files/ppc64le-kvm-support.patch +++ b/files/ppc64le-kvm-support.patch @@ -192,76 +192,6 @@ index 818815e15..f8f39a858 100644 2.39.5 (Apple Git-154) -From a8d04f4f09f371e3b4fca9a40e9d3b5a1e0016d3 Mon Sep 17 00:00:00 2001 -From: Hugh Dickins -Date: Thu, 8 Jun 2023 12:22:39 -0700 -Subject: [PATCH 2/3] powerpc: kvmppc_unmap_free_pmd() pte_offset_kernel() - -kvmppc_unmap_free_pmd() use pte_offset_kernel(), like everywhere else -in book3s_64_mmu_radix.c: instead of pte_offset_map(), which will come -to need a pte_unmap() to balance it. - -But note that this is a more complex case than most: see those -EAGAINs -in kvmppc_create_pte(), which is coping with kvmppc races beween page -table and huge entry, of the kind which we are expecting to address -in pte_offset_map() - this might want to be revisited in future. - -Link: https://lkml.kernel.org/r/c76aa421-aec3-4cc8-cc61-4130f2e27e1@google.com -Signed-off-by: Hugh Dickins -Cc: Alexander Gordeev -Cc: Alexandre Ghiti -Cc: Aneesh Kumar K.V -Cc: Catalin Marinas -Cc: Christian Borntraeger -Cc: Chris Zankel -Cc: Claudio Imbrenda -Cc: David Hildenbrand -Cc: "David S. Miller" -Cc: Geert Uytterhoeven -Cc: Greg Ungerer -Cc: Heiko Carstens -Cc: Helge Deller -Cc: "H. Peter Anvin" -Cc: Ingo Molnar -Cc: John David Anglin -Cc: John Paul Adrian Glaubitz -Cc: Kirill A. Shutemov -Cc: Matthew Wilcox (Oracle) -Cc: Max Filippov -Cc: Michael Ellerman -Cc: Michal Simek -Cc: Mike Kravetz -Cc: Mike Rapoport (IBM) -Cc: Palmer Dabbelt -Cc: Peter Zijlstra -Cc: Qi Zheng -Cc: Russell King -Cc: Suren Baghdasaryan -Cc: Thomas Bogendoerfer -Cc: Thomas Gleixner -Cc: Will Deacon -Signed-off-by: Andrew Morton ---- - arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c -index e565a84cf..57fe60b51 100644 ---- a/arch/powerpc/kvm/book3s_64_mmu_radix.c -+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c -@@ -502,7 +502,7 @@ static void kvmppc_unmap_free_pmd(struct kvm *kvm, pmd_t *pmd, bool full, - } else { - pte_t *pte; - -- pte = pte_offset_map(p, 0); -+ pte = pte_offset_kernel(p, 0); - kvmppc_unmap_free_pte(kvm, pte, full, lpid); - pmd_clear(p); - } --- -2.39.5 (Apple Git-154) - - From 8c62d250a23bbbb1ecd84d4d475e7623810275aa Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 8 Apr 2025 10:13:43 +0300 @@ -287,4 +217,3 @@ index f38dfe195..16e5872a1 100644 stt = kvmppc_find_table(vcpu->kvm, liobn); -- 2.39.5 (Apple Git-154) -