Commit a82274151af "tracing: Protect ftrace_trace_arrays list in trace_events.c" added taking the trace_types_lock mutex in trace_events.c as there were several locations that needed it for protection. Unfortunately, it also encapsulated a call to tracing_reset_all_online_cpus() which also takes the trace_types_lock, causing a deadlock. This happens when a module has tracepoints and has been traced. When the module is removed, the trace events module notifier will grab the trace_types_lock, do a bunch of clean ups, and also clears the buffer by calling tracing_reset_all_online_cpus. This doesn't happen often which explains why it wasn't caught right away. Commit a82274151af was marked for stable, which means this must be sent to stable too. Link: http://lkml.kernel.org/r/51EEC646.7070306@broadcom.com
Showing the changes to kernel/trace (1 of 1 file). Show all
Unified · Split
| @@ -1224,18 +1224,17 @@ void tracing_reset_current(int cpu) · 1223 unmodified lines | ||
| 1224 | 1224 | tracing_reset(&global_trace.trace_buffer, cpu); |
| 1225 | 1225 | } |
| 1226 | 1226 | |
| 1227 | +/* Must have trace_types_lock held */ | |
| 1227 | 1228 | void tracing_reset_all_online_cpus(void) |
| 1228 | 1229 | { |
| 1229 | 1230 | struct trace_array *tr; |
| 1230 | 1231 | |
| 1231 | − mutex_lock(&trace_types_lock); | |
| 1232 | 1232 | list_for_each_entry(tr, &ftrace_trace_arrays, list) { |
| 1233 | 1233 | tracing_reset_online_cpus(&tr->trace_buffer); |
| 1234 | 1234 | #ifdef CONFIG_TRACER_MAX_TRACE |
| 1235 | 1235 | tracing_reset_online_cpus(&tr->max_buffer); |
| 1236 | 1236 | #endif |
| 1237 | 1237 | } |
| 1238 | − mutex_unlock(&trace_types_lock); | |
| 1239 | 1238 | } |
| 1240 | 1239 | |
| 1241 | 1240 | #define SAVED_CMDLINES 128 |