Skip to contentSkip to conversation

tracing: Restore synchronize_rcu() before freeing trigger private data

PATCH In review David Carlier 4 participants 5 messages Jul 23 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tracing: Restore synchronize_rcu() before freeing trigger private data

Commit 61d445af0a7c ("tracing: Add bulk garbage collection of freeing event_trigger_data") moved the kfree() of event_trigger_data to a kthread that runs tracepoint_synchronize_unregister() before freeing. That removed the synchronize_rcu() the trigger .free callbacks used to get implicitly and inline from trigger_data_free().

event_hist_trigger_free(), event_hist_trigger_named_free() and event_enable_trigger_free() free their satellite data (hist_data, cmd_ops, enable_data) right after trigger_data_free() returns. With the synchronize now deferred to the kthread, a concurrent tracepoint handler can still reach that data through the list_del_rcu()'d trigger, causing a use-after-free.

The teardown must also stay synchronous for correctness: the histogram cleanup (remove_hist_vars(), unregister_field_var_hists()) has to detach a synthetic event from the histogram before the trigger-removal write returns. Deferring it lets a following command race in and fail the synthetic-event removal with -EBUSY, as caught by tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc.

Call synchronize_rcu() directly before freeing the satellite data instead.

Fixes 61d445af0a7c ("tracing: Add bulk garbage collection of freeing event_trigger_data")
---
 kernel/trace/trace_events_hist.c    | 3 +++
 kernel/trace/trace_events_trigger.c | 1 +
 2 files changed, 4 insertions(+)
kernel/trace/trace_events_hist.c +3 -0
index 82ce492ab268..ddd2f70dac4f 100644
@@ -6349,6 +6349,8 @@ static void event_hist_trigger_free(struct event_trigger_data *data)
 
 		trigger_data_free(data);
 
+		synchronize_rcu();
+
 		remove_hist_vars(hist_data);
 
 		unregister_field_var_hists(hist_data);
@@ -6388,6 +6390,7 @@ static void event_hist_trigger_named_free(struct event_trigger_data *data)
 
 		del_named_trigger(data);
 		trigger_data_free(data);
+		synchronize_rcu();
 		kfree(cmd_ops);
 	}
 }
kernel/trace/trace_events_trigger.c +1 -0
index 655db2e82513..c3f54f2540b6 100644
@@ -1730,6 +1730,7 @@ void event_enable_trigger_free(struct event_trigger_data *data)
 		trace_event_enable_disable(enable_data->file, 0, 1);
 		trace_event_put_ref(enable_data->file->event_call);
 		trigger_data_free(data);
+		synchronize_rcu();
 		kfree(enable_data);
 	}
 }
Signature · 1 line
2.53.0
maintainer
#1 lore raw
Quoted 10 lines · On Thu, 23 Jul 2026 18:02:12 +0100 David Carlier <[email protected]> wrote:
---
 kernel/trace/trace_events_hist.c    | 3 +++
 kernel/trace/trace_events_trigger.c | 1 +
 2 files changed, 4 insertions(+)
kernel/trace/trace_events_hist.c +0 -0
index 82ce492ab268..ddd2f70dac4f 100644

kernel/trace/trace_events_hist.c static void event_hist_trigger_free(struct event_trigger_data *data) · line 6352

Quoted 4 lines
kernel/trace/trace_events_hist.c +1 -0
@@ -6349,6 +6349,8 @@ static void event_hist_trigger_free(struct event_trigger_data *data)
 
 		trigger_data_free(data);
 
+		synchronize_rcu();

According to Sashiko[1], it appears we actually need tracepoint_synchronize_unregister(). And I believe Sashiko is actually correct.

kernel/trace/trace_events_hist.c static void event_hist_trigger_named_free(struct · line 6393

Quoted 9 lines
kernel/trace/trace_events_hist.c +2 -0
+
 		remove_hist_vars(hist_data);
 
 		unregister_field_var_hists(hist_data);
@@ -6388,6 +6390,7 @@ static void event_hist_trigger_named_free(struct
 event_trigger_data *data) 
 		del_named_trigger(data);
 		trigger_data_free(data);
+		synchronize_rcu();

This needs to be changed too.

kernel/trace/trace_events_hist.c void event_enable_trigger_free(struct · line 1733

Quoted 12 lines
kernel/trace/trace_events_hist.c +0 -0
 		kfree(cmd_ops);
 	}
 }
(quoted diff) +0 -0

b/kernel/trace/trace_events_trigger.c index 655db2e82513..c3f54f2540b6 100644 --- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c

kernel/trace/trace_events_hist.c +1 -0
@@ -1730,6 +1730,7 @@ void event_enable_trigger_free(struct
 event_trigger_data *data) trace_event_enable_disable(enable_data->file,
 0, 1); trace_event_put_ref(enable_data->file->event_call);
 		trigger_data_free(data);
+		synchronize_rcu();

According to Sashiko, this one basically causes a revert of the original delay.

OK, let's bring back a partial part of your original patch. Have the "free_private()" again, but only apply it to this trigger, and switch the above other to synchronize_rcu() into the tracepoint_synchronize_unregister().

Thanks,

-- Steve

kernel/trace/trace_events_trigger.c void event_enable_trigger_free(struct event_trigger_data *data) · line 1735

Quoted 2 lines
kernel/trace/trace_events_trigger.c +0 -0
 		kfree(enable_data);
 	}

[1] https://sashiko.dev/#/patchset/20260723170212.55325-1-devnexen%40gmail.com

#2 lore raw
In reply to David Carlier
Quoted 19 lines · On Thu, 23 Jul 2026 18:02:12 +0100 David Carlier <[email protected]> wrote:

Commit 61d445af0a7c ("tracing: Add bulk garbage collection of freeing event_trigger_data") moved the kfree() of event_trigger_data to a kthread that runs tracepoint_synchronize_unregister() before freeing. That removed the synchronize_rcu() the trigger .free callbacks used to get implicitly and inline from trigger_data_free().

event_hist_trigger_free(), event_hist_trigger_named_free() and event_enable_trigger_free() free their satellite data (hist_data, cmd_ops, enable_data) right after trigger_data_free() returns. With the synchronize now deferred to the kthread, a concurrent tracepoint handler can still reach that data through the list_del_rcu()'d trigger, causing a use-after-free.

The teardown must also stay synchronous for correctness: the histogram cleanup (remove_hist_vars(), unregister_field_var_hists()) has to detach a synthetic event from the histogram before the trigger-removal write returns. Deferring it lets a following command race in and fail the synthetic-event removal with -EBUSY, as caught by tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc.

Quoted 5 lines

Call synchronize_rcu() directly before freeing the satellite data instead.

Fixes 61d445af0a7c ("tracing: Add bulk garbage collection of freeing event_trigger_data")

Hi David,

Instead of adding just a synchronize_rcu(), can you reconsider to introduce .private_data_free() to event_trigger_data? I hit the same issue on wprobe and fixed it with ".private_free()" (I think private_data_free() is better naming)

https://patchwork.kernel.org/project/linux-trace-kernel/patch/178476144141.26117.8004746214529353062.stgit@devnote2/

Thank you,

Quoted 41 lines
---
 kernel/trace/trace_events_hist.c    | 3 +++
 kernel/trace/trace_events_trigger.c | 1 +
 2 files changed, 4 insertions(+)
kernel/trace/trace_events_hist.c +3 -0
index 82ce492ab268..ddd2f70dac4f 100644
@@ -6349,6 +6349,8 @@ static void event_hist_trigger_free(struct event_trigger_data *data)
 
 		trigger_data_free(data);
 
+		synchronize_rcu();
+
 		remove_hist_vars(hist_data);
 
 		unregister_field_var_hists(hist_data);
@@ -6388,6 +6390,7 @@ static void event_hist_trigger_named_free(struct event_trigger_data *data)
 
 		del_named_trigger(data);
 		trigger_data_free(data);
+		synchronize_rcu();
 		kfree(cmd_ops);
 	}
 }
kernel/trace/trace_events_trigger.c +1 -0
index 655db2e82513..c3f54f2540b6 100644
@@ -1730,6 +1730,7 @@ void event_enable_trigger_free(struct event_trigger_data *data)
 		trace_event_enable_disable(enable_data->file, 0, 1);
 		trace_event_put_ref(enable_data->file->event_call);
 		trigger_data_free(data);
+		synchronize_rcu();
 		kfree(enable_data);
 	}
 }
Signature · 1 line
2.53.0
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
maintainer
#3 lore raw
Quoted 6 lines · On Fri, 24 Jul 2026 06:33:15 +0900 Masami Hiramatsu (Google)…

Hi David,

Instead of adding just a synchronize_rcu(), can you reconsider to introduce .private_data_free() to event_trigger_data? I hit the same issue on wprobe and fixed it with ".private_free()" (I think private_data_free() is better naming)

You mean like this?

https://lore.kernel.org/all/[email protected]/

;-)

But yeah, David, can you send a v4 that renames private_free() to private_data_free()?

Thanks,

-- Steve

#4 lore raw

[ Resending with my [email protected], as gmail is being a prick ]

Quoted 22 lines · On Thu, 23 Jul 2026 19:18:46 -0400 Steven Rostedt <[email protected]> wrote:
Quoted 6 lines · On Fri, 24 Jul 2026 06:33:15 +0900 Masami Hiramatsu (Google)…

Hi David,

Instead of adding just a synchronize_rcu(), can you reconsider to introduce .private_data_free() to event_trigger_data? I hit the same issue on wprobe and fixed it with ".private_free()" (I think private_data_free() is better naming)

You mean like this?

https://lore.kernel.org/all/[email protected]/

;-)

But yeah, David, can you send a v4 that renames private_free() to private_data_free()?

Thanks,

-- Steve