Commit 93d0d6f8 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64/boot: Move init_pgdir[] and init_idmap_pgdir[] into __pi_ namespace 



init_pgdir[] is only referenced from the startup code, but lives after
BSS in the linker map. Before tightening the rules about accessing BSS
from startup code, move init_pgdir[] into the __pi_ namespace, so it
does not need to be exported explicitly.

For symmetry, do the same with init_idmap_pgdir[], although it lives
before BSS.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Tested-by: default avatarYeoreum Yun <yeoreum.yun@arm.com>
Reviewed-by: default avatarYeoreum Yun <yeoreum.yun@arm.com>
Link: https://lore.kernel.org/r/20250508114328.2460610-6-ardb+git@google.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 13c63ce3

arch/arm64/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -851,8 +851,6 @@ static inline bool pud_table(pud_t pud) { return true; } 
				 PUD_TYPE_TABLE)

#endif



extern pgd_t init_pg_dir[];

extern pgd_t init_pg_end[];

extern pgd_t swapper_pg_dir[];

extern pgd_t idmap_pg_dir[];

extern pgd_t tramp_pg_dir[];

arch/arm64/kernel/head.S

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ SYM_CODE_START(primary_entry) 
	adrp	x1, early_init_stack

	mov	sp, x1

	mov	x29, xzr

	adrp	x0, init_idmap_pg_dir

	adrp	x0, __pi_init_idmap_pg_dir

	mov	x1, xzr

	bl	__pi_create_init_idmap
@@ -101,7 +101,7 @@ SYM_CODE_START(primary_entry) 
	cbnz	x19, 0f

	dmb     sy

	mov	x1, x0				// end of used region

	adrp    x0, init_idmap_pg_dir

	adrp    x0, __pi_init_idmap_pg_dir

	adr_l	x2, dcache_inval_poc

	blr	x2

	b	1f
@@ -507,7 +507,7 @@ SYM_FUNC_END(__no_granule_support) 


SYM_FUNC_START_LOCAL(__primary_switch)

	adrp	x1, reserved_pg_dir

	adrp	x2, init_idmap_pg_dir

	adrp	x2, __pi_init_idmap_pg_dir

	bl	__enable_mmu



	adrp	x1, early_init_stack

arch/arm64/kernel/image-vars.h

+0 −4
Original line number Diff line number Diff line
@@ -53,10 +53,6 @@ PROVIDE(__pi_is_midr_in_range_list = is_midr_in_range_list); 
#endif

PROVIDE(__pi__ctype			= _ctype);



PROVIDE(__pi_init_idmap_pg_dir		= init_idmap_pg_dir);

PROVIDE(__pi_init_idmap_pg_end		= init_idmap_pg_end);

PROVIDE(__pi_init_pg_dir		= init_pg_dir);

PROVIDE(__pi_init_pg_end		= init_pg_end);

PROVIDE(__pi_swapper_pg_dir		= swapper_pg_dir);



PROVIDE(__pi__text			= _text);

arch/arm64/kernel/pi/pi.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ static inline void *prel64_to_pointer(const prel64_t *offset) 
extern bool dynamic_scs_is_enabled;



extern pgd_t init_idmap_pg_dir[], init_idmap_pg_end[];

extern pgd_t init_pg_dir[], init_pg_end[];



void init_feature_override(u64 boot_status, const void *fdt, int chosen);

u64 kaslr_early_init(void *fdt, int chosen);

arch/arm64/kernel/vmlinux.lds.S

+4 −4
Original line number Diff line number Diff line
@@ -249,9 +249,9 @@ SECTIONS 
	__inittext_end = .;

	__initdata_begin = .;



	init_idmap_pg_dir = .;

	__pi_init_idmap_pg_dir = .;

	. += INIT_IDMAP_DIR_SIZE;

	init_idmap_pg_end = .;

	__pi_init_idmap_pg_end = .;



	.init.data : {

		INIT_DATA
@@ -321,9 +321,9 @@ SECTIONS 
	BSS_SECTION(SBSS_ALIGN, 0, 0)



	. = ALIGN(PAGE_SIZE);

	init_pg_dir = .;

	__pi_init_pg_dir = .;

	. += INIT_DIR_SIZE;

	init_pg_end = .;

	__pi_init_pg_end = .;

	/* end of zero-init region */



	. += SZ_4K;		/* stack for the early C runtime */