Commit 3e72b9e9 authored by Breno Leitao's avatar Breno Leitao Committed by Will Deacon
Browse files

arm64: remove CONFIG_VMAP_STACK checks from SDEI stack handling 



With VMAP_STACK now always enabled on arm64, remove all
CONFIG_VMAP_STACK conditionals from SDEI stack allocation and
initialization in arch/arm64/kernel/sdei.c.

This change unconditionally defines the SDEI stack pointers and replaces
runtime checks with BUILD_BUG_ON() assertions, ensuring that the code is
only built when VMAP_STACK is enabled. This simplifies the logic and
reflects the mandatory use of VMAP_STACK for all arm64 kernel builds.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20250707-arm64_vmap-v1-7-8de98ca0f91c@debian.org


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

arch/arm64/kernel/sdei.c

+2 −6
Original line number Diff line number Diff line
@@ -34,10 +34,8 @@ unsigned long sdei_exit_mode; 
DECLARE_PER_CPU(unsigned long *, sdei_stack_normal_ptr);

DECLARE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);



#ifdef CONFIG_VMAP_STACK

DEFINE_PER_CPU(unsigned long *, sdei_stack_normal_ptr);

DEFINE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);

#endif



DECLARE_PER_CPU(unsigned long *, sdei_shadow_call_stack_normal_ptr);

DECLARE_PER_CPU(unsigned long *, sdei_shadow_call_stack_critical_ptr);
@@ -65,8 +63,7 @@ static void free_sdei_stacks(void) 
{

	int cpu;



	if (!IS_ENABLED(CONFIG_VMAP_STACK))

		return;

	BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));



	for_each_possible_cpu(cpu) {

		_free_sdei_stack(&sdei_stack_normal_ptr, cpu);
@@ -91,8 +88,7 @@ static int init_sdei_stacks(void) 
	int cpu;

	int err = 0;



	if (!IS_ENABLED(CONFIG_VMAP_STACK))

		return 0;

	BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));



	for_each_possible_cpu(cpu) {

		err = _init_sdei_stack(&sdei_stack_normal_ptr, cpu);