diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-11-08 13:11:39 -0500 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-11-13 09:36:49 -0500 |
commit | 562955fe6a558b9ef98ad87c470314946338cb2f (patch) | |
tree | cb76aa51c8a29ef696210e9145ff45772094ed98 /arch/x86/kernel/ftrace.c | |
parent | ed9dafebce52206382de96bd5bbdff22335930f6 (diff) | |
download | linux-stable-562955fe6a558b9ef98ad87c470314946338cb2f.tar.gz linux-stable-562955fe6a558b9ef98ad87c470314946338cb2f.tar.bz2 linux-stable-562955fe6a558b9ef98ad87c470314946338cb2f.zip |
ftrace/x86: Add register_ftrace_direct() for custom trampolines
Enable x86 to allow for register_ftrace_direct(), where a custom trampoline
may be called directly from an ftrace mcount/fentry location.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
-rw-r--r-- | arch/x86/kernel/ftrace.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 024c3053dbba..fef283f6341d 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -1043,6 +1043,18 @@ void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent, return; /* + * If the return location is actually pointing directly to + * the start of a direct trampoline (if we trace the trampoline + * it will still be offset by MCOUNT_INSN_SIZE), then the + * return address is actually off by one word, and we + * need to adjust for that. + */ + if (ftrace_find_direct_func(self_addr + MCOUNT_INSN_SIZE)) { + self_addr = *parent; + parent++; + } + + /* * Protect against fault, even if it shouldn't * happen. This tool is too much intrusive to * ignore such a protection. |