]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
ftrace/kprobe: Show the maxactive number on kprobe_events
authorMasami Hiramatsu <mhiramat@kernel.org>
Tue, 24 Mar 2020 07:34:48 +0000 (16:34 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Apr 2020 06:00:50 +0000 (08:00 +0200)
[ 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: 696ced4fb1d76 ("tracing/kprobes: expose maxactive for kretprobe in kprobe_events")
Reported-by: Taeung Song <treeze.taeung@gmail.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/trace/trace_kprobe.c

index ea20274a105aed94ce34d96e30ffc2304cc038ae..d66aed6e9c75f2418f46bc087e199a98c7b2d224 100644 (file)
@@ -877,6 +877,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));