[PATCH mm-unstable v9 11/31] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor}

["Vishal Moola (Oracle)" <vishal.moola@xxxxxxxxx>]

Create pagetable_pte_ctor(), pagetable_pmd_ctor(), pagetable_pte_dtor(),
and pagetable_pmd_dtor() and make the original pgtable
constructor/destructors wrappers.

Acked-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx>
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@xxxxxxxxx>
---
 include/linux/mm.h | 56 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 94984d49ab01..6310e0c59efe 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2921,20 +2921,34 @@ static inline bool ptlock_init(struct ptdesc *ptdesc) { 
return true; }
 static inline void ptlock_free(struct ptdesc *ptdesc) {}
 #endif /* USE_SPLIT_PTE_PTLOCKS */
 
-static inline bool pgtable_pte_page_ctor(struct page *page)
+static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc)
 {
-       if (!ptlock_init(page_ptdesc(page)))
+       struct folio *folio = ptdesc_folio(ptdesc);
+
+       if (!ptlock_init(ptdesc))
                return false;
-       __SetPageTable(page);
-       inc_lruvec_page_state(page, NR_PAGETABLE);
+       __folio_set_pgtable(folio);
+       lruvec_stat_add_folio(folio, NR_PAGETABLE);
        return true;
 }
 
+static inline bool pgtable_pte_page_ctor(struct page *page)
+{
+       return pagetable_pte_ctor(page_ptdesc(page));
+}
+
+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 pgtable_pte_page_dtor(struct page *page)
 {
-       ptlock_free(page_ptdesc(page));
-       __ClearPageTable(page);
-       dec_lruvec_page_state(page, NR_PAGETABLE);
+       pagetable_pte_dtor(page_ptdesc(page));
 }
 
 pte_t *__pte_offset_map(pmd_t *pmd, unsigned long addr, pmd_t *pmdvalp);
@@ -3032,20 +3046,34 @@ static inline spinlock_t *pmd_lock(struct mm_struct 
*mm, pmd_t *pmd)
        return ptl;
 }
 
-static inline bool pgtable_pmd_page_ctor(struct page *page)
+static inline bool pagetable_pmd_ctor(struct ptdesc *ptdesc)
 {
-       if (!pmd_ptlock_init(page_ptdesc(page)))
+       struct folio *folio = ptdesc_folio(ptdesc);
+
+       if (!pmd_ptlock_init(ptdesc))
                return false;
-       __SetPageTable(page);
-       inc_lruvec_page_state(page, NR_PAGETABLE);
+       __folio_set_pgtable(folio);
+       lruvec_stat_add_folio(folio, NR_PAGETABLE);
        return true;
 }
 
+static inline bool pgtable_pmd_page_ctor(struct page *page)
+{
+       return pagetable_pmd_ctor(page_ptdesc(page));
+}
+
+static inline void pagetable_pmd_dtor(struct ptdesc *ptdesc)
+{
+       struct folio *folio = ptdesc_folio(ptdesc);
+
+       pmd_ptlock_free(ptdesc);
+       __folio_clear_pgtable(folio);
+       lruvec_stat_sub_folio(folio, NR_PAGETABLE);
+}
+
 static inline void pgtable_pmd_page_dtor(struct page *page)
 {
-       pmd_ptlock_free(page_ptdesc(page));
-       __ClearPageTable(page);
-       dec_lruvec_page_state(page, NR_PAGETABLE);
+       pagetable_pmd_dtor(page_ptdesc(page));
 }
 
 /*
-- 
2.40.1