Skip to content

Commit 7e5f42a

Browse files
VMoolaakpm00
authored andcommitted
mm: convert pmd_ptlock_free() to use ptdescs
This removes some direct accesses to struct page, working towards splitting out struct ptdesc from struct page. Link: https://lkml.kernel.org/r/20230807230513.102486-10-vishal.moola@gmail.com Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> Acked-by: Mike Rapoport (IBM) <rppt@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Claudio Imbrenda <imbrenda@linux.ibm.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Guo Ren <guoren@kernel.org> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Jonas Bonn <jonas@southpole.se> Cc: Matthew Wilcox <willy@infradead.org> Cc: Palmer Dabbelt <palmer@rivosinc.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Richard Weinberger <richard@nod.at> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 75b25d4 commit 7e5f42a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

include/linux/mm.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2967,12 +2967,12 @@ static inline bool pmd_ptlock_init(struct ptdesc *ptdesc)
29672967
return ptlock_init(ptdesc);
29682968
}
29692969

2970-
static inline void pmd_ptlock_free(struct page *page)
2970+
static inline void pmd_ptlock_free(struct ptdesc *ptdesc)
29712971
{
29722972
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
2973-
VM_BUG_ON_PAGE(page->pmd_huge_pte, page);
2973+
VM_BUG_ON_PAGE(ptdesc->pmd_huge_pte, ptdesc_page(ptdesc));
29742974
#endif
2975-
ptlock_free(page);
2975+
ptlock_free(ptdesc_page(ptdesc));
29762976
}
29772977

29782978
#define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte)
@@ -2985,7 +2985,7 @@ static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd)
29852985
}
29862986

29872987
static inline bool pmd_ptlock_init(struct ptdesc *ptdesc) { return true; }
2988-
static inline void pmd_ptlock_free(struct page *page) {}
2988+
static inline void pmd_ptlock_free(struct ptdesc *ptdesc) {}
29892989

29902990
#define pmd_huge_pte(mm, pmd) ((mm)->pmd_huge_pte)
29912991

@@ -3009,7 +3009,7 @@ static inline bool pgtable_pmd_page_ctor(struct page *page)
30093009

30103010
static inline void pgtable_pmd_page_dtor(struct page *page)
30113011
{
3012-
pmd_ptlock_free(page);
3012+
pmd_ptlock_free(page_ptdesc(page));
30133013
__ClearPageTable(page);
30143014
dec_lruvec_page_state(page, NR_PAGETABLE);
30153015
}

0 commit comments

Comments
 (0)