From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: [PATCH] tracing/filters: Use atomic bitops and READ_ONCE() for trace_event_file::flags
Date: Sun, 22 Nov 2026 16:17:26 +0900 [thread overview]
Message-ID: <179533184612.139632.4029978219979965754.stgit@devnote2> (raw)
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
syzbot reported a KCSAN data race on struct trace_event_file::flags
between filter_disable() and __trace_trigger_soft_disabled():
BUG: KCSAN: data-race in __trace_trigger_soft_disabled /
apply_subsystem_event_filter
write to 0xffff888100172888 of 8 bytes by task 5433 on cpu 0:
filter_disable [inline]
process_system_preds [inline]
create_system_filter [inline]
apply_subsystem_event_filter+0x28f/0xcd0
subsystem_filter_write+0x79/0xd0
read to 0xffff888100172888 of 8 bytes by task 5440 on cpu 1:
__trace_trigger_soft_disabled+0x20/0x1a0
trace_trigger_soft_disabled [inline]
filter_disable() and event_set_filtered_flag() update
EVENT_FILE_FL_FILTERED using non-atomic read-modify-write operations on
file->flags and compare old_flags != file->flags to decide whether to
call trace_buffered_event_disable() / trace_buffered_event_enable().
Because other bits in file->flags (such as
EVENT_FILE_FL_SOFT_DISABLED_BIT from event enable/disable triggers) can
be modified concurrently without event_mutex using atomic bitops, the
non-atomic RMW can lose concurrent bit updates or misdetect a flag
transition and unbalance the buffered event refcount.
Use test_and_clear_bit() / test_and_set_bit() on
EVENT_FILE_FL_FILTERED_BIT in filter_disable() and
event_set_filtered_flag(), and use READ_ONCE() / test_bit() for lockless
readers of file->flags in the trace event fast paths.
Reported-by: syzbot+1faa12be48036b80e416@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/all/6b0234dc.44b41460.34b83f.0019.GAE@google.com
Fixes: 0fc1b09ff1ff ("tracing: Use temp buffer when filtering events")
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
---
include/linux/trace_events.h | 2 +-
kernel/trace/trace.c | 7 ++++---
kernel/trace/trace.h | 18 ++++++++++--------
kernel/trace/trace_events.c | 2 +-
kernel/trace/trace_events_filter.c | 12 ++----------
kernel/trace/trace_events_trigger.c | 5 +++--
6 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 5cbd09c8be8d..3cd719d9f497 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -764,7 +764,7 @@ bool __trace_trigger_soft_disabled(struct trace_event_file *file);
static __always_inline bool
trace_trigger_soft_disabled(struct trace_event_file *file)
{
- unsigned long eflags = file->flags;
+ unsigned long eflags = READ_ONCE(file->flags);
if (likely(!(eflags & (EVENT_FILE_FL_TRIGGER_MODE |
EVENT_FILE_FL_SOFT_DISABLED |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index e4a490d3d08c..00b161fa8a9b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1868,7 +1868,8 @@ trace_event_buffer_lock_reserve(struct trace_buffer **current_rb,
*current_rb = tr->array_buffer.buffer;
if (!tr->no_filter_buffering_ref &&
- (trace_file->flags & (EVENT_FILE_FL_SOFT_DISABLED | EVENT_FILE_FL_FILTERED))) {
+ (READ_ONCE(trace_file->flags) &
+ (EVENT_FILE_FL_SOFT_DISABLED | EVENT_FILE_FL_FILTERED))) {
preempt_disable_notrace();
/*
* Filtering is on, so try to use the per cpu buffer first.
@@ -1929,7 +1930,7 @@ trace_event_buffer_lock_reserve(struct trace_buffer **current_rb,
* to store the trace event for the trigger to use. It's recursive
* safe and will not be recorded anywhere.
*/
- if (!entry && trace_file->flags & EVENT_FILE_FL_TRIGGER_COND) {
+ if (!entry && (READ_ONCE(trace_file->flags) & EVENT_FILE_FL_TRIGGER_COND)) {
*current_rb = temp_buffer;
entry = __trace_buffer_lock_reserve(*current_rb, type, len,
trace_ctx);
@@ -1960,7 +1961,7 @@ static void output_printk(struct trace_event_buffer *fbuffer)
file = fbuffer->trace_file;
if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) ||
- (unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&
+ (unlikely(test_bit(EVENT_FILE_FL_FILTERED_BIT, &file->flags)) &&
!filter_match_preds(file->filter, fbuffer->entry)))
return;
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 3749485a7d85..42551c50872c 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1732,24 +1732,26 @@ __event_trigger_test_discard(struct trace_event_file *file,
void *entry,
enum event_trigger_type *tt)
{
- unsigned long eflags = file->flags;
+ unsigned long eflags = READ_ONCE(file->flags);
- if (eflags & EVENT_FILE_FL_TRIGGER_COND)
+ if (eflags & EVENT_FILE_FL_TRIGGER_COND) {
*tt = event_triggers_call(file, buffer, entry, event);
+ eflags = READ_ONCE(file->flags);
+ }
- if (likely(!(file->flags & (EVENT_FILE_FL_SOFT_DISABLED |
- EVENT_FILE_FL_FILTERED |
- EVENT_FILE_FL_PID_FILTER))))
+ if (likely(!(eflags & (EVENT_FILE_FL_SOFT_DISABLED |
+ EVENT_FILE_FL_FILTERED |
+ EVENT_FILE_FL_PID_FILTER))))
return false;
- if (file->flags & EVENT_FILE_FL_SOFT_DISABLED)
+ if (eflags & EVENT_FILE_FL_SOFT_DISABLED)
goto discard;
- if (file->flags & EVENT_FILE_FL_FILTERED &&
+ if (eflags & EVENT_FILE_FL_FILTERED &&
!filter_match_preds(file->filter, entry))
goto discard;
- if ((file->flags & EVENT_FILE_FL_PID_FILTER) &&
+ if ((eflags & EVENT_FILE_FL_PID_FILTER) &&
trace_event_ignore_this_pid(file))
goto discard;
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 30c0ddf90887..7a8d1e6e53e0 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -698,7 +698,7 @@ void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,
{
struct trace_event_call *event_call = trace_file->event_call;
- if ((trace_file->flags & EVENT_FILE_FL_PID_FILTER) &&
+ if (test_bit(EVENT_FILE_FL_PID_FILTER_BIT, &trace_file->flags) &&
trace_event_ignore_this_pid(trace_file))
return NULL;
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 2b46ca536045..ff5eba48b560 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1297,11 +1297,7 @@ static void free_prog(struct event_filter *filter)
static void filter_disable(struct trace_event_file *file)
{
- unsigned long old_flags = file->flags;
-
- file->flags &= ~EVENT_FILE_FL_FILTERED;
-
- if (old_flags != file->flags)
+ if (test_and_clear_bit(EVENT_FILE_FL_FILTERED_BIT, &file->flags))
trace_buffered_event_disable();
}
@@ -2242,11 +2238,7 @@ static int process_preds(struct trace_event_call *call,
static inline void event_set_filtered_flag(struct trace_event_file *file)
{
- unsigned long old_flags = file->flags;
-
- file->flags |= EVENT_FILE_FL_FILTERED;
-
- if (old_flags != file->flags)
+ if (!test_and_set_bit(EVENT_FILE_FL_FILTERED_BIT, &file->flags))
trace_buffered_event_enable();
}
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 4d2fde996c0f..190f8d27956e 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -214,7 +214,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
bool __trace_trigger_soft_disabled(struct trace_event_file *file)
{
- unsigned long eflags = file->flags;
+ unsigned long eflags = READ_ONCE(file->flags);
if (eflags & EVENT_FILE_FL_TRIGGER_MODE)
event_triggers_call(file, NULL, NULL, NULL);
@@ -1690,7 +1690,8 @@ event_enable_count_func(struct event_trigger_data *data,
return false;
/* Skip if the event is in a state we want to switch to */
- if (enable_data->enable == !(enable_data->file->flags & EVENT_FILE_FL_SOFT_DISABLED))
+ if (enable_data->enable == !test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT,
+ &enable_data->file->flags))
return false;
if (data->count != -1)
reply other threads:[~2026-11-22 7:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=179533184612.139632.4029978219979965754.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=rostedt@goodmis.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
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
all inboxes | Powered by JetHome®