arm64-convert-various-functions-to-use-ptdescs.patch removed from -mm tree
The quilt patch titled
Subject: arm64: convert various functions to use ptdescs
has been removed from the -mm tree. Its filename was
arm64-convert-various-functions-to-use-ptdescs.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: "Vishal Moola (Oracle)" <[email protected]>
Subject: arm64: convert various functions to use ptdescs
Date: Mon, 7 Aug 2023 16:05:00 -0700
As part of the conversions to replace pgtable constructor/destructors with ptdesc equivalents, convert various page table functions to use ptdescs.
Signed-off-by Vishal Moola (Oracle) <[email protected]>
Acked-by Catalin Marinas <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Claudio Imbrenda <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Guo Ren <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Jonas Bonn <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Yoshinori Sato <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/arm64/include/asm/tlb.h | 14 ++++++++------ arch/arm64/mm/mmu.c | 7 ++++--- 2 files changed, 12 insertions(+), 9 deletions(-)
arch/arm64/include/asm/tlb.h renamed from arch/arm64/include/asm/tlb.h~arm64-convert-various-functions-to-use-ptdescs +8 -6
@@ -75,18 +75,20 @@ static inline void tlb_flush(struct mmu_static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t pte,unsigned long addr) { -pgtable_pte_page_dtor (pte); -tlb_remove_table (tlb, pte); +struct ptdesc *ptdesc =page_ptdesc (pte); + +pagetable_pte_dtor (ptdesc); +tlb_remove_ptdesc (tlb, ptdesc); }#if CONFIG_PGTABLE_LEVELS >2 static inline void __pmd_free_tlb (struct mmu_gather *tlb,pmd_t *pmdp,unsigned long addr) { -struct page *page =virt_to_page (pmdp); +struct ptdesc *ptdesc =virt_to_ptdesc (pmdp); -pgtable_pmd_page_dtor (page); -tlb_remove_table (tlb, page); +pagetable_pmd_dtor (ptdesc); +tlb_remove_ptdesc (tlb, ptdesc); }#endif
@@ -94,7 +96,7 @@ static inline void __pmd_free_tlb(structstatic inline void __pud_free_tlb (struct mmu_gather *tlb,pud_t *pudp,unsigned long addr) { -tlb_remove_table (tlb,virt_to_page (pudp)); +tlb_remove_ptdesc (tlb,virt_to_ptdesc (pudp)); }#endif
arch/arm64/mm/mmu.c renamed from arch/arm64/mm/mmu.c~arm64-convert-various-functions-to-use-ptdescs +4 -3
@@ -426,6 +426,7 @@ static phys_addr_t __pgd_pgtable_alloc(istatic phys_addr_t pgd_pgtable_alloc (int shift) {phys_addr_t pa =__pgd_pgtable_alloc (shift); +struct ptdesc *ptdesc =page_ptdesc (phys_to_page (pa));/* * Call proper page table ctor in case later we need to
@@ -433,12 +434,12 @@ static phys_addr_t pgd_pgtable_alloc(int* this pre-allocated page table. * * We don't select ARCH_ENABLE_SPLIT_PMD_PTLOCK if pmd is -* folded, and if so pgtable_pmd_page_ctor() becomes nop. +* folded, and if so pagetable_pte_ctor() becomes nop. */ if (shift ==PAGE_SHIFT ) -BUG_ON (!pgtable_pte_page_ctor (phys_to_page (pa))); +BUG_ON (!pagetable_pte_ctor (ptdesc));else if (shift ==PMD_SHIFT ) -BUG_ON (!pgtable_pmd_page_ctor (phys_to_page (pa))); +BUG_ON (!pagetable_pmd_ctor (ptdesc));return pa; }
_
Patches currently in -mm which might be from [email protected] are