On Wed, 15 Apr 2020 15:14:00 -0400 Steven Rostedt <rostedt@xxxxxxxxxxx> wrote: > On Wed, 15 Apr 2020 13:45:27 +0200 > <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > The patch below does not apply to the 4.19-stable tree. > > If someone wants it applied there, or to any other stable or longterm > > tree, then please email the backport, including the original git commit > > id to <stable@xxxxxxxxxxxxxxx>. > > > > thanks, > > > > greg k-h > > > > > > This should apply to both 4.14 and 4.19 and fix the same issue: Thanks Steven for backporting! I confirmed this can applied on 4.19 and 4.14. Thanks! > > From 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 Mon Sep 17 00:00:00 2001 > From: Masami Hiramatsu <mhiramat@xxxxxxxxxx> > Date: Tue, 24 Mar 2020 16:34:48 +0900 > Subject: [PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events > > 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@xxxxxxxxx > Link: http://lkml.kernel.org/r/158503528846.22706.5549974121212526020.stgit@devnote2 > > Cc: stable@xxxxxxxxxxxxxxx > Fixes: 696ced4fb1d76 ("tracing/kprobes: expose maxactive for kretprobe in kprobe_events") > Reported-by: Taeung Song <treeze.taeung@xxxxxxxxx> > Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx> > Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> > > Index: linux-test.git/kernel/trace/trace_kprobe.c > =================================================================== > --- linux-test.git.orig/kernel/trace/trace_kprobe.c > +++ linux-test.git/kernel/trace/trace_kprobe.c > @@ -975,6 +975,8 @@ static int probes_seq_show(struct seq_fi > 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)); > > > > -- Steve -- Masami Hiramatsu <mhiramat@xxxxxxxxxx>
