* [PATCH] tools/bootconfig: Add tracing_on support to helper scripts
@ 2020-12-09 5:27 Masami Hiramatsu
2021-01-13 23:11 ` Steven Rostedt
0 siblings, 1 reply; 4+ messages in thread
From: Masami Hiramatsu @ 2020-12-09 5:27 UTC (permalink / raw)
To: Steven Rostedt; +Cc: mhiramat, linux-kernel
Add ftrace.instance.INSTANCE.tracing_on support to ftrace2bconf.sh
and bconf2ftrace.sh.
commit 8490db06f914 ("tracing/boot: Add per-instance tracing_on
option support") added the per-instance tracing_on option,
but forgot to update the helper scripts.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
tools/bootconfig/scripts/bconf2ftrace.sh | 1 +
tools/bootconfig/scripts/ftrace2bconf.sh | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/tools/bootconfig/scripts/bconf2ftrace.sh b/tools/bootconfig/scripts/bconf2ftrace.sh
index 595e164dc352..feb30c2c7881 100755
--- a/tools/bootconfig/scripts/bconf2ftrace.sh
+++ b/tools/bootconfig/scripts/bconf2ftrace.sh
@@ -152,6 +152,7 @@ setup_instance() { # [instance]
set_array_of ${instance}.options ${instancedir}/trace_options
set_value_of ${instance}.trace_clock ${instancedir}/trace_clock
set_value_of ${instance}.cpumask ${instancedir}/tracing_cpumask
+ set_value_of ${instance}.tracing_on ${instancedir}/tracing_on
set_value_of ${instance}.tracer ${instancedir}/current_tracer
set_array_of ${instance}.ftrace.filters \
${instancedir}/set_ftrace_filter
diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh
index 6c0d4b61e0c2..a0c3bcc6da4f 100755
--- a/tools/bootconfig/scripts/ftrace2bconf.sh
+++ b/tools/bootconfig/scripts/ftrace2bconf.sh
@@ -221,6 +221,10 @@ instance_options() { # [instance-name]
if [ `echo $val | sed -e s/f//g`x != x ]; then
emit_kv $PREFIX.cpumask = $val
fi
+ val=`cat $INSTANCE/tracing_on`
+ if [ `echo $val | sed -e s/f//g`x != x ]; then
+ emit_kv $PREFIX.tracing_on = $val
+ fi
val=
for i in `cat $INSTANCE/set_event`; do
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] tools/bootconfig: Add tracing_on support to helper scripts
2020-12-09 5:27 [PATCH] tools/bootconfig: Add tracing_on support to helper scripts Masami Hiramatsu
@ 2021-01-13 23:11 ` Steven Rostedt
2021-01-14 6:50 ` Masami Hiramatsu
0 siblings, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2021-01-13 23:11 UTC (permalink / raw)
To: Masami Hiramatsu; +Cc: linux-kernel
Just noticed this patch. I'm adding it into my queue for the next merge
window, as it doesn't look too urgent.
-- Steve
On Wed, 9 Dec 2020 14:27:44 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> Add ftrace.instance.INSTANCE.tracing_on support to ftrace2bconf.sh
> and bconf2ftrace.sh.
>
> commit 8490db06f914 ("tracing/boot: Add per-instance tracing_on
> option support") added the per-instance tracing_on option,
> but forgot to update the helper scripts.
>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
> tools/bootconfig/scripts/bconf2ftrace.sh | 1 +
> tools/bootconfig/scripts/ftrace2bconf.sh | 4 ++++
> 2 files changed, 5 insertions(+)
>
> diff --git a/tools/bootconfig/scripts/bconf2ftrace.sh b/tools/bootconfig/scripts/bconf2ftrace.sh
> index 595e164dc352..feb30c2c7881 100755
> --- a/tools/bootconfig/scripts/bconf2ftrace.sh
> +++ b/tools/bootconfig/scripts/bconf2ftrace.sh
> @@ -152,6 +152,7 @@ setup_instance() { # [instance]
> set_array_of ${instance}.options ${instancedir}/trace_options
> set_value_of ${instance}.trace_clock ${instancedir}/trace_clock
> set_value_of ${instance}.cpumask ${instancedir}/tracing_cpumask
> + set_value_of ${instance}.tracing_on ${instancedir}/tracing_on
> set_value_of ${instance}.tracer ${instancedir}/current_tracer
> set_array_of ${instance}.ftrace.filters \
> ${instancedir}/set_ftrace_filter
> diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh
> index 6c0d4b61e0c2..a0c3bcc6da4f 100755
> --- a/tools/bootconfig/scripts/ftrace2bconf.sh
> +++ b/tools/bootconfig/scripts/ftrace2bconf.sh
> @@ -221,6 +221,10 @@ instance_options() { # [instance-name]
> if [ `echo $val | sed -e s/f//g`x != x ]; then
> emit_kv $PREFIX.cpumask = $val
> fi
> + val=`cat $INSTANCE/tracing_on`
> + if [ `echo $val | sed -e s/f//g`x != x ]; then
> + emit_kv $PREFIX.tracing_on = $val
> + fi
>
> val=
> for i in `cat $INSTANCE/set_event`; do
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tools/bootconfig: Add tracing_on support to helper scripts
2021-01-13 23:11 ` Steven Rostedt
@ 2021-01-14 6:50 ` Masami Hiramatsu
2021-01-14 14:44 ` Steven Rostedt
0 siblings, 1 reply; 4+ messages in thread
From: Masami Hiramatsu @ 2021-01-14 6:50 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel
On Wed, 13 Jan 2021 18:11:58 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:
>
> Just noticed this patch. I'm adding it into my queue for the next merge
> window, as it doesn't look too urgent.
Yes, it is not urgent, but it might be better to backport to 5.10.
Thank you,
>
> -- Steve
>
>
> On Wed, 9 Dec 2020 14:27:44 +0900
> Masami Hiramatsu <mhiramat@kernel.org> wrote:
>
> > Add ftrace.instance.INSTANCE.tracing_on support to ftrace2bconf.sh
> > and bconf2ftrace.sh.
> >
> > commit 8490db06f914 ("tracing/boot: Add per-instance tracing_on
> > option support") added the per-instance tracing_on option,
> > but forgot to update the helper scripts.
> >
> > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> > ---
> > tools/bootconfig/scripts/bconf2ftrace.sh | 1 +
> > tools/bootconfig/scripts/ftrace2bconf.sh | 4 ++++
> > 2 files changed, 5 insertions(+)
> >
> > diff --git a/tools/bootconfig/scripts/bconf2ftrace.sh b/tools/bootconfig/scripts/bconf2ftrace.sh
> > index 595e164dc352..feb30c2c7881 100755
> > --- a/tools/bootconfig/scripts/bconf2ftrace.sh
> > +++ b/tools/bootconfig/scripts/bconf2ftrace.sh
> > @@ -152,6 +152,7 @@ setup_instance() { # [instance]
> > set_array_of ${instance}.options ${instancedir}/trace_options
> > set_value_of ${instance}.trace_clock ${instancedir}/trace_clock
> > set_value_of ${instance}.cpumask ${instancedir}/tracing_cpumask
> > + set_value_of ${instance}.tracing_on ${instancedir}/tracing_on
> > set_value_of ${instance}.tracer ${instancedir}/current_tracer
> > set_array_of ${instance}.ftrace.filters \
> > ${instancedir}/set_ftrace_filter
> > diff --git a/tools/bootconfig/scripts/ftrace2bconf.sh b/tools/bootconfig/scripts/ftrace2bconf.sh
> > index 6c0d4b61e0c2..a0c3bcc6da4f 100755
> > --- a/tools/bootconfig/scripts/ftrace2bconf.sh
> > +++ b/tools/bootconfig/scripts/ftrace2bconf.sh
> > @@ -221,6 +221,10 @@ instance_options() { # [instance-name]
> > if [ `echo $val | sed -e s/f//g`x != x ]; then
> > emit_kv $PREFIX.cpumask = $val
> > fi
> > + val=`cat $INSTANCE/tracing_on`
> > + if [ `echo $val | sed -e s/f//g`x != x ]; then
> > + emit_kv $PREFIX.tracing_on = $val
> > + fi
> >
> > val=
> > for i in `cat $INSTANCE/set_event`; do
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tools/bootconfig: Add tracing_on support to helper scripts
2021-01-14 6:50 ` Masami Hiramatsu
@ 2021-01-14 14:44 ` Steven Rostedt
0 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2021-01-14 14:44 UTC (permalink / raw)
To: Masami Hiramatsu; +Cc: linux-kernel
On Thu, 14 Jan 2021 15:50:34 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> On Wed, 13 Jan 2021 18:11:58 -0500
> Steven Rostedt <rostedt@goodmis.org> wrote:
>
> >
> > Just noticed this patch. I'm adding it into my queue for the next merge
> > window, as it doesn't look too urgent.
>
> Yes, it is not urgent, but it might be better to backport to 5.10.
>
If it's something that should be backported, then I should send it now with
a stable tag.
-- Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-14 14:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-09 5:27 [PATCH] tools/bootconfig: Add tracing_on support to helper scripts Masami Hiramatsu
2021-01-13 23:11 ` Steven Rostedt
2021-01-14 6:50 ` Masami Hiramatsu
2021-01-14 14:44 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox