Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f1c425 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Greg Kroah-Hartman
Browse files

ftrace/kprobe: Show the maxactive number on kprobe_events 

[ Upstream commit 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 ]

Show maxactive parameter on kprobe_events.
This allows user to save the current configuration and
restore it without losing maxactive parameter.

Link: http://lkml.kernel.org/r/4762764a-6df7-bc93-ed60-e336146dce1f@gmail.com
Link: http://lkml.kernel.org/r/158503528846.22706.5549974121212526020.stgit@devnote2



Cc: stable@vger.kernel.org
Fixes: 696ced4f ("tracing/kprobes: expose maxactive for kretprobe in kprobe_events")
Reported-by: default avatarTaeung Song <treeze.taeung@gmail.com>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 49d7fa0e

kernel/trace/trace_kprobe.c

+2 −0
Original line number Diff line number Diff line
@@ -975,6 +975,8 @@ static int probes_seq_show(struct seq_file *m, void *v) 
	int i;



	seq_putc(m, trace_kprobe_is_return(tk) ? 'r' : 'p');

	if (trace_kprobe_is_return(tk) && tk->rp.maxactive)

		seq_printf(m, "%d", tk->rp.maxactive);

	seq_printf(m, ":%s/%s", tk->tp.call.class->system,

			trace_event_name(&tk->tp.call));