Commit b5c4f953 authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/percpu/64: Remove fixed_percpu_data 



Now that the stack protector canary value is a normal percpu variable,
fixed_percpu_data is unused and can be removed.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarUros Bizjak <ubizjak@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250123190747.745588-10-brgerst@gmail.com
parent 9d7de2aa

arch/x86/include/asm/processor.h

+0 −8
Original line number Diff line number Diff line
@@ -421,14 +421,6 @@ struct irq_stack { 
} __aligned(IRQ_STACK_SIZE);



#ifdef CONFIG_X86_64

struct fixed_percpu_data {

	char		gs_base[40];

	unsigned long	reserved;

};



DECLARE_PER_CPU_FIRST(struct fixed_percpu_data, fixed_percpu_data) __visible;

DECLARE_INIT_PER_CPU(fixed_percpu_data);



static inline unsigned long cpu_kernelmode_gs_base(int cpu)

{

#ifdef CONFIG_SMP

arch/x86/kernel/cpu/common.c

+0 −4
Original line number Diff line number Diff line
@@ -2023,10 +2023,6 @@ EXPORT_PER_CPU_SYMBOL(pcpu_hot); 
EXPORT_PER_CPU_SYMBOL(const_pcpu_hot);



#ifdef CONFIG_X86_64

DEFINE_PER_CPU_FIRST(struct fixed_percpu_data,

		     fixed_percpu_data) __aligned(PAGE_SIZE) __visible;

EXPORT_PER_CPU_SYMBOL_GPL(fixed_percpu_data);



static void wrmsrl_cstar(unsigned long val)

{

	/*

arch/x86/kernel/vmlinux.lds.S

+0 −1
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ PROVIDE(__ref_stack_chk_guard = __stack_chk_guard); 
 */

#define INIT_PER_CPU(x) init_per_cpu__##x = ABSOLUTE(x)

INIT_PER_CPU(gdt_page);

INIT_PER_CPU(fixed_percpu_data);

INIT_PER_CPU(irq_stack_backing_store);



#ifdef CONFIG_MITIGATION_UNRET_ENTRY

arch/x86/tools/relocs.c

+0 −1
Original line number Diff line number Diff line
@@ -830,7 +830,6 @@ static void percpu_init(void) 
 *	__per_cpu_load

 *

 * The "gold" linker incorrectly associates:

 *	init_per_cpu__fixed_percpu_data

 *	init_per_cpu__gdt_page

 */

static int is_percpu_sym(ElfW(Sym) *sym, const char *symname)