mm-pgtable-introduce-generic-__tlb_remove_table.patch removed from -mm tree
The quilt patch titled
Subject: mm: pgtable: introduce generic __tlb_remove_table()
has been removed from the -mm tree. Its filename was
mm-pgtable-introduce-generic-__tlb_remove_table.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: Qi Zheng <[email protected]>
Subject: mm: pgtable: introduce generic __tlb_remove_table()
Date: Wed, 8 Jan 2025 14:57:30 +0800
Several architectures (arm, arm64, riscv and x86) define exactly the same __tlb_remove_table(), just introduce generic __tlb_remove_table() to eliminate these duplications.
The s390 __tlb_remove_table() is nearly the same, so also make s390 __tlb_remove_table() version generic.
---
arch/arm/include/asm/tlb.h | 9 --------- arch/arm64/include/asm/tlb.h | 7 ------- arch/powerpc/include/asm/tlb.h | 1 + arch/riscv/include/asm/tlb.h | 12 ------------ arch/s390/include/asm/tlb.h | 9 ++++----- arch/s390/mm/pgalloc.c | 7 ------- arch/sparc/include/asm/tlb_64.h | 1 + arch/x86/include/asm/tlb.h | 17 ----------------- include/asm-generic/tlb.h | 15 +++++++++++++-- 9 files changed, 19 insertions(+), 59 deletions(-)
arch/arm64/include/asm/tlb.h renamed from arch/arm64/include/asm/tlb.h~mm-pgtable-introduce-generic-__tlb_remove_table +0 -7
@@ -10,13 +10,6 @@#include <linux/pagemap.h> -static inline void __tlb_remove_table (void *_table) -{ -struct ptdesc *ptdesc = (struct ptdesc *)_table; - -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); -}#define tlb_flush tlb_flushstatic void tlb_flush (struct mmu_gather *tlb);
arch/arm/include/asm/tlb.h renamed from arch/arm/include/asm/tlb.h~mm-pgtable-introduce-generic-__tlb_remove_table +0 -9
@@ -27,15 +27,6 @@#else /* !CONFIG_MMU */ #include <asm/tlbflush.h> - -static inline void __tlb_remove_table (void *_table) -{ -struct ptdesc *ptdesc = (struct ptdesc *)_table; - -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); -} -#include <asm-generic/tlb.h> static inline void
arch/powerpc/include/asm/tlb.h renamed from arch/powerpc/include/asm/tlb.h~mm-pgtable-introduce-generic-__tlb_remove_table +1 -0
@@ -37,6 +37,7 @@ extern void tlb_flush(struct mmu_gather*/ #define tlb_needs_table_invalidate () radix_enabled() +#define __HAVE_ARCH_TLB_REMOVE_TABLE/* Get the generic bits... */ #include <asm-generic/tlb.h>
arch/riscv/include/asm/tlb.h renamed from arch/riscv/include/asm/tlb.h~mm-pgtable-introduce-generic-__tlb_remove_table +0 -12
@@ -10,18 +10,6 @@ struct mmu_gather;static void tlb_flush (struct mmu_gather *tlb); -#ifdef CONFIG_MMU - -static inline void __tlb_remove_table (void *table) -{ -struct ptdesc *ptdesc = (struct ptdesc *)table; - -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); -} - -#endif /* CONFIG_MMU */ -#define tlb_flush tlb_flush#include <asm-generic/tlb.h>
arch/s390/include/asm/tlb.h renamed from arch/s390/include/asm/tlb.h~mm-pgtable-introduce-generic-__tlb_remove_table +4 -5
@@ -22,7 +22,6 @@* Pages used for the page tables is a different story. FIXME: more */ -void __tlb_remove_table (void *_table);static inline void tlb_flush (struct mmu_gather *tlb);static inline bool __tlb_remove_page_size (struct mmu_gather *tlb,struct page *page,bool delay_rmap,int page_size);
@@ -87,7 +86,7 @@ static inline void pte_free_tlb(struct m tlb->cleared_pmds =1 ;if (mm_alloc_pgste (tlb->mm))gmap_unlink (tlb->mm, (unsigned long *)pte, address); -tlb_remove_ptdesc (tlb, pte); +tlb_remove_ptdesc (tlb,virt_to_ptdesc (pte)); }/*
@@ -106,7 +105,7 @@ static inline void pmd_free_tlb(struct m tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ; tlb->cleared_puds =1 ; -tlb_remove_ptdesc (tlb, pmd); +tlb_remove_ptdesc (tlb,virt_to_ptdesc (pmd)); }/*
@@ -124,7 +123,7 @@ static inline void p4d_free_tlb(struct m__tlb_adjust_range (tlb, address,PAGE_SIZE ); tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ; -tlb_remove_ptdesc (tlb, p4d); +tlb_remove_ptdesc (tlb,virt_to_ptdesc (p4d)); }/*
@@ -142,7 +141,7 @@ static inline void pud_free_tlb(struct m tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ; tlb->cleared_p4ds =1 ; -tlb_remove_ptdesc (tlb, pud); +tlb_remove_ptdesc (tlb,virt_to_ptdesc (pud)); }
arch/s390/mm/pgalloc.c renamed from arch/s390/mm/pgalloc.c~mm-pgtable-introduce-generic-__tlb_remove_table +0 -7
@@ -193,13 +193,6 @@ void page_table_free(struct mm_struct *mpagetable_dtor_free (ptdesc); } -void __tlb_remove_table (void *table) -{ -struct ptdesc *ptdesc =virt_to_ptdesc (table); - -pagetable_dtor_free (ptdesc); -} -#ifdef CONFIG_TRANSPARENT_HUGEPAGE static void pte_free_now (struct rcu_head *head) {
arch/sparc/include/asm/tlb_64.h renamed from arch/sparc/include/asm/tlb_64.h~mm-pgtable-introduce-generic-__tlb_remove_table +1 -0
@@ -33,6 +33,7 @@ void flush_tlb_pending(void);#define tlb_needs_table_invalidate () (false)#endif +#define __HAVE_ARCH_TLB_REMOVE_TABLE#include <asm-generic/tlb.h> #endif /* _SPARC64_TLB_H */
arch/x86/include/asm/tlb.h renamed from arch/x86/include/asm/tlb.h~mm-pgtable-introduce-generic-__tlb_remove_table +0 -17
@@ -20,23 +20,6 @@ static inline void tlb_flush(struct mmu_flush_tlb_mm_range (tlb->mm, start, end, stride_shift, tlb->freed_tables); } -/* -* While x86 architecture in general requires an IPI to perform TLB -* shootdown, enablement code for several hypervisors overrides -* .flush_tlb_others hook in pv_mmu_ops and implements it by issuing -* a hypercall. To keep software pagetable walkers safe in this case we -* switch to RCU based table free (MMU_GATHER_RCU_TABLE_FREE). See the comment -* below 'ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE' in include/asm-generic/tlb.h -* for more details. -*/ -static inline void __tlb_remove_table (void *table) -{ -struct ptdesc *ptdesc = (struct ptdesc *)table; - -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); -} -#ifdef CONFIG_PT_RECLAIM static inline void __tlb_remove_table_one_rcu (struct rcu_head *head) {
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~mm-pgtable-introduce-generic-__tlb_remove_table +13 -2
@@ -153,8 +153,9 @@* * Useful if your architecture has non-page page directories. * -* When used, an architecture is expected to provide __tlb_remove_table() -* which does the actual freeing of these pages. +* When used, an architecture is expected to provide __tlb_remove_table() or +* use the generic __tlb_remove_table(), which does the actual freeing of these +* pages. * * MMU_GATHER_RCU_TABLE_FREE *
@@ -207,6 +208,16 @@ struct mmu_table_batch {#define MAX_TABLE_BATCH \ ((PAGE_SIZE - sizeof(struct mmu_table_batch)) / sizeof(void *)) +#ifndef __HAVE_ARCH_TLB_REMOVE_TABLE +static inline void __tlb_remove_table (void *table) +{ +struct ptdesc *ptdesc = (struct ptdesc *)table; + +pagetable_dtor (ptdesc); +pagetable_free (ptdesc); +} +#endif +extern void tlb_remove_table (struct mmu_gather *tlb,void *table);#else /* !CONFIG_MMU_GATHER_HAVE_TABLE_FREE */
_
Patches currently in -mm which might be from [email protected] are