Commit 96b3d28b authored by Fernando Luis Vazquez Cao's avatar Fernando Luis Vazquez Cao Committed by Ingo Molnar

sched/clock: Prevent tracing recursion in sched_clock_cpu()

Prevent tracing of preempt_disable/enable() in sched_clock_cpu().
When CONFIG_DEBUG_PREEMPT is enabled, preempt_disable/enable() are
traced and this causes trace_clock() users (and probably others) to
go into an infinite recursion. Systems with a stable sched_clock()
are not affected.

This problem is similar to that fixed by upstream commit 95ef1e52
("KVM guest: prevent tracing recursion with kvmclock").
Signed-off-by: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1394083528.4524.3.camel@nexusSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 177c53d9
...@@ -301,14 +301,14 @@ u64 sched_clock_cpu(int cpu) ...@@ -301,14 +301,14 @@ u64 sched_clock_cpu(int cpu)
if (unlikely(!sched_clock_running)) if (unlikely(!sched_clock_running))
return 0ull; return 0ull;
preempt_disable(); preempt_disable_notrace();
scd = cpu_sdc(cpu); scd = cpu_sdc(cpu);
if (cpu != smp_processor_id()) if (cpu != smp_processor_id())
clock = sched_clock_remote(scd); clock = sched_clock_remote(scd);
else else
clock = sched_clock_local(scd); clock = sched_clock_local(scd);
preempt_enable(); preempt_enable_notrace();
return clock; return clock;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment