mm-create-ptdesc-equivalents-for-pgtable_ptepmd_page_ctordtor.patch removed from -mm tree
The quilt patch titled
Subject: mm: create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor}has been removed from the -mm tree. Its filename was
mm-create-ptdesc-equivalents-for-pgtable_ptepmd_page_ctordtor.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: "Vishal Moola (Oracle)" <[email protected]>
Subject: mm: create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor}
Date: Mon, 7 Aug 2023 16:04:53 -0700
Create pagetable_pte_ctor(), pagetable_pmd_ctor(), pagetable_pte_dtor(), and pagetable_pmd_dtor() and make the original pgtable constructor/destructors wrappers.
Signed-off-by Vishal Moola (Oracle) <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Claudio Imbrenda <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Guo Ren <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Jonas Bonn <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Yoshinori Sato <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/mm.h | 56 ++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 14 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-create-ptdesc-equivalents-for-pgtable_ptepmd_page_ctordtor +42 -14
@@ -2887,20 +2887,34 @@ static inline bool ptlock_init(struct ptstatic 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);
@@ -2998,20 +3012,34 @@ static inline spinlock_t *pmd_lock(strucreturn 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)); }/*
_
Patches currently in -mm which might be from [email protected] are