mm-convert-ptlock_init-to-use-ptdescs.patch removed from -mm tree
The quilt patch titled
Subject: mm: convert ptlock_init() to use ptdescs
has been removed from the -mm tree. Its filename was
mm-convert-ptlock_init-to-use-ptdescs.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: convert ptlock_init() to use ptdescs
Date: Mon, 7 Aug 2023 16:04:50 -0700
This removes some direct accesses to struct page, working towards splitting out struct ptdesc from struct page.
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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-convert-ptlock_init-to-use-ptdescs +7 -7
@@ -2858,7 +2858,7 @@ static inline spinlock_t *pte_lockptr(streturn ptlock_ptr (page_ptdesc (pmd_page (*pmd))); } -static inline bool ptlock_init (struct page *page) +static inline bool ptlock_init (struct ptdesc *ptdesc) {/* * prep_new_page() initialize page->private (and therefore page->ptl)
@@ -2867,10 +2867,10 @@ static inline bool ptlock_init(struct pa* It can happen if arch try to use slab for page table allocation: * slab code uses page->slab_cache, which share storage with page->ptl. */ -VM_BUG_ON_PAGE (*(unsigned long *)&page->ptl, page); -if (!ptlock_alloc (page_ptdesc (page))) +VM_BUG_ON_PAGE (*(unsigned long *)&ptdesc->ptl,ptdesc_page (ptdesc)); +if (!ptlock_alloc (ptdesc))return false; -spin_lock_init (ptlock_ptr (page_ptdesc (page))); +spin_lock_init (ptlock_ptr (ptdesc));return true; }
@@ -2883,13 +2883,13 @@ static inline spinlock_t *pte_lockptr(st return &mm->page_table_lock; }static inline void ptlock_cache_init (void ) {} -static inline bool ptlock_init (struct page *page) {return true; } +static inline bool ptlock_init (struct ptdesc *ptdesc) {return true; }static inline void ptlock_free (struct page *page) {}#endif /* USE_SPLIT_PTE_PTLOCKS */ static inline bool pgtable_pte_page_ctor (struct page *page) { -if (!ptlock_init (page)) +if (!ptlock_init (page_ptdesc (page)))return false;__SetPageTable (page);inc_lruvec_page_state (page,NR_PAGETABLE );
@@ -2964,7 +2964,7 @@ static inline bool pmd_ptlock_init(struc#ifdef CONFIG_TRANSPARENT_HUGEPAGE ptdesc->pmd_huge_pte =NULL ;#endif -return ptlock_init (ptdesc_page (ptdesc)); +return ptlock_init (ptdesc); }static inline void pmd_ptlock_free (struct page *page)
_
Patches currently in -mm which might be from [email protected] are