trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call->filter
Steven Rostedt
maintainerIngo,
Please pull the latest tip/perf/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/urgent
Head SHA1: d3d9acf646679c1981032b0985b386d12fccc60c
Tejun Heo (1):
trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call->filter
----
kernel/trace/trace_events_filter.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --------------------------- commit d3d9acf646679c1981032b0985b386d12fccc60c Author: Tejun Heo <[email protected]> Date: Wed Nov 23 08:49:49 2011 -0800
trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call->filter
ftrace_event_call->filter is sched RCU protected but didn't use rcu_assign_pointer(). Use it.
TODO: Add proper __rcu annotation to call->filter and all its users.
-v2: Use RCU_INIT_POINTER() for %NULL clearing as suggested by Eric.
kernel/trace/trace_events_filter.c +3 -3
@@ -1686,7 +1686,7 @@ static int replace_system_preds(struct event_subsystem *system,* replace the filter for the call. */ filter = call->filter; - call->filter = filter_item->filter; +rcu_assign_pointer (call->filter, filter_item->filter); filter_item->filter = filter; fail = false;
@@ -1741,7 +1741,7 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string) filter = call->filter;if (!filter) goto out_unlock; - call->filter =NULL ; +RCU_INIT_POINTER (call->filter,NULL );/* Make sure the filter is not being used */ synchronize_sched ();__free_filter (filter);
@@ -1782,7 +1782,7 @@ out:* string */ tmp = call->filter; - call->filter = filter; +rcu_assign_pointer (call->filter, filter);if (tmp) {/* Make sure the call is done with the filter */ synchronize_sched ();
Quoted 11 lines · Steven Rostedt
Ingo,
Please pull the latest tip/perf/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/urgentHead SHA1:
d3d9acf646679c1981032b0985b386d12fccc60c
Quoted 6 lines
Tejun Heo (1):
trace_events_filter: Use rcu_assign_pointer() when setting ftrace_event_call->filter----
kernel/trace/trace_events_filter.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
Pulled, thanks Steve!
Ingo