Skip to content

Commit 10a2e44

Browse files
kevin-brodsky-armakpm00
authored andcommitted
sparc64: mm: call ctor/dtor for kernel PTEs
The generic implementation of pte_{alloc_one,free}_kernel now calls the [cd]tor, without initialising the ptlock needlessly as pagetable_pte_ctor() skips it for init_mm. Align sparc64 with the generic implementation by ensuring pagetable_pte_[cd]tor() are called for kernel PTEs. As a result the kernel and user alloc/free functions have the same implementation, and since pgtable_t is defined as pte_t *, we can have both call a common helper. Link: https://lkml.kernel.org/r/20250408095222.860601-7-kevin.brodsky@arm.com Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Andreas Larsson <andreas@gaisler.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: David S. Miller <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Linus Waleij <linus.walleij@linaro.org> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Mike Rapoport <rppt@kernel.org> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Qi Zheng <zhengqi.arch@bytedance.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: Will Deacon <will@kernel.org> Cc: <x86@kernel.org> Cc: Yang Shi <yang@os.amperecomputing.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 8e8299b commit 10a2e44

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

arch/sparc/mm/init_64.c

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2878,18 +2878,7 @@ void __flush_tlb_all(void)
28782878
: : "r" (pstate));
28792879
}
28802880

2881-
pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
2882-
{
2883-
struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
2884-
pte_t *pte = NULL;
2885-
2886-
if (page)
2887-
pte = (pte_t *) page_address(page);
2888-
2889-
return pte;
2890-
}
2891-
2892-
pgtable_t pte_alloc_one(struct mm_struct *mm)
2881+
static pte_t *__pte_alloc_one(struct mm_struct *mm)
28932882
{
28942883
struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL | __GFP_ZERO, 0);
28952884

@@ -2902,9 +2891,14 @@ pgtable_t pte_alloc_one(struct mm_struct *mm)
29022891
return ptdesc_address(ptdesc);
29032892
}
29042893

2905-
void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
2894+
pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
29062895
{
2907-
free_page((unsigned long)pte);
2896+
return __pte_alloc_one(mm);
2897+
}
2898+
2899+
pgtable_t pte_alloc_one(struct mm_struct *mm)
2900+
{
2901+
return __pte_alloc_one(mm);
29082902
}
29092903

29102904
static void __pte_free(pgtable_t pte)
@@ -2915,6 +2909,11 @@ static void __pte_free(pgtable_t pte)
29152909
pagetable_free(ptdesc);
29162910
}
29172911

2912+
void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
2913+
{
2914+
__pte_free(pte);
2915+
}
2916+
29182917
void pte_free(struct mm_struct *mm, pgtable_t pte)
29192918
{
29202919
__pte_free(pte);

0 commit comments

Comments
 (0)