Commit 06b1f808 authored Feb 16, 2015 by Frederic Weisbecker Committed by Ingo Molnar Feb 18, 2015

sched: Fix preempt_schedule_common() triggering tracing recursion



Since the function graph tracer needs to disable preemption, it might
call preempt_schedule() after reenabling  it if something triggered the
need for rescheduling in between.

Therefore we can't trace preempt_schedule() itself because we would
face a function tracing recursion otherwise as the tracer is always
called before PREEMPT_ACTIVE gets set to prevent that recursion. This is
why preempt_schedule() is tagged as "notrace".

But the same issue applies to every function called by preempt_schedule()
before PREEMPT_ACTIVE is actually set. And preempt_schedule_common() is
one such example. Unfortunately we forgot to tag it as notrace as well
and as a result we are encountering tracing recursion since it got
introduced by:

   a18b5d01 ("sched: Fix missing preemption opportunity")

Let's fix that by applying the appropriate function tag to
preempt_schedule_common().

Reported-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1424110807-15057-1-git-send-email-fweisbec@gmail.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent a79ec89f

kernel/sched/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2839,7 +2839,7 @@ void __sched schedule_preempt_disabled(void)
		preempt_disable();
		}

		static void preempt_schedule_common(void)
		static void __sched notrace preempt_schedule_common(void)
		{
		do {
		__preempt_count_add(PREEMPT_ACTIVE);