FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree

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 <[email protected]>.

thanks,

greg k-h

Quoted 5 lines · On Wed, 15 Apr 2020 13:45:27 +0200 <[email protected]> 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 <[email protected]>.

Quoted 5 lines

thanks,

greg k-h

This should apply to both 4.14 and 4.19 and fix the same issue:

From 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
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/[email protected] open here

Link http://lkml.kernel.org/r/158503528846.22706.5549974121212526020.stgit@devnote2 open here

Cc [email protected]

Fixes 696ced4fb1d76 ("tracing/kprobes: expose maxactive for kretprobe in kprobe_events")

Reported-by Taeung Song <[email protected]>

Signed-off-by Masami Hiramatsu <[email protected]>

Signed-off-by Steven Rostedt (VMware) <[email protected]>

Index: linux-test.git/kernel/trace/trace_kprobe.c
===================================================================

kernel/trace/trace_kprobe.c +2 -1

@@ -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

Quoted 5 lines · On Wed, 15 Apr 2020 13:45:27 +0200 <[email protected]> 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 <[email protected]>.

Quoted 5 lines

thanks,

greg k-h

This should apply to both 4.14 and 4.19 and fix the same issue:

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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
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/[email protected] open here

Link http://lkml.kernel.org/r/158503528846.22706.5549974121212526020.stgit@devnote2 open here

Cc [email protected]

Fixes 696ced4fb1d76 ("tracing/kprobes: expose maxactive for kretprobe in kprobe_events")

Reported-by Taeung Song <[email protected]>

Signed-off-by Masami Hiramatsu <[email protected]>

Signed-off-by Steven Rostedt (VMware) <[email protected]>

kernel/trace/trace_kprobe.c +2 -0

index 362cca52f5de..d0568af4a0ef 100644
@@ -1078,6 +1078,8 @@ static int trace_kprobe_show(struct seq_file *m, struct dyn_event *ev)
 	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", trace_probe_group_name(&tk->tp),
 				trace_probe_name(&tk->tp));