From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Tom Zanussi <tom.zanussi@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
kbuild test robot <fengguang.wu@intel.com>
Subject: [for-next][PATCH 10/10] tracing: Fix rcu handling of event_trigger_data filter field
Date: Mon, 23 Dec 2013 16:38:20 -0500 [thread overview]
Message-ID: <20131223213915.389237477@goodmis.org> (raw)
In-Reply-To: 20131223213810.967436536@goodmis.org
[-- Attachment #1: 0010-tracing-Fix-rcu-handling-of-event_trigger_data-filte.patch --]
[-- Type: text/plain, Size: 2288 bytes --]
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>
---
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
prev parent reply other threads:[~2013-12-23 21:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-23 21:38 [for-next][PATCH 00/10] tracing: Addition of trace event trigeers Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 01/10] tracing: Add basic event trigger framework Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 02/10] tracing: Add traceon and traceoff event trigger commands Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 03/10] tracing: Add snapshot event trigger command Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 04/10] tracing: Add stacktrace " Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 05/10] tracing: Add enable_event and disable_event event trigger commands Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 06/10] tracing: Move ftrace_event_file() out of DYNAMIC_FTRACE ifdef Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 07/10] tracing: Add and use generic set_trigger_filter() implementation Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 08/10] tracing: Add documentation for trace event triggers Steven Rostedt
2013-12-23 21:38 ` [for-next][PATCH 09/10] tracing: Add generic tracing_lseek() function Steven Rostedt
2013-12-23 21:38 ` Steven Rostedt [this message]
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=20131223213915.389237477@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fengguang.wu@intel.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.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