Commit 5fa31af3 authored by Breno Leitao's avatar Breno Leitao Committed by Ingo Molnar
Browse files

x86/bugs: Rename CONFIG_CALL_DEPTH_TRACKING => CONFIG_MITIGATION_CALL_DEPTH_TRACKING 



Step 3/10 of the namespace unification of CPU mitigations related Kconfig options.

Suggested-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20231121160740.1249350-4-leitao@debian.org
parent e0b8fcfa

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -2523,7 +2523,7 @@ config CPU_UNRET_ENTRY 
	help

	  Compile the kernel with support for the retbleed=unret mitigation.



config CALL_DEPTH_TRACKING

config MITIGATION_CALL_DEPTH_TRACKING

	bool "Mitigate RSB underflow with call depth tracking"

	depends on CPU_SUP_INTEL && HAVE_CALL_THUNKS

	select HAVE_DYNAMIC_FTRACE_NO_PATCHABLE
@@ -2543,7 +2543,7 @@ config CALL_DEPTH_TRACKING 


config CALL_THUNKS_DEBUG

	bool "Enable call thunks and call depth tracking debugging"

	depends on CALL_DEPTH_TRACKING

	depends on MITIGATION_CALL_DEPTH_TRACKING

	select FUNCTION_ALIGNMENT_32B

	default n

	help

arch/x86/include/asm/current.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct pcpu_hot { 
			struct task_struct	*current_task;

			int			preempt_count;

			int			cpu_number;

#ifdef CONFIG_CALL_DEPTH_TRACKING

#ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING

			u64			call_depth;

#endif

			unsigned long		top_of_stack;

arch/x86/include/asm/disabled-features.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
# define DISABLE_UNRET		(1 << (X86_FEATURE_UNRET & 31))

#endif



#ifdef CONFIG_CALL_DEPTH_TRACKING

#ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING

# define DISABLE_CALL_DEPTH_TRACKING	0

#else

# define DISABLE_CALL_DEPTH_TRACKING	(1 << (X86_FEATURE_CALL_DEPTH & 31))

arch/x86/include/asm/nospec-branch.h

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
# define CALL_THUNKS_DEBUG_INC_CTXSW

#endif



#if defined(CONFIG_CALL_DEPTH_TRACKING) && !defined(COMPILE_OFFSETS)

#if defined(CONFIG_MITIGATION_CALL_DEPTH_TRACKING) && !defined(COMPILE_OFFSETS)



#include <asm/asm-offsets.h>
@@ -309,7 +309,7 @@ 




.macro CALL_DEPTH_ACCOUNT

#ifdef CONFIG_CALL_DEPTH_TRACKING

#ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING

	ALTERNATIVE "",							\

		    __stringify(ASM_INCREMENT_CALL_DEPTH), X86_FEATURE_CALL_DEPTH

#endif
@@ -357,7 +357,7 @@ extern void entry_ibpb(void); 


extern void (*x86_return_thunk)(void);



#ifdef CONFIG_CALL_DEPTH_TRACKING

#ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING

extern void call_depth_return_thunk(void);



#define CALL_DEPTH_ACCOUNT					\
@@ -371,12 +371,12 @@ DECLARE_PER_CPU(u64, __x86_ret_count); 
DECLARE_PER_CPU(u64, __x86_stuffs_count);

DECLARE_PER_CPU(u64, __x86_ctxsw_count);

#endif

#else /* !CONFIG_CALL_DEPTH_TRACKING */

#else /* !CONFIG_MITIGATION_CALL_DEPTH_TRACKING */



static inline void call_depth_return_thunk(void) {}

#define CALL_DEPTH_ACCOUNT ""



#endif /* CONFIG_CALL_DEPTH_TRACKING */

#endif /* CONFIG_MITIGATION_CALL_DEPTH_TRACKING */



#ifdef CONFIG_RETPOLINE

arch/x86/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void __used common(void) 
	OFFSET(TSS_sp2, tss_struct, x86_tss.sp2);

	OFFSET(X86_top_of_stack, pcpu_hot, top_of_stack);

	OFFSET(X86_current_task, pcpu_hot, current_task);

#ifdef CONFIG_CALL_DEPTH_TRACKING

#ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING

	OFFSET(X86_call_depth, pcpu_hot, call_depth);

#endif

#if IS_ENABLED(CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64)