Commit 8472cc45 authored by Kevin Brodsky's avatar Kevin Brodsky Committed by Andrew Morton
Browse files

riscv: mm: call PUD/P4D ctor in special kernel pgtable alloc 

Constructors for PUD/P4D-level pgtables were recently introduced.  They
should be called for all pgtables; make sure they are called for special
kernel mappings created by create_pgd_mapping() too.

While at it also switch to using pagetable_alloc() like in
alloc_{pte,pmd}_late().

Link: https://lkml.kernel.org/r/20250408095222.860601-13-kevin.brodsky@arm.com


Signed-off-by: default avatarKevin 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent cb5d2be8

arch/riscv/mm/init.c

+8 −8
Original line number Diff line number Diff line
@@ -590,11 +590,11 @@ static phys_addr_t __init alloc_pud_fixmap(uintptr_t va) 


static phys_addr_t __meminit alloc_pud_late(uintptr_t va)

{

	unsigned long vaddr;

	struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0);



	vaddr = __get_free_page(GFP_KERNEL);

	BUG_ON(!vaddr);

	return __pa(vaddr);

	BUG_ON(!ptdesc);

	pagetable_pud_ctor(ptdesc);

	return __pa((pud_t *)ptdesc_address(ptdesc));

}



static p4d_t *__init get_p4d_virt_early(phys_addr_t pa)
@@ -628,11 +628,11 @@ static phys_addr_t __init alloc_p4d_fixmap(uintptr_t va) 


static phys_addr_t __meminit alloc_p4d_late(uintptr_t va)

{

	unsigned long vaddr;

	struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0);



	vaddr = __get_free_page(GFP_KERNEL);

	BUG_ON(!vaddr);

	return __pa(vaddr);

	BUG_ON(!ptdesc);

	pagetable_p4d_ctor(ptdesc);

	return __pa((p4d_t *)ptdesc_address(ptdesc));

}



static void __meminit create_pud_mapping(pud_t *pudp, uintptr_t va, phys_addr_t pa, phys_addr_t sz,