Skip to content

Commit dea4997

Browse files
Zheng Yejianrostedt
authored andcommitted
tracing: Fix warning in trace_buffered_event_disable()
Warning happened in trace_buffered_event_disable() at WARN_ON_ONCE(!trace_buffered_event_ref) Call Trace: ? __warn+0xa5/0x1b0 ? trace_buffered_event_disable+0x189/0x1b0 __ftrace_event_enable_disable+0x19e/0x3e0 free_probe_data+0x3b/0xa0 unregister_ftrace_function_probe_func+0x6b8/0x800 event_enable_func+0x2f0/0x3d0 ftrace_process_regex.isra.0+0x12d/0x1b0 ftrace_filter_write+0xe6/0x140 vfs_write+0x1c9/0x6f0 [...] The cause of the warning is in __ftrace_event_enable_disable(), trace_buffered_event_enable() was called once while trace_buffered_event_disable() was called twice. Reproduction script show as below, for analysis, see the comments: ``` #!/bin/bash cd /sys/kernel/tracing/ # 1. Register a 'disable_event' command, then: # 1) SOFT_DISABLED_BIT was set; # 2) trace_buffered_event_enable() was called first time; echo 'cmdline_proc_show:disable_event:initcall:initcall_finish' > \ set_ftrace_filter # 2. Enable the event registered, then: # 1) SOFT_DISABLED_BIT was cleared; # 2) trace_buffered_event_disable() was called first time; echo 1 > events/initcall/initcall_finish/enable # 3. Try to call into cmdline_proc_show(), then SOFT_DISABLED_BIT was # set again!!! cat /proc/cmdline # 4. Unregister the 'disable_event' command, then: # 1) SOFT_DISABLED_BIT was cleared again; # 2) trace_buffered_event_disable() was called second time!!! echo '!cmdline_proc_show:disable_event:initcall:initcall_finish' > \ set_ftrace_filter ``` To fix it, IIUC, we can change to call trace_buffered_event_enable() at fist time soft-mode enabled, and call trace_buffered_event_disable() at last time soft-mode disabled. Link: https://lore.kernel.org/linux-trace-kernel/[email protected] Cc: <[email protected]> Fixes: 0fc1b09 ("tracing: Use temp buffer when filtering events") Signed-off-by: Zheng Yejian <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 800959e commit dea4997

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

kernel/trace/trace_events.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
611611
{
612612
struct trace_event_call *call = file->event_call;
613613
struct trace_array *tr = file->tr;
614-
unsigned long file_flags = file->flags;
615614
int ret = 0;
616615
int disable;
617616

@@ -635,6 +634,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
635634
break;
636635
disable = file->flags & EVENT_FILE_FL_SOFT_DISABLED;
637636
clear_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags);
637+
/* Disable use of trace_buffered_event */
638+
trace_buffered_event_disable();
638639
} else
639640
disable = !(file->flags & EVENT_FILE_FL_SOFT_MODE);
640641

@@ -673,6 +674,8 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
673674
if (atomic_inc_return(&file->sm_ref) > 1)
674675
break;
675676
set_bit(EVENT_FILE_FL_SOFT_MODE_BIT, &file->flags);
677+
/* Enable use of trace_buffered_event */
678+
trace_buffered_event_enable();
676679
}
677680

678681
if (!(file->flags & EVENT_FILE_FL_ENABLED)) {
@@ -712,15 +715,6 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
712715
break;
713716
}
714717

715-
/* Enable or disable use of trace_buffered_event */
716-
if ((file_flags & EVENT_FILE_FL_SOFT_DISABLED) !=
717-
(file->flags & EVENT_FILE_FL_SOFT_DISABLED)) {
718-
if (file->flags & EVENT_FILE_FL_SOFT_DISABLED)
719-
trace_buffered_event_enable();
720-
else
721-
trace_buffered_event_disable();
722-
}
723-
724718
return ret;
725719
}
726720

0 commit comments

Comments
 (0)