diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-11-18 21:14:11 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-11-19 15:25:26 -0500 |
commit | aec0be2d6e9f02dbef41ee54854c2e003e55c23e (patch) | |
tree | d99c09ba4247724e467ab497f2184068a64ef63b /kernel/extable.c | |
parent | 9960efeb80f73bd073483dab0855ee0ddc27085c (diff) |
ftrace/x86/extable: Add is_ftrace_trampoline() function
Stack traces that happen from function tracing check if the address
on the stack is a __kernel_text_address(). That is, is the address
kernel code. This calls core_kernel_text() which returns true
if the address is part of the builtin kernel code. It also calls
is_module_text_address() which returns true if the address belongs
to module code.
But what is missing is ftrace dynamically allocated trampolines.
These trampolines are allocated for individual ftrace_ops that
call the ftrace_ops callback functions directly. But if they do a
stack trace, the code checking the stack wont detect them as they
are neither core kernel code nor module address space.
Adding another field to ftrace_ops that also stores the size of
the trampoline assigned to it we can create a new function called
is_ftrace_trampoline() that returns true if the address is a
dynamically allocate ftrace trampoline. Note, it ignores trampolines
that are not dynamically allocated as they will return true with
the core_kernel_text() function.
Link: http://lkml.kernel.org/r/20141119034829.497125839@goodmis.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/extable.c')
-rw-r--r-- | kernel/extable.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/extable.c b/kernel/extable.c index d8a6446adbcb..c98f926277a8 100644 --- a/kernel/extable.c +++ b/kernel/extable.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/ftrace.h> | 18 | #include <linux/ftrace.h> |
19 | #include <linux/memory.h> | 19 | #include <linux/memory.h> |
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/ftrace.h> | ||
21 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
23 | 24 | ||
@@ -102,6 +103,8 @@ int __kernel_text_address(unsigned long addr) | |||
102 | return 1; | 103 | return 1; |
103 | if (is_module_text_address(addr)) | 104 | if (is_module_text_address(addr)) |
104 | return 1; | 105 | return 1; |
106 | if (is_ftrace_trampoline(addr)) | ||
107 | return 1; | ||
105 | /* | 108 | /* |
106 | * There might be init symbols in saved stacktraces. | 109 | * There might be init symbols in saved stacktraces. |
107 | * Give those symbols a chance to be printed in | 110 | * Give those symbols a chance to be printed in |
@@ -119,7 +122,9 @@ int kernel_text_address(unsigned long addr) | |||
119 | { | 122 | { |
120 | if (core_kernel_text(addr)) | 123 | if (core_kernel_text(addr)) |
121 | return 1; | 124 | return 1; |
122 | return is_module_text_address(addr); | 125 | if (is_module_text_address(addr)) |
126 | return 1; | ||
127 | return is_ftrace_trampoline(addr); | ||
123 | } | 128 | } |
124 | 129 | ||
125 | /* | 130 | /* |