Linux-rt-users archive on lore.kernel.org
 help / color / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Tom Zanussi <zanussi@kernel.org>
Cc: rostedt@goodmis.org, artem.bityutskiy@linux.intel.com,
	mhiramat@kernel.org, linux-kernel@vger.kernel.org,
	linux-rt-users@vger.kernel.org
Subject: Re: [PATCH 2/3] tracing: Don't return -EINVAL when tracing soft disabled synth events
Date: Wed, 12 Feb 2020 12:24:15 +0900
Message-ID: <20200212122415.6dd7d33c19d1eeddae0ccfb8@kernel.org> (raw)
In-Reply-To: <df5d02a1625aff97c9866506c5bada6a069982ba.1581374549.git.zanussi@kernel.org>

On Mon, 10 Feb 2020 17:06:49 -0600
Tom Zanussi <zanussi@kernel.org> wrote:

> There's no reason to return -EINVAL when tracing a synthetic event if
> it's soft disabled - treat it the same as if it were hard disabled and
> return normally.
> 
> Have synth_event_trace() and synth_event_trace_array() just return
> normally, and have synth_event_trace_start set the trace state to
> disabled and return.
> 

Looks good to me.

Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>

Thanks,

> Signed-off-by: Tom Zanussi <zanussi@kernel.org>
> ---
>  kernel/trace/trace_events_hist.c | 20 ++++++--------------
>  1 file changed, 6 insertions(+), 14 deletions(-)
> 
> diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
> index a546ffa14785..99a02168599b 100644
> --- a/kernel/trace/trace_events_hist.c
> +++ b/kernel/trace/trace_events_hist.c
> @@ -1828,7 +1828,8 @@ int synth_event_trace(struct trace_event_file *file, unsigned int n_vals, ...)
>  	 * called directly by the user, we don't have that but we
>  	 * still need to honor not logging when disabled.
>  	 */
> -	if (!(file->flags & EVENT_FILE_FL_ENABLED))
> +	if (!(file->flags & EVENT_FILE_FL_ENABLED) ||
> +	    trace_trigger_soft_disabled(file))
>  		return 0;
>  
>  	event = file->event_call->data;
> @@ -1836,9 +1837,6 @@ int synth_event_trace(struct trace_event_file *file, unsigned int n_vals, ...)
>  	if (n_vals != event->n_fields)
>  		return -EINVAL;
>  
> -	if (trace_trigger_soft_disabled(file))
> -		return -EINVAL;
> -
>  	fields_size = event->n_u64 * sizeof(u64);
>  
>  	/*
> @@ -1918,7 +1916,8 @@ int synth_event_trace_array(struct trace_event_file *file, u64 *vals,
>  	 * called directly by the user, we don't have that but we
>  	 * still need to honor not logging when disabled.
>  	 */
> -	if (!(file->flags & EVENT_FILE_FL_ENABLED))
> +	if (!(file->flags & EVENT_FILE_FL_ENABLED) ||
> +	    trace_trigger_soft_disabled(file))
>  		return 0;
>  
>  	event = file->event_call->data;
> @@ -1926,9 +1925,6 @@ int synth_event_trace_array(struct trace_event_file *file, u64 *vals,
>  	if (n_vals != event->n_fields)
>  		return -EINVAL;
>  
> -	if (trace_trigger_soft_disabled(file))
> -		return -EINVAL;
> -
>  	fields_size = event->n_u64 * sizeof(u64);
>  
>  	/*
> @@ -2017,7 +2013,8 @@ int synth_event_trace_start(struct trace_event_file *file,
>  	 * trace case, we save the enabed state upon start and just
>  	 * ignore the following data calls.
>  	 */
> -	if (!(file->flags & EVENT_FILE_FL_ENABLED)) {
> +	if (!(file->flags & EVENT_FILE_FL_ENABLED) ||
> +	    trace_trigger_soft_disabled(file)) {
>  		trace_state->enabled = false;
>  		goto out;
>  	}
> @@ -2026,11 +2023,6 @@ int synth_event_trace_start(struct trace_event_file *file,
>  
>  	trace_state->event = file->event_call->data;
>  
> -	if (trace_trigger_soft_disabled(file)) {
> -		ret = -EINVAL;
> -		goto out;
> -	}
> -
>  	fields_size = trace_state->event->n_u64 * sizeof(u64);
>  
>  	/*
> -- 
> 2.14.1
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

  reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-10 23:06 [PATCH 0/3] tracing: Synthetic event fixes and updates Tom Zanussi
2020-02-10 23:06 ` [PATCH 1/3] tracing: Add missing nest end to synth_event_trace_start() error case Tom Zanussi
2020-02-12  3:24   ` Masami Hiramatsu
2020-02-10 23:06 ` [PATCH 2/3] tracing: Don't return -EINVAL when tracing soft disabled synth events Tom Zanussi
2020-02-12  3:24   ` Masami Hiramatsu [this message]
2020-02-12  3:28     ` Steven Rostedt
2020-02-12  5:24       ` Masami Hiramatsu
2020-02-10 23:06 ` [PATCH 3/3] tracing: Consolidate trace() functions Tom Zanussi
2020-02-12  3:36   ` Masami Hiramatsu

Reply instructions:

You may reply publically 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=20200212122415.6dd7d33c19d1eeddae0ccfb8@kernel.org \
    --to=mhiramat@kernel.org \
    --cc=artem.bityutskiy@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=zanussi@kernel.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

Linux-rt-users archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-rt-users/0 linux-rt-users/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-rt-users linux-rt-users/ https://lore.kernel.org/linux-rt-users \
		linux-rt-users@vger.kernel.org
	public-inbox-index linux-rt-users

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-rt-users


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git