Skip to content

Commit 549e914

Browse files
committed
tracing: Add rcu annotation around file->filter accesses
Running sparse on trace_events_filter.c triggered several warnings about file->filter being accessed directly even though it's annotated with __rcu. Add rcu_dereference() around it and shuffle the logic slightly so that it's always referenced via accessor functions. Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Link: https://lore.kernel.org/20250607102821.6c7effbf@gandalf.local.home Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent de6fdc0 commit 549e914

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

kernel/trace/trace_events_filter.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,9 @@ static void append_filter_err(struct trace_array *tr,
12501250

12511251
static inline struct event_filter *event_filter(struct trace_event_file *file)
12521252
{
1253-
return file->filter;
1253+
return rcu_dereference_protected(file->filter,
1254+
lockdep_is_held(&event_mutex));
1255+
12541256
}
12551257

12561258
/* caller must hold event_mutex */
@@ -1320,7 +1322,7 @@ void free_event_filter(struct event_filter *filter)
13201322
static inline void __remove_filter(struct trace_event_file *file)
13211323
{
13221324
filter_disable(file);
1323-
remove_filter_string(file->filter);
1325+
remove_filter_string(event_filter(file));
13241326
}
13251327

13261328
static void filter_free_subsystem_preds(struct trace_subsystem_dir *dir,
@@ -1405,7 +1407,7 @@ static void try_delay_free_filter(struct event_filter *filter)
14051407

14061408
static inline void __free_subsystem_filter(struct trace_event_file *file)
14071409
{
1408-
__free_filter(file->filter);
1410+
__free_filter(event_filter(file));
14091411
file->filter = NULL;
14101412
}
14111413

@@ -1465,7 +1467,7 @@ static void filter_free_subsystem_filters(struct trace_subsystem_dir *dir,
14651467
list_for_each_entry(file, &tr->events, list) {
14661468
if (file->system != dir || !file->filter)
14671469
continue;
1468-
__free_filter(file->filter);
1470+
__free_subsystem_filter(file);
14691471
}
14701472
__free_filter(filter);
14711473
}

0 commit comments

Comments
 (0)