mm-pgtable-introduce-generic-pagetable_dtor_free.patch removed from -mm tree
The quilt patch titled
Subject: mm: pgtable: introduce generic pagetable_dtor_free()
has been removed from the -mm tree. Its filename was
mm-pgtable-introduce-generic-pagetable_dtor_free.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 pagetable_dtor_free()
Date: Wed, 8 Jan 2025 14:57:33 +0800
The pte_free(), pmd_free(), __pud_free() and __p4d_free() in asm-generic/pgalloc.h and the generic __tlb_remove_table() are basically the same, so let's introduce pagetable_dtor_free() to deduplicate them.
In addition, the pagetable_dtor_free() in s390 does the same thing, so let's s390 also calls generic pagetable_dtor_free().
---
arch/s390/mm/pgalloc.c | 6 ------ include/asm-generic/pgalloc.h | 12 ++++-------- include/asm-generic/tlb.h | 3 +-- include/linux/mm.h | 6 ++++++ 4 files changed, 11 insertions(+), 16 deletions(-)
arch/s390/mm/pgalloc.c renamed from arch/s390/mm/pgalloc.c~mm-pgtable-introduce-generic-pagetable_dtor_free +0 -6
@@ -180,12 +180,6 @@ unsigned long *page_table_alloc(struct mreturn table; } -static void pagetable_dtor_free (struct ptdesc *ptdesc) -{ -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); -} -void page_table_free (struct mm_struct *mm,unsigned long *table) {struct ptdesc *ptdesc =virt_to_ptdesc (table);
include/asm-generic/pgalloc.h renamed from include/asm-generic/pgalloc.h~mm-pgtable-introduce-generic-pagetable_dtor_free +4 -8
@@ -109,8 +109,7 @@ static inline void pte_free(struct mm_st {struct ptdesc *ptdesc =page_ptdesc (pte_page); -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); +pagetable_dtor_free (ptdesc); }
@@ -153,8 +152,7 @@ static inline void pmd_free(struct mm_ststruct ptdesc *ptdesc =virt_to_ptdesc (pmd);BUG_ON ((unsigned long )pmd & (PAGE_SIZE -1 )); -pagetable_dtor (ptdesc); - pagetable_free(ptdesc); + pagetable_dtor_free(ptdesc); }#endif
@@ -202,8 +200,7 @@ static inline void __pud_free(struct mm_struct ptdesc *ptdesc =virt_to_ptdesc (pud);BUG_ON ((unsigned long )pud & (PAGE_SIZE -1 )); -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); +pagetable_dtor_free (ptdesc); }#ifndef __HAVE_ARCH_PUD_FREE
@@ -248,8 +245,7 @@ static inline void __p4d_free(struct mm_struct ptdesc *ptdesc =virt_to_ptdesc (p4d);BUG_ON ((unsigned long )p4d & (PAGE_SIZE -1 )); -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); +pagetable_dtor_free (ptdesc); }#ifndef __HAVE_ARCH_P4D_FREE
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~mm-pgtable-introduce-generic-pagetable_dtor_free +1 -2
@@ -213,8 +213,7 @@ static inline void __tlb_remove_table(vo {struct ptdesc *ptdesc = (struct ptdesc *)table; -pagetable_dtor (ptdesc); -pagetable_free (ptdesc); +pagetable_dtor_free (ptdesc); }#endif
include/linux/mm.h renamed from include/linux/mm.h~mm-pgtable-introduce-generic-pagetable_dtor_free +6 -0
@@ -3001,6 +3001,12 @@ static inline void pagetable_dtor(structlruvec_stat_sub_folio (folio,NR_PAGETABLE ); } +static inline void pagetable_dtor_free (struct ptdesc *ptdesc) +{ +pagetable_dtor (ptdesc); +pagetable_free (ptdesc); +} +static inline bool pagetable_pte_ctor (struct ptdesc *ptdesc) {struct folio *folio =ptdesc_folio (ptdesc);
_
Patches currently in -mm which might be from [email protected] are