Skip to content

Commit

Permalink
ftrace: Fix output of enabled_functions for showing tramp
Browse files Browse the repository at this point in the history
When showing all tramps registered to a ftrace record in the file
enabled_functions, it exits the loop with ops == NULL. But then it is
suppose to show the function on the ops->trampoline and
add_trampoline_func() is called with the given ops. But because ops is now
NULL (to exit the loop), it always shows the static trampoline instead of
the one that is really registered to the record.

The call to add_trampoline_func() that shows the trampoline for the given
ops needs to be called at every iteration.

Fixes: 39daa7b "ftrace: Show all tramps registered to a record on ftrace_bug()"
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (Red Hat) committed Dec 23, 2015
1 parent b8ec330 commit 030f4e1
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -3322,7 +3322,7 @@ static int t_show(struct seq_file *m, void *v)

seq_printf(m, "%ps", (void *)rec->ip);
if (iter->flags & FTRACE_ITER_ENABLED) {
struct ftrace_ops *ops = NULL;
struct ftrace_ops *ops;

seq_printf(m, " (%ld)%s%s",
ftrace_rec_count(rec),
Expand All @@ -3335,13 +3335,14 @@ static int t_show(struct seq_file *m, void *v)
seq_printf(m, "\ttramp: %pS (%pS)",
(void *)ops->trampoline,
(void *)ops->func);
add_trampoline_func(m, ops, rec);
ops = ftrace_find_tramp_ops_next(rec, ops);
} while (ops);
} else
seq_puts(m, "\ttramp: ERROR!");

} else {
add_trampoline_func(m, NULL, rec);
}
add_trampoline_func(m, ops, rec);
}

seq_putc(m, '\n');
Expand Down

0 comments on commit 030f4e1

Please sign in to comment.