s390-pgtable-add-statistics-for-pud-and-p4d-level-page-table.patch removed from -mm tree
The quilt patch titled
Subject: s390: pgtable: add statistics for PUD and P4D level page table
has been removed from the -mm tree. Its filename was
s390-pgtable-add-statistics-for-pud-and-p4d-level-page-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: s390: pgtable: add statistics for PUD and P4D level page table
Date: Wed, 8 Jan 2025 14:57:22 +0800
Like PMD and PTE level page table, also add statistics for PUD and P4D page table.
Link https://lkml.kernel.org/r/4707dffce228ccec5c6662810566dd12b5741c4b.1736317725.git.zhengqi.arch@bytedance.com open here
Signed-off-by Qi Zheng <[email protected]>
Suggested-by Peter Zijlstra (Intel) <[email protected]>
Reviewed-by Kevin Brodsky <[email protected]>
Cc Alexandre Ghiti <[email protected]>
Cc Alexandre Ghiti <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc Aneesh Kumar K.V (Arm) <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc David Rientjes <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Jann Horn <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Mike Rapoport (Microsoft) <[email protected]>
Cc Muchun Song <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vishal Moola (Oracle) <[email protected]>
Cc Will Deacon <[email protected]>
Cc Yu Zhao <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/s390/include/asm/pgalloc.h | 29 +++++++++++++++++++++-------- arch/s390/include/asm/tlb.h | 2 ++ 2 files changed, 23 insertions(+), 8 deletions(-)
arch/s390/include/asm/pgalloc.h renamed from arch/s390/include/asm/pgalloc.h~s390-pgtable-add-statistics-for-pud-and-p4d-level-page-table +21 -8
@@ -53,29 +53,42 @@ static inline p4d_t *p4d_alloc_one(struc {unsigned long *table =crst_table_alloc (mm); -if (table) -crst_table_init (table, _REGION2_ENTRY_EMPTY); +if (!table) +return NULL ; +crst_table_init (table, _REGION2_ENTRY_EMPTY); +pagetable_p4d_ctor (virt_to_ptdesc (table)); +return (p4d_t *) table; }static inline void p4d_free (struct mm_struct *mm,p4d_t *p4d) { -if (!mm_p4d_folded (mm)) -crst_table_free (mm, (unsigned long *) p4d); +if (mm_p4d_folded (mm)) +return ; + +pagetable_p4d_dtor (virt_to_ptdesc (p4d)); +crst_table_free (mm, (unsigned long *) p4d); }static inline pud_t *pud_alloc_one (struct mm_struct *mm,unsigned long address) {unsigned long *table =crst_table_alloc (mm); -if (table) -crst_table_init (table, _REGION3_ENTRY_EMPTY); + +if (!table) +return NULL ; +crst_table_init (table, _REGION3_ENTRY_EMPTY); +pagetable_pud_ctor (virt_to_ptdesc (table)); +return (pud_t *) table; }static inline void pud_free (struct mm_struct *mm,pud_t *pud) { -if (!mm_pud_folded (mm)) -crst_table_free (mm, (unsigned long *) pud); +if (mm_pud_folded (mm)) +return ; + +pagetable_pud_dtor (virt_to_ptdesc (pud)); +crst_table_free (mm, (unsigned long *) pud); }static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long vmaddr)
arch/s390/include/asm/tlb.h renamed from arch/s390/include/asm/tlb.h~s390-pgtable-add-statistics-for-pud-and-p4d-level-page-table +2 -0
@@ -122,6 +122,7 @@ static inline void p4d_free_tlb(struct m {if (mm_p4d_folded (tlb->mm))return ; +pagetable_p4d_dtor (virt_to_ptdesc (p4d));__tlb_adjust_range (tlb, address,PAGE_SIZE ); tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ;
@@ -140,6 +141,7 @@ static inline void pud_free_tlb(struct m {if (mm_pud_folded (tlb->mm))return ; +pagetable_pud_dtor (virt_to_ptdesc (pud)); tlb->mm->context.flush_mm =1 ; tlb->freed_tables =1 ; tlb->cleared_p4ds =1 ;
_
Patches currently in -mm which might be from [email protected] are