OSDN Git Service

perf/core: Fix another perf,trace,cpuhp lock inversion
authorPeter Zijlstra <peterz@infradead.org>
Tue, 9 Jan 2018 16:07:59 +0000 (17:07 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 25 Jan 2018 13:48:30 +0000 (14:48 +0100)
commit43fa87f7deed52e8c8420182e0c133bc4cf395f6
treee756a62d69acc9e433cdc028df67c9e78dcbc2da
parent82d94856fa221b5173eefd56bcd1057c037e9b07
perf/core: Fix another perf,trace,cpuhp lock inversion

Lockdep noticed the following 3-way lockup race:

        perf_trace_init()
 #0       mutex_lock(&event_mutex)
          perf_trace_event_init()
            perf_trace_event_reg()
              tp_event->class->reg() := tracepoint_probe_register
 #1              mutex_lock(&tracepoints_mutex)
                  trace_point_add_func()
 #2                  static_key_enable()

 #2 do_cpu_up()
  perf_event_init_cpu()
 #3     mutex_lock(&pmus_lock)
 #4     mutex_lock(&ctx->mutex)

perf_ioctl()
 #4   ctx = perf_event_ctx_lock()
  _perf_iotcl()
    ftrace_profile_set_filter()
 #0       mutex_lock(&event_mutex)

Fudge it for now by noting that the tracepoint state does not depend
on the event <-> context relation. Ugly though :/

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/events/core.c