* FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree
@ 2020-04-15 11:45 gregkh
2020-04-15 19:14 ` Steven Rostedt
2020-04-16 1:23 ` Masami Hiramatsu
0 siblings, 2 replies; 5+ messages in thread
From: gregkh @ 2020-04-15 11:45 UTC (permalink / raw)
To: mhiramat, rostedt, treeze.taeung; +Cc: stable
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@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@kernel.org>
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@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>
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 362cca52f5de..d0568af4a0ef 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -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));
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree
2020-04-15 11:45 FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree gregkh
@ 2020-04-15 19:14 ` Steven Rostedt
2020-04-16 1:27 ` Masami Hiramatsu
2020-04-16 3:09 ` Sasha Levin
2020-04-16 1:23 ` Masami Hiramatsu
1 sibling, 2 replies; 5+ messages in thread
From: Steven Rostedt @ 2020-04-15 19:14 UTC (permalink / raw)
To: gregkh; +Cc: mhiramat, treeze.taeung, stable
On Wed, 15 Apr 2020 13:45:27 +0200
<gregkh@linuxfoundation.org> 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@vger.kernel.org>.
>
> 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 <mhiramat@kernel.org>
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@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>
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree
2020-04-15 11:45 FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree gregkh
2020-04-15 19:14 ` Steven Rostedt
@ 2020-04-16 1:23 ` Masami Hiramatsu
1 sibling, 0 replies; 5+ messages in thread
From: Masami Hiramatsu @ 2020-04-16 1:23 UTC (permalink / raw)
To: gregkh; +Cc: rostedt, treeze.taeung, stable
Hi,
On Wed, 15 Apr 2020 13:45:27 +0200
<gregkh@linuxfoundation.org> 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@vger.kernel.org>.
Ah, OK. The next line is modified by multiprobe support.
I'll backport it.
Thank you,
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 6a13a0d7b4d1171ef9b80ad69abc37e1daa941b3 Mon Sep 17 00:00:00 2001
> From: Masami Hiramatsu <mhiramat@kernel.org>
> 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@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>
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 362cca52f5de..d0568af4a0ef 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -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));
>
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree
2020-04-15 19:14 ` Steven Rostedt
@ 2020-04-16 1:27 ` Masami Hiramatsu
2020-04-16 3:09 ` Sasha Levin
1 sibling, 0 replies; 5+ messages in thread
From: Masami Hiramatsu @ 2020-04-16 1:27 UTC (permalink / raw)
To: Steven Rostedt; +Cc: gregkh, mhiramat, treeze.taeung, stable
On Wed, 15 Apr 2020 15:14:00 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Wed, 15 Apr 2020 13:45:27 +0200
> <gregkh@linuxfoundation.org> 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@vger.kernel.org>.
> >
> > 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@kernel.org>
> 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@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>
>
> 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@kernel.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree
2020-04-15 19:14 ` Steven Rostedt
2020-04-16 1:27 ` Masami Hiramatsu
@ 2020-04-16 3:09 ` Sasha Levin
1 sibling, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2020-04-16 3:09 UTC (permalink / raw)
To: Steven Rostedt; +Cc: gregkh, mhiramat, treeze.taeung, stable
On Wed, Apr 15, 2020 at 03:14:00PM -0400, Steven Rostedt wrote:
>On Wed, 15 Apr 2020 13:45:27 +0200
><gregkh@linuxfoundation.org> 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@vger.kernel.org>.
>>
>> thanks,
>>
>> greg k-h
>>
>>
>
>This should apply to both 4.14 and 4.19 and fix the same issue:
Queued up for 4.19 and 4.14, thanks Steve!
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-16 3:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-15 11:45 FAILED: patch "[PATCH] ftrace/kprobe: Show the maxactive number on kprobe_events" failed to apply to 4.19-stable tree gregkh
2020-04-15 19:14 ` Steven Rostedt
2020-04-16 1:27 ` Masami Hiramatsu
2020-04-16 3:09 ` Sasha Levin
2020-04-16 1:23 ` Masami Hiramatsu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).