From: Tom Zanussi <zanussi@kernel.org>
To: Masami Hiramatsu <mhiramat@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>
Cc: artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org,
linux-rt-users@vger.kernel.org
Subject: Re: [PATCH] tracing: Skip software disabled event at __synth_event_trace_end()
Date: Wed, 12 Feb 2020 10:03:25 -0600 [thread overview]
Message-ID: <1581523405.8740.10.camel@kernel.org> (raw)
In-Reply-To: <158148685911.20407.3538292497442671878.stgit@devnote2>
Hi Masami,
You're right, this is a bug, thanks for sending the patch to fix it.
Tom
Reviewed-by: Tom Zanussi <zanussi@kernel.org>
On Wed, 2020-02-12 at 14:54 +0900, Masami Hiramatsu wrote:
> When the synthetic event is software disabled,
> __synth_event_trace_start() does not allocate an event buffer.
> In this case __synth_event_trace_end() also should not commit
> the buffer.
>
> Check the trace_state->disabled at __synth_event_trace_end()
> and if it is disabled, skip it.
>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
> kernel/trace/trace_events_hist.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/kernel/trace/trace_events_hist.c
> b/kernel/trace/trace_events_hist.c
> index 483b3fd1094f..781e4b55e117 100644
> --- a/kernel/trace/trace_events_hist.c
> +++ b/kernel/trace/trace_events_hist.c
> @@ -1847,6 +1847,9 @@ __synth_event_trace_start(struct
> trace_event_file *file,
> static inline void
> __synth_event_trace_end(struct synth_event_trace_state *trace_state)
> {
> + if (trace_state->disabled)
> + return;
> +
> trace_event_buffer_commit(&trace_state->fbuffer);
>
> ring_buffer_nest_end(trace_state->buffer);
>
next prev parent reply other threads:[~2020-02-12 16:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 5:54 [PATCH] tracing: Skip software disabled event at __synth_event_trace_end() Masami Hiramatsu
2020-02-12 16:03 ` Tom Zanussi [this message]
2020-02-17 9:33 ` Masami Hiramatsu
2020-02-20 19:34 ` Steven Rostedt
2020-02-20 19:51 ` Tom Zanussi
2020-02-20 19:54 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1581523405.8740.10.camel@kernel.org \
--to=zanussi@kernel.org \
--cc=artem.bityutskiy@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.