]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
tracing: Remove locking trace_types_lock from tracing_reset_all_online_cpus()
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>
Wed, 24 Jul 2013 02:21:59 +0000 (22:21 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Fri, 26 Jul 2013 12:57:32 +0000 (08:57 -0400)
commit09d8091c024ec88d1541d93eb8ddb2bd5cf10c39
tree170740cc6580d2d397744006f4c3ec545aea497f
parent195a8afc7ac962f8da795549fe38e825f1372b0d
tracing: Remove locking trace_types_lock from tracing_reset_all_online_cpus()

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
Reported-by: Arend van Spril <arend@broadcom.com>
Tested-by: Arend van Spriel <arend@broadcom.com>
Cc: Alexander Z Lam <azl@google.com>
Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
Cc: David Sharp <dhsharp@google.com>
Cc: stable@vger.kernel.org # 3.10
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/trace/trace.c