s390-pgtable-consolidate-pxd-and-pte-tlb-free-paths.patch removed from -mm tree
The quilt patch titled
Subject: s390: pgtable: consolidate PxD and PTE TLB free paths
has been removed from the -mm tree. Its filename was
s390-pgtable-consolidate-pxd-and-pte-tlb-free-paths.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: s390: pgtable: consolidate PxD and PTE TLB free paths
Date: Wed, 8 Jan 2025 14:57:29 +0800
Call pagetable_dtor() for PMD|PUD|P4D tables just before ptdesc is freed - same as it is done for PTE tables. That allows consolidating TLB free paths for all table types.
---
arch/s390/include/asm/tlb.h | 3 --- arch/s390/mm/pgalloc.c | 14 ++++---------- 2 files changed, 4 insertions(+), 13 deletions(-)
arch/s390/include/asm/tlb.h renamed from arch/s390/include/asm/tlb.h~s390-pgtable-consolidate-pxd-and-pte-tlb-free-paths +0 -3
@@ -102,7 +102,6 @@ static inline void pmd_free_tlb(struct m {if (mm_pmd_folded (tlb->mm))return ; -pagetable_dtor (virt_to_ptdesc (pmd));__tlb_adjust_range (tlb, address,PAGE_SIZE ); tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ;
@@ -122,7 +121,6 @@ static inline void p4d_free_tlb(struct m {if (mm_p4d_folded (tlb->mm))return ; -pagetable_dtor (virt_to_ptdesc (p4d));__tlb_adjust_range (tlb, address,PAGE_SIZE ); tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ;
@@ -141,7 +139,6 @@ static inline void pud_free_tlb(struct m {if (mm_pud_folded (tlb->mm))return ; -pagetable_dtor (virt_to_ptdesc (pud)); tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ; tlb->cleared_p4ds =1 ;
arch/s390/mm/pgalloc.c renamed from arch/s390/mm/pgalloc.c~s390-pgtable-consolidate-pxd-and-pte-tlb-free-paths +4 -10
@@ -180,7 +180,7 @@ unsigned long *page_table_alloc(struct mreturn table; } -static void pagetable_pte_dtor_free (struct ptdesc *ptdesc) +static void pagetable_dtor_free (struct ptdesc *ptdesc) {pagetable_dtor (ptdesc);pagetable_free (ptdesc);
@@ -190,20 +190,14 @@ void page_table_free(struct mm_struct *m {struct ptdesc *ptdesc =virt_to_ptdesc (table); -pagetable_pte_dtor_free (ptdesc); +pagetable_dtor_free (ptdesc); }void __tlb_remove_table (void *table) {struct ptdesc *ptdesc =virt_to_ptdesc (table); -struct page *page =ptdesc_page (ptdesc); -if (compound_order (page) ==CRST_ALLOC_ORDER ) { -/* pmd, pud, or p4d */ -pagetable_free (ptdesc); -return ; - } -pagetable_pte_dtor_free (ptdesc); +pagetable_dtor_free (ptdesc); }#ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -211,7 +205,7 @@ static void pte_free_now(struct rcu_head { struct ptdesc *ptdesc = container_of(head, struct ptdesc, pt_rcu_head); -pagetable_pte_dtor_free (ptdesc); +pagetable_dtor_free (ptdesc); }void pte_free_defer (struct mm_struct *mm,pgtable_t pgtable)
_
Patches currently in -mm which might be from [email protected] are