The quilt patch titled
Subject: mm: pgtable: add missing flag and statistics for kernel PTE page
has been removed from the -mm tree. Its filename was
mm-pgtable-add-missing-flag-and-statistics-for-kernel-pte-page.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
Subject: mm: pgtable: add missing flag and statistics for kernel PTE page
Date: Thu, 1 Feb 2024 16:05:40 +0800
For kernel PTE page, we do not need to allocate and initialize its split
ptlock, but as a page table page, it's still necessary to add PG_table
flag and NR_PAGETABLE statistics for it.
Link: https://lkml.kernel.org/r/f023a6687b9f2109401e7522b727aa4708dc05f1.1706774109.git.zhengqi.arch@xxxxxxxxxxxxx
Signed-off-by: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
Reviewed-by: Muchun Song <muchun.song@xxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/pgalloc.h | 7 ++++++-
include/linux/mm.h | 21 ++++++++++++++++-----
2 files changed, 22 insertions(+), 6 deletions(-)
--- a/include/asm-generic/pgalloc.h~mm-pgtable-add-missing-flag-and-statistics-for-kernel-pte-page
+++ a/include/asm-generic/pgalloc.h
@@ -23,6 +23,8 @@ static inline pte_t *__pte_alloc_one_ker
if (!ptdesc)
return NULL;
+
+ __pagetable_pte_ctor(ptdesc);
return ptdesc_address(ptdesc);
}
@@ -46,7 +48,10 @@ static inline pte_t *pte_alloc_one_kerne
*/
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{
- pagetable_free(virt_to_ptdesc(pte));
+ struct ptdesc *ptdesc = virt_to_ptdesc(pte);
+
+ __pagetable_pte_dtor(ptdesc);
+ pagetable_free(ptdesc);
}
/**
--- a/include/linux/mm.h~mm-pgtable-add-missing-flag-and-statistics-for-kernel-pte-page
+++ a/include/linux/mm.h
@@ -2922,26 +2922,37 @@ static inline bool ptlock_init(struct pt
static inline void ptlock_free(struct ptdesc *ptdesc) {}
#endif /* USE_SPLIT_PTE_PTLOCKS */
-static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc)
+static inline void __pagetable_pte_ctor(struct ptdesc *ptdesc)
{
struct folio *folio = ptdesc_folio(ptdesc);
- if (!ptlock_init(ptdesc))
- return false;
__folio_set_pgtable(folio);
lruvec_stat_add_folio(folio, NR_PAGETABLE);
+}
+
+static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc)
+{
+ if (!ptlock_init(ptdesc))
+ return false;
+
+ __pagetable_pte_ctor(ptdesc);
return true;
}
-static inline void pagetable_pte_dtor(struct ptdesc *ptdesc)
+static inline void __pagetable_pte_dtor(struct ptdesc *ptdesc)
{
struct folio *folio = ptdesc_folio(ptdesc);
- ptlock_free(ptdesc);
__folio_clear_pgtable(folio);
lruvec_stat_sub_folio(folio, NR_PAGETABLE);
}
+static inline void pagetable_pte_dtor(struct ptdesc *ptdesc)
+{
+ ptlock_free(ptdesc);
+ __pagetable_pte_dtor(ptdesc);
+}
+
pte_t *__pte_offset_map(pmd_t *pmd, unsigned long addr, pmd_t *pmdvalp);
static inline pte_t *pte_offset_map(pmd_t *pmd, unsigned long addr)
{
_
Patches currently in -mm which might be from zhengqi.arch@xxxxxxxxxxxxx are
mm-pgtable-remove-unnecessary-split-ptlock-for-kernel-pmd-page.patch
