summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2020-05-12 15:19:14 +0300
committerPeter Zijlstra <peterz@infradead.org>2020-06-15 14:09:49 +0200
commitdd9ddf466ad7a5d2e247925d81ebb0b878bf3b76 (patch)
tree31d86a7debd7f3663bb127ebbe08b43f64f97c62 /kernel
parentfc0ea795f53c8d7040fa42471f74fe51d78d0834 (diff)
downloadlinux-dd9ddf466ad7a5d2e247925d81ebb0b878bf3b76.tar.bz2
ftrace: Add perf ksymbol events for ftrace trampolines
Symbols are needed for tools to describe instruction addresses. Pages allocated for ftrace's purposes need symbols to be created for them. Add such symbols to be visible via perf ksymbol events. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20200512121922.8997-8-adrian.hunter@intel.com
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 31675b209db2..2baaf7716537 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2790,8 +2790,13 @@ static void ftrace_remove_trampoline_from_kallsyms(struct ftrace_ops *ops)
static void ftrace_trampoline_free(struct ftrace_ops *ops)
{
if (ops && (ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP) &&
- ops->trampoline)
+ ops->trampoline) {
+ perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_OOL,
+ ops->trampoline, ops->trampoline_size,
+ true, FTRACE_TRAMPOLINE_SYM);
+ /* Remove from kallsyms after the perf events */
ftrace_remove_trampoline_from_kallsyms(ops);
+ }
arch_ftrace_trampoline_free(ops);
}
@@ -6805,8 +6810,13 @@ static void ftrace_update_trampoline(struct ftrace_ops *ops)
arch_ftrace_update_trampoline(ops);
if (ops->trampoline && ops->trampoline != trampoline &&
- (ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP))
+ (ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP)) {
+ /* Add to kallsyms before the perf events */
ftrace_add_trampoline_to_kallsyms(ops);
+ perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_OOL,
+ ops->trampoline, ops->trampoline_size, false,
+ FTRACE_TRAMPOLINE_SYM);
+ }
}
void ftrace_init_trace_array(struct trace_array *tr)