| Message ID | 164304061932.1680787.11603911228891618150.stgit@devnote2 (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | fprobe: Introduce fprobe function entry/exit probe | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hi Masami,
I love your patch! Yet something to improve:
[auto build test ERROR on rostedt-trace/for-next]
[also build test ERROR on arm64/for-next/core tip/x86/core linus/master v5.17-rc1 next-20220124]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Masami-Hiramatsu/fprobe-Introduce-fprobe-function-entry-exit-probe/20220125-001253
base: https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next
config: arm-aspeed_g5_defconfig (https://download.01.org/0day-ci/archive/20220125/202201250328.drn6ia3n-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/df6df88bb474db78d80fc5619d39b25ec15d5d16
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Masami-Hiramatsu/fprobe-Introduce-fprobe-function-entry-exit-probe/20220125-001253
git checkout df6df88bb474db78d80fc5619d39b25ec15d5d16
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash arch/arm/kernel/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
arch/arm/kernel/stacktrace.c: In function 'unwind_frame':
>> arch/arm/kernel/stacktrace.c:71:56: error: 'struct stackframe' has no member named 'tsk'
71 | frame->pc = rethook_find_ret_addr(frame->tsk, frame->fp,
| ^~
>> arch/arm/kernel/stacktrace.c:72:57: error: 'struct stackframe' has no member named 'kr_cur'
72 | &frame->kr_cur);
| ^~
vim +71 arch/arm/kernel/stacktrace.c
12
13 #if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND)
14 /*
15 * Unwind the current stack frame and store the new register values in the
16 * structure passed as argument. Unwinding is equivalent to a function return,
17 * hence the new PC value rather than LR should be used for backtrace.
18 *
19 * With framepointer enabled, a simple function prologue looks like this:
20 * mov ip, sp
21 * stmdb sp!, {fp, ip, lr, pc}
22 * sub fp, ip, #4
23 *
24 * A simple function epilogue looks like this:
25 * ldm sp, {fp, sp, pc}
26 *
27 * When compiled with clang, pc and sp are not pushed. A simple function
28 * prologue looks like this when built with clang:
29 *
30 * stmdb {..., fp, lr}
31 * add fp, sp, #x
32 * sub sp, sp, #y
33 *
34 * A simple function epilogue looks like this when built with clang:
35 *
36 * sub sp, fp, #x
37 * ldm {..., fp, pc}
38 *
39 *
40 * Note that with framepointer enabled, even the leaf functions have the same
41 * prologue and epilogue, therefore we can ignore the LR value in this case.
42 */
43 int notrace unwind_frame(struct stackframe *frame)
44 {
45 unsigned long high, low;
46 unsigned long fp = frame->fp;
47
48 /* only go to a higher address on the stack */
49 low = frame->sp;
50 high = ALIGN(low, THREAD_SIZE);
51
52 #ifdef CONFIG_CC_IS_CLANG
53 /* check current frame pointer is within bounds */
54 if (fp < low + 4 || fp > high - 4)
55 return -EINVAL;
56
57 frame->sp = frame->fp;
58 frame->fp = *(unsigned long *)(fp);
59 frame->pc = *(unsigned long *)(fp + 4);
60 #else
61 /* check current frame pointer is within bounds */
62 if (fp < low + 12 || fp > high - 4)
63 return -EINVAL;
64
65 /* restore the registers from the stack frame */
66 frame->fp = *(unsigned long *)(fp - 12);
67 frame->sp = *(unsigned long *)(fp - 8);
68 frame->pc = *(unsigned long *)(fp - 4);
69 #endif
70 if (IS_ENABLED(CONFIG_RETHOOK) && is_rethook_trampoline(frame->pc))
> 71 frame->pc = rethook_find_ret_addr(frame->tsk, frame->fp,
> 72 &frame->kr_cur);
73 #ifdef CONFIG_KRETPROBES
74 if (is_kretprobe_trampoline(frame->pc))
75 frame->pc = kretprobe_find_ret_addr(frame->tsk,
76 (void *)frame->fp, &frame->kr_cur);
77 #endif
78
79 return 0;
80 }
81 #endif
82
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c2724d986fa0..2fe24bbca618 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -106,6 +106,7 @@ config ARM select HAVE_MOD_ARCH_SPECIFIC select HAVE_NMI select HAVE_OPTPROBES if !THUMB2_KERNEL + select HAVE_RETHOOK select HAVE_PERF_EVENTS select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index 75e905508f27..3c2a9d7024bc 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only #include <linux/export.h> #include <linux/kprobes.h> +#include <linux/rethook.h> #include <linux/sched.h> #include <linux/sched/debug.h> #include <linux/stacktrace.h> @@ -66,6 +67,9 @@ int notrace unwind_frame(struct stackframe *frame) frame->sp = *(unsigned long *)(fp - 8); frame->pc = *(unsigned long *)(fp - 4); #endif + if (IS_ENABLED(CONFIG_RETHOOK) && is_rethook_trampoline(frame->pc)) + frame->pc = rethook_find_ret_addr(frame->tsk, frame->fp, + &frame->kr_cur); #ifdef CONFIG_KRETPROBES if (is_kretprobe_trampoline(frame->pc)) frame->pc = kretprobe_find_ret_addr(frame->tsk, diff --git a/arch/arm/probes/Makefile b/arch/arm/probes/Makefile index 8b0ea5ace100..10c083a22223 100644 --- a/arch/arm/probes/Makefile +++ b/arch/arm/probes/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_KPROBES) += decode-thumb.o else obj-$(CONFIG_KPROBES) += decode-arm.o endif +obj-$(CONFIG_RETHOOK) += rethook.o diff --git a/arch/arm/probes/rethook.c b/arch/arm/probes/rethook.c new file mode 100644 index 000000000000..adc16cdf358a --- /dev/null +++ b/arch/arm/probes/rethook.c @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * arm implementation of rethook. Mostly copied from arch/arm/probes/kprobes/core.c + */ + +#include <linux/kprobes.h> +#include <linux/rethook.h> + +/* Called from arch_rethook_trampoline */ +static __used unsigned long arch_rethook_trampoline_callback(struct pt_regs *regs) +{ + return rethook_trampoline_handler(regs, regs->ARM_fp); +} +NOKPROBE_SYMBOL(arch_rethook_trampoline_callback); + +/* + * When a rethook'ed function returns, it returns to arch_rethook_trampoline + * which calls rethook callback. We construct a struct pt_regs to + * give a view of registers r0-r11, sp, lr, and pc to the user + * return-handler. This is not a complete pt_regs structure, but that + * should be enough for stacktrace from the return handler with or + * without pt_regs. + */ +void __naked arch_rethook_trampoline(void) +{ + __asm__ __volatile__ ( +#ifdef CONFIG_FRAME_POINTER + "ldr lr, =arch_rethook_trampoline \n\t" + /* this makes a framepointer on pt_regs. */ +#ifdef CONFIG_CC_IS_CLANG + "stmdb sp, {sp, lr, pc} \n\t" + "sub sp, sp, #12 \n\t" + /* In clang case, pt_regs->ip = lr. */ + "stmdb sp!, {r0 - r11, lr} \n\t" + /* fp points regs->r11 (fp) */ + "add fp, sp, #44 \n\t" +#else /* !CONFIG_CC_IS_CLANG */ + /* In gcc case, pt_regs->ip = fp. */ + "stmdb sp, {fp, sp, lr, pc} \n\t" + "sub sp, sp, #16 \n\t" + "stmdb sp!, {r0 - r11} \n\t" + /* fp points regs->r15 (pc) */ + "add fp, sp, #60 \n\t" +#endif /* CONFIG_CC_IS_CLANG */ +#else /* !CONFIG_FRAME_POINTER */ + "sub sp, sp, #16 \n\t" + "stmdb sp!, {r0 - r11} \n\t" +#endif /* CONFIG_FRAME_POINTER */ + "mov r0, sp \n\t" + "bl arch_rethook_trampoline_callback \n\t" + "mov lr, r0 \n\t" + "ldmia sp!, {r0 - r11} \n\t" + "add sp, sp, #16 \n\t" +#ifdef CONFIG_THUMB2_KERNEL + "bx lr \n\t" +#else + "mov pc, lr \n\t" +#endif + : : : "memory"); +} +NOKPROBE_SYMBOL(arch_rethook_trampoline); + +void arch_rethook_prepare(struct rethook_node *rh, struct pt_regs *regs) +{ + rh->ret_addr = regs->ARM_lr; + rh->frame = regs->ARM_fp; + + /* Replace the return addr with trampoline addr. */ + regs->ARM_lr = (unsigned long)arch_rethook_trampoline; +} +NOKPROBE_SYMBOL(arch_rethook_prepare);
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- arch/arm/Kconfig | 1 + arch/arm/kernel/stacktrace.c | 4 ++ arch/arm/probes/Makefile | 1 + arch/arm/probes/rethook.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 arch/arm/probes/rethook.c