ftrace_test_recursion_trylock() reads current->trace_recursion before it knows whether it is safe to trace, so reading current must never be a traced call. On powerpc, get_current() is a plain inline function. On csky, mips and sh, current comes from the generic get_current(), which calls current_thread_info(), and current_thread_info() is a plain inline function. An out-of-line copy of any of these is untraced only because inline implies notrace.
Mark them notrace explicitly. On the other architectures that support the function tracer, get_current() is already __always_inline. No functional change. Assisted-by: Claude:claude-opus-5 Signed-off-by: Song Liu <[email protected]> --- arch/csky/include/asm/thread_info.h | 2 +- arch/mips/include/asm/thread_info.h | 2 +- arch/powerpc/include/asm/current.h | 2 +- arch/sh/include/asm/thread_info.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/csky/include/asm/thread_info.h b/arch/csky/include/asm/thread_info.h index fdd4f8ad45ac..d39498883c9a 100644 --- a/arch/csky/include/asm/thread_info.h +++ b/arch/csky/include/asm/thread_info.h @@ -42,7 +42,7 @@ struct thread_info { #define thread_saved_lr(tsk) \ ((unsigned long)(((struct switch_stack *)(tsk->thread.sp))->r15)) -static inline struct thread_info *current_thread_info(void) +static inline notrace struct thread_info *current_thread_info(void) { unsigned long sp; diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h index 2707dad260dd..4d531efd89ec 100644 --- a/arch/mips/include/asm/thread_info.h +++ b/arch/mips/include/asm/thread_info.h @@ -64,7 +64,7 @@ extern struct thread_info *__current_thread_info; register struct thread_info *__current_thread_info __asm__("$28"); #endif -static inline struct thread_info *current_thread_info(void) +static inline notrace struct thread_info *current_thread_info(void) { return __current_thread_info; } diff --git a/arch/powerpc/include/asm/current.h b/arch/powerpc/include/asm/current.h index bbfb94800415..9663d3737d5c 100644 --- a/arch/powerpc/include/asm/current.h +++ b/arch/powerpc/include/asm/current.h @@ -12,7 +12,7 @@ struct task_struct; #include <linux/stddef.h> #include <asm/paca.h> -static inline struct task_struct *get_current(void) +static inline notrace struct task_struct *get_current(void) { struct task_struct *task; diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h index 471db5173036..9e1ccdd70a7d 100644 --- a/arch/sh/include/asm/thread_info.h +++ b/arch/sh/include/asm/thread_info.h @@ -63,7 +63,7 @@ struct thread_info { register unsigned long current_stack_pointer asm("r15") __used; /* how to get the thread information struct from C */ -static inline struct thread_info *current_thread_info(void) +static inline notrace struct thread_info *current_thread_info(void) { struct thread_info *ti; #if defined(CONFIG_CPU_HAS_SR_RB) -- 2.53.0-Meta
