From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>,
kbuild test robot <fengguang.wu@intel.com>
Subject: Re: [PATCH 2/2] tracing: Fix rcu handling of event_trigger_data filter field
Date: Wed, 8 Jan 2014 17:30:14 -0800 [thread overview]
Message-ID: <20140109013014.GL10038@linux.vnet.ibm.com> (raw)
In-Reply-To: <20131222031147.984230034@goodmis.org>
On Sat, Dec 21, 2013 at 10:08:01PM -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
>
> The filter field of the event_trigger_data structure is protected under
> RCU sched locks. It was not annotated as such, and after doing so,
> sparse pointed out several locations that required fix ups.
>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Looks good to me!
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> ---
> kernel/trace/trace.h | 2 +-
> kernel/trace/trace_events_trigger.c | 8 +++++---
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
> index 0380cab..02b592f 100644
> --- a/kernel/trace/trace.h
> +++ b/kernel/trace/trace.h
> @@ -1057,7 +1057,7 @@ struct event_trigger_data {
> int ref;
> struct event_trigger_ops *ops;
> struct event_command *cmd_ops;
> - struct event_filter *filter;
> + struct event_filter __rcu *filter;
> char *filter_str;
> void *private_data;
> struct list_head list;
> diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
> index 12ac8a5..f6dd115 100644
> --- a/kernel/trace/trace_events_trigger.c
> +++ b/kernel/trace/trace_events_trigger.c
> @@ -67,6 +67,7 @@ event_triggers_call(struct ftrace_event_file *file, void *rec)
> {
> struct event_trigger_data *data;
> enum event_trigger_type tt = ETT_NONE;
> + struct event_filter *filter;
>
> if (list_empty(&file->triggers))
> return tt;
> @@ -76,7 +77,8 @@ event_triggers_call(struct ftrace_event_file *file, void *rec)
> data->ops->func(data);
> continue;
> }
> - if (data->filter && !filter_match_preds(data->filter, rec))
> + filter = rcu_dereference(data->filter);
> + if (filter && !filter_match_preds(filter, rec))
> continue;
> if (data->cmd_ops->post_trigger) {
> tt |= data->cmd_ops->trigger_type;
> @@ -703,7 +705,7 @@ static int set_trigger_filter(char *filter_str,
> if (ret)
> goto out;
> assign:
> - tmp = data->filter;
> + tmp = rcu_access_pointer(data->filter);
>
> rcu_assign_pointer(data->filter, filter);
>
> @@ -719,7 +721,7 @@ static int set_trigger_filter(char *filter_str,
> if (filter_str) {
> data->filter_str = kstrdup(filter_str, GFP_KERNEL);
> if (!data->filter_str) {
> - free_event_filter(data->filter);
> + free_event_filter(rcu_access_pointer(data->filter));
> data->filter = NULL;
> ret = -ENOMEM;
> }
> --
> 1.8.4.3
>
>
next prev parent reply other threads:[~2014-01-09 22:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-22 3:07 [PATCH 0/2] tracing: Fixes to event_triggers patches found by Fengguang's test bot Steven Rostedt
2013-12-22 3:08 ` [PATCH 1/2] tracing: Add generic tracing_lseek() function Steven Rostedt
2013-12-22 3:08 ` [PATCH 2/2] tracing: Fix rcu handling of event_trigger_data filter field Steven Rostedt
2014-01-09 1:30 ` Paul E. McKenney [this message]
2013-12-23 3:13 ` [PATCH 0/2] tracing: Fixes to event_triggers patches found by Fengguang's test bot Tom Zanussi
2014-01-02 17:11 ` 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=20140109013014.GL10038@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=fengguang.wu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tom.zanussi@linux.intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox