]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ARM: clang: Do not rely on lr register for stacktrace
authorMasami Hiramatsu <mhiramat@kernel.org>
Thu, 21 Oct 2021 00:55:17 +0000 (09:55 +0900)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Fri, 22 Oct 2021 16:16:53 +0000 (12:16 -0400)
Currently the stacktrace on clang compiled arm kernel uses the 'lr'
register to find the first frame address from pt_regs. However, that
is wrong after calling another function, because the 'lr' register
is used by 'bl' instruction and never be recovered.

As same as gcc arm kernel, directly use the frame pointer (r11) of
the pt_regs to find the first frame address.

Note that this fixes kretprobe stacktrace issue only with
CONFIG_UNWINDER_FRAME_POINTER=y. For the CONFIG_UNWINDER_ARM,
we need another fix.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
arch/arm/kernel/stacktrace.c

index 76ea4178a55cb37384c43999c59a938cdbe81bf1..db798eac743159ce288640970cdc09616868a82a 100644 (file)
@@ -54,8 +54,7 @@ int notrace unwind_frame(struct stackframe *frame)
 
        frame->sp = frame->fp;
        frame->fp = *(unsigned long *)(fp);
-       frame->pc = frame->lr;
-       frame->lr = *(unsigned long *)(fp + 4);
+       frame->pc = *(unsigned long *)(fp + 4);
 #else
        /* check current frame pointer is within bounds */
        if (fp < low + 12 || fp > high - 4)