mm-convert-ptlock_ptr-to-use-ptdescs.patch removed from -mm tree
The quilt patch titled
Subject: mm: convert ptlock_ptr() to use ptdescs
has been removed from the -mm tree. Its filename was
mm-convert-ptlock_ptr-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_ptr() to use ptdescs
Date: Mon, 7 Aug 2023 16:04:48 -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]>
---
arch/x86/xen/mmu_pv.c | 2 +- include/linux/mm.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/xen/mmu_pv.c renamed from arch/x86/xen/mmu_pv.c~mm-convert-ptlock_ptr-to-use-ptdescs +1 -1
@@ -667,7 +667,7 @@ static spinlock_t *xen_pte_lock(struct pspinlock_t *ptl =NULL ;#if USE_SPLIT_PTE_PTLOCKS - ptl =ptlock_ptr (page); + ptl =ptlock_ptr (page_ptdesc (page));spin_lock_nest_lock (ptl, &mm->page_table_lock);#endif
include/linux/mm.h renamed from include/linux/mm.h~mm-convert-ptlock_ptr-to-use-ptdescs +7 -7
@@ -2829,9 +2829,9 @@ void __init ptlock_cache_init(void);bool ptlock_alloc (struct ptdesc *ptdesc);extern void ptlock_free (struct page *page); -static inline spinlock_t *ptlock_ptr (struct page *page) +static inline spinlock_t *ptlock_ptr (struct ptdesc *ptdesc) { -return page->ptl; +return ptdesc->ptl; }#else /* ALLOC_SPLIT_PTLOCKS */ static inline void ptlock_cache_init (void )
@@ -2847,15 +2847,15 @@ static inline void ptlock_free(struct pa { } -static inline spinlock_t *ptlock_ptr (struct page *page) +static inline spinlock_t *ptlock_ptr (struct ptdesc *ptdesc) { -return &page->ptl; +return &ptdesc->ptl; }#endif /* ALLOC_SPLIT_PTLOCKS */ static inline spinlock_t *pte_lockptr (struct mm_struct *mm,pmd_t *pmd) { -return ptlock_ptr (pmd_page (*pmd)); +return ptlock_ptr (page_ptdesc (pmd_page (*pmd))); }static inline bool ptlock_init (struct page *page)
@@ -2870,7 +2870,7 @@ static inline bool ptlock_init(struct paVM_BUG_ON_PAGE (*(unsigned long *)&page->ptl, page);if (!ptlock_alloc (page_ptdesc (page)))return false; -spin_lock_init (ptlock_ptr (page)); +spin_lock_init (ptlock_ptr (page_ptdesc (page)));return true; }
@@ -2956,7 +2956,7 @@ static inline struct ptdesc *pmd_ptdesc(static inline spinlock_t *pmd_lockptr (struct mm_struct *mm,pmd_t *pmd) { -return ptlock_ptr (ptdesc_page (pmd_ptdesc (pmd))); +return ptlock_ptr (pmd_ptdesc (pmd)); }static inline bool pmd_ptlock_init (struct page *page)
_
Patches currently in -mm which might be from [email protected] are