ARM: unwind: set frame.pc correctly for current-thread unwinding
PATCH v2 1/1 ARM: unwind: set frame.pc correctly for current-thread unwinding
When e.g. a WARN_ON() is encountered, we attempt to unwind the current thread. To do this, we set frame.pc to unwind_backtrace, which means it points at the beginning of the function. However, the rest of the state is initialised from within the function, which means the function prologue has already been run.
This can be confusing, and with a recent patch from Ard, can result in the unwinder misbehaving if we want to be strict about the PC value.
If we correctly initialise the state so it is self-consistent (in other words, set frame.pc to the location we are initialising it) then we eliminate this confusion, and avoid possible future issues.
--- arch/arm/kernel/return_address.c | 3 ++- arch/arm/kernel/stacktrace.c | 3 ++- arch/arm/kernel/unwind.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-)
arch/arm/kernel/return_address.c +2 -1
@@ -41,7 +41,8 @@ void *return_address(unsigned int level) frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_stack_pointer; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )return_address; +here: + frame.pc = (unsigned long )&&here;#ifdef CONFIG_KRETPROBES frame.kr_cur =NULL ; frame.tsk = current;
arch/arm/kernel/stacktrace.c +2 -1
@@ -160,7 +160,8 @@ static noinline void __save_stack_trace(struct task_struct *tsk, frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_stack_pointer; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )__save_stack_trace; +here: + frame.pc = (unsigned long )&&here; }#ifdef CONFIG_KRETPROBES frame.kr_cur =NULL ;
arch/arm/kernel/unwind.c +6 -1
@@ -487,7 +487,12 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk, frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_stack_pointer; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )unwind_backtrace; +/* We are saving the stack and execution state at this +* point, so we should ensure that frame.pc is within +* this block of code. +*/ +here: + frame.pc = (unsigned long )&&here; }else {/* task blocked in __switch_to */ frame.fp =thread_saved_fp (tsk);
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 7 lines · Russell King (Oracle)
When e.g. a
WARN_ON()is encountered, we attempt to unwind the current thread. To do this, we set frame.pc tounwind_backtrace, which means it points at the beginning of the function. However, the rest of the state is initialised from within the function, which means the function prologue has already been run.
Quoted 8 lines
This can be confusing, and with a recent patch from Ard, can result in the unwinder misbehaving if we want to be strict about the PC value.
If we correctly initialise the state so it is self-consistent (in other words, set frame.pc to the location we are initialising it) then we eliminate this confusion, and avoid possible future issues.
Signed-off-by Russell King (Oracle) <[email protected]>
Quoted 53 lines
--- arch/arm/kernel/return_address.c | 3 ++- arch/arm/kernel/stacktrace.c | 3 ++- arch/arm/kernel/unwind.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-)arch/arm/kernel/return_address.c +2
-1@@ -41,7 +41,8 @@ void *return_address(unsigned int level) frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_stack_pointer; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )return_address; +here: + frame.pc = (unsigned long )&&here;#ifdef CONFIG_KRETPROBES frame.kr_cur =NULL ; frame.tsk = current;arch/arm/kernel/stacktrace.c +2
-1@@ -160,7 +160,8 @@ static noinline void __save_stack_trace(struct task_struct *tsk, frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_stack_pointer; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )__save_stack_trace; +here: + frame.pc = (unsigned long )&&here; }#ifdef CONFIG_KRETPROBES frame.kr_cur =NULL ;arch/arm/kernel/unwind.c +6
-2@@ -487,7 +487,12 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk, frame.fp = (unsigned long )__builtin_frame_address (0 ); frame.sp = current_stack_pointer; frame.lr = (unsigned long )__builtin_return_address (0 ); - frame.pc = (unsigned long )unwind_backtrace; +/* We are saving the stack and execution state at this +* point, so we should ensure that frame.pc is within +* this block of code. +*/ +here: + frame.pc = (unsigned long )&&here; }else {/* task blocked in __switch_to */ frame.fp =thread_saved_fp (tsk); --
Quoted 2 lines
2.30.2
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel