Commit 419cbaf6 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/boot: Add a bunch of PIC aliases 



Add aliases for all the data objects that the startup code references -
this is needed so that this code can be moved into its own confined area
where it can only access symbols that have a __pi_ prefix.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Dionna Amalie Glaze <dionnaglaze@google.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Kevin Loughlin <kevinloughlin@google.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: linux-efi@vger.kernel.org
Link: https://lore.kernel.org/r/20250504095230.2932860-39-ardb+git@google.com
parent f932adcc

arch/x86/coco/core.c

+2 −0
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
#include <asm/processor.h>



enum cc_vendor cc_vendor __ro_after_init = CC_VENDOR_NONE;

SYM_PIC_ALIAS(cc_vendor);

u64 cc_mask __ro_after_init;

SYM_PIC_ALIAS(cc_mask);



static struct cc_attr_flags {

	__u64 host_sev_snp	: 1,

arch/x86/kernel/cpu/common.c

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { 
#endif

} };

EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);

SYM_PIC_ALIAS(gdt_page);



#ifdef CONFIG_X86_64

static int __init x86_nopcid_setup(char *s)

arch/x86/kernel/head64.c

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
 */

extern pmd_t early_dynamic_pgts[EARLY_DYNAMIC_PAGE_TABLES][PTRS_PER_PMD];

unsigned int __initdata next_early_pgt;

SYM_PIC_ALIAS(next_early_pgt);

pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);



#ifdef CONFIG_X86_5LEVEL
@@ -61,10 +62,13 @@ EXPORT_SYMBOL(ptrs_per_p4d); 
#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT

unsigned long page_offset_base __ro_after_init = __PAGE_OFFSET_BASE_L4;

EXPORT_SYMBOL(page_offset_base);

SYM_PIC_ALIAS(page_offset_base);

unsigned long vmalloc_base __ro_after_init = __VMALLOC_BASE_L4;

EXPORT_SYMBOL(vmalloc_base);

SYM_PIC_ALIAS(vmalloc_base);

unsigned long vmemmap_base __ro_after_init = __VMEMMAP_BASE_L4;

EXPORT_SYMBOL(vmemmap_base);

SYM_PIC_ALIAS(vmemmap_base);

#endif



/* Wipe all early page tables except for the kernel symbol map */

arch/x86/kernel/head_64.S

+8 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ SYM_CODE_START_NOALIGN(vc_no_ghcb) 
	/* Pure iret required here - don't use INTERRUPT_RETURN */

	iretq

SYM_CODE_END(vc_no_ghcb)

SYM_PIC_ALIAS(vc_no_ghcb);

#endif



#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION
@@ -604,10 +605,12 @@ SYM_DATA_START_PTI_ALIGNED(early_top_pgt) 
	.quad	level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE_NOENC

	.fill	PTI_USER_PGD_FILL,8,0

SYM_DATA_END(early_top_pgt)

SYM_PIC_ALIAS(early_top_pgt)



SYM_DATA_START_PAGE_ALIGNED(early_dynamic_pgts)

	.fill	512*EARLY_DYNAMIC_PAGE_TABLES,8,0

SYM_DATA_END(early_dynamic_pgts)

SYM_PIC_ALIAS(early_dynamic_pgts);



SYM_DATA(early_recursion_flag, .long 0)
@@ -651,6 +654,7 @@ SYM_DATA_START_PAGE_ALIGNED(level4_kernel_pgt) 
	.fill	511,8,0

	.quad	level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE_NOENC

SYM_DATA_END(level4_kernel_pgt)

SYM_PIC_ALIAS(level4_kernel_pgt)

#endif



SYM_DATA_START_PAGE_ALIGNED(level3_kernel_pgt)
@@ -659,6 +663,7 @@ SYM_DATA_START_PAGE_ALIGNED(level3_kernel_pgt) 
	.quad	level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC

	.quad	level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE_NOENC

SYM_DATA_END(level3_kernel_pgt)

SYM_PIC_ALIAS(level3_kernel_pgt)



SYM_DATA_START_PAGE_ALIGNED(level2_kernel_pgt)

	/*
@@ -676,6 +681,7 @@ SYM_DATA_START_PAGE_ALIGNED(level2_kernel_pgt) 
	 */

	PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)

SYM_DATA_END(level2_kernel_pgt)

SYM_PIC_ALIAS(level2_kernel_pgt)



SYM_DATA_START_PAGE_ALIGNED(level2_fixmap_pgt)

	.fill	(512 - 4 - FIXMAP_PMD_NUM),8,0
@@ -688,6 +694,7 @@ SYM_DATA_START_PAGE_ALIGNED(level2_fixmap_pgt) 
	/* 6 MB reserved space + a 2MB hole */

	.fill	4,8,0

SYM_DATA_END(level2_fixmap_pgt)

SYM_PIC_ALIAS(level2_fixmap_pgt)



SYM_DATA_START_PAGE_ALIGNED(level1_fixmap_pgt)

	.rept (FIXMAP_PMD_NUM)
@@ -703,6 +710,7 @@ SYM_DATA(smpboot_control, .long 0) 
	.align 16

/* This must match the first entry in level2_kernel_pgt */

SYM_DATA(phys_base, .quad 0x0)

SYM_PIC_ALIAS(phys_base);

EXPORT_SYMBOL(phys_base)



#include "../xen/xen-head.S"

arch/x86/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct ist_info ist_info; 


struct cpuinfo_x86 boot_cpu_data __read_mostly;

EXPORT_SYMBOL(boot_cpu_data);

SYM_PIC_ALIAS(boot_cpu_data);



#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)

__visible unsigned long mmu_cr4_features __ro_after_init;