diff options
| author | Josh Poimboeuf <jpoimboe@redhat.com> | 2021-03-16 23:35:48 +0900 |
|---|---|---|
| committer | Masami Hiramatsu <mhiramat@kernel.org> | 2021-03-19 11:51:27 +0900 |
| commit | 240dbe52255834ff0de40f8b4ad4ff8f5d727d0b (patch) | |
| tree | 44f9e23188b468e6221d31d526daa491a1f5ff48 | |
| parent | 18ea6c411cff75cfe5cd61698787c414de881a64 (diff) | |
| download | linux-240dbe52255834ff0de40f8b4ad4ff8f5d727d0b.tar.gz | |
x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline code
Add UNWIND_HINT_FUNC on kretporbe_trampoline code so that ORC
information is generated on the kretprobe_trampoline correctly.
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
[MH] Add patch description.
| -rw-r--r-- | arch/x86/include/asm/unwind_hints.h | 5 | ||||
| -rw-r--r-- | arch/x86/kernel/kprobes/core.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/include/asm/unwind_hints.h b/arch/x86/include/asm/unwind_hints.h index 8e574c0afef80..8b33674288ea7 100644 --- a/arch/x86/include/asm/unwind_hints.h +++ b/arch/x86/include/asm/unwind_hints.h @@ -52,6 +52,11 @@ UNWIND_HINT sp_reg=ORC_REG_SP sp_offset=8 type=UNWIND_HINT_TYPE_FUNC .endm +#else + +#define UNWIND_HINT_FUNC \ + UNWIND_HINT(ORC_REG_SP, 8, UNWIND_HINT_TYPE_FUNC, 0) + #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_UNWIND_HINTS_H */ diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 427d648fffcd4..b31058a152b60 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -772,6 +772,7 @@ asm( /* We don't bother saving the ss register */ #ifdef CONFIG_X86_64 " pushq %rsp\n" + UNWIND_HINT_FUNC " pushfq\n" SAVE_REGS_STRING " movq %rsp, %rdi\n" @@ -782,6 +783,7 @@ asm( " popfq\n" #else " pushl %esp\n" + UNWIND_HINT_FUNC " pushfl\n" SAVE_REGS_STRING " movl %esp, %eax\n" @@ -795,7 +797,6 @@ asm( ".size kretprobe_trampoline, .-kretprobe_trampoline\n" ); NOKPROBE_SYMBOL(kretprobe_trampoline); -STACK_FRAME_NON_STANDARD(kretprobe_trampoline); /* |