diff options
| author |  Peter Zijlstra <peterz@infradead.org>
| 2019-05-07 23:25:50 +0200 |
|---|---|---|
| committer |  Ingo Molnar <mingo@kernel.org>
| 2019-06-25 10:23:47 +0200 |
| commit | ea1ed38dba64b64a245ab8ca1406269d17b99485 (patch) | |
| tree | 5d23b360d04bdde52ef73bf04598e103537c7d4c /arch/x86/kernel/ftrace_64.S | |
| parent | x86/stackframe, x86/kprobes: Fix frame pointer annotations (diff) | |
| download | linux-ea1ed38dba64b64a245ab8ca1406269d17b99485.tar.gz linux-ea1ed38dba64b64a245ab8ca1406269d17b99485.tar.bz2 linux-ea1ed38dba64b64a245ab8ca1406269d17b99485.zip | |
x86/stackframe, x86/ftrace: Add pt_regs frame annotations
When CONFIG_FRAME_POINTER, we should mark pt_regs frames.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/ftrace_64.S')
| -rw-r--r-- | arch/x86/kernel/ftrace_64.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 10eb2760ef2c..809d54397dba 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -9,6 +9,7 @@ #include <asm/export.h> #include <asm/nospec-branch.h> #include <asm/unwind_hints.h> +#include <asm/frame.h> .code64 .section .entry.text, "ax" @@ -203,6 +204,8 @@ GLOBAL(ftrace_regs_caller_op_ptr) leaq MCOUNT_REG_SIZE+8*2(%rsp), %rcx movq %rcx, RSP(%rsp) + ENCODE_FRAME_POINTER + /* regs go into 4th parameter */ leaq (%rsp), %rcx |