Commit 00cc1633 authored Sep 18, 2015 by Dominik Dingel Committed by Paolo Bonzini Sep 18, 2015

sched: access local runqueue directly in single_task_running



Commit 2ee507c4 ("sched: Add function single_task_running to let a task
check if it is the only task running on a cpu") referenced the current
runqueue with the smp_processor_id.  When CONFIG_DEBUG_PREEMPT is enabled,
that is only allowed if preemption is disabled or the currrent task is
bound to the local cpu (e.g. kernel worker).

With commit f7819512 ("kvm: add halt_poll_ns module parameter") KVM
calls single_task_running. If CONFIG_DEBUG_PREEMPT is enabled that
generates a lot of kernel messages.

To avoid adding preemption in that cases, as it would limit the usefulness,
we change single_task_running to access directly the cpu local runqueue.

Cc: Tim Chen <tim.c.chen@linux.intel.com>
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Fixes: 2ee507c4
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent efe4d36a

kernel/sched/core.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -2666,13 +2666,20 @@ unsigned long nr_running(void)

		/*
		* Check if only the current task is running on the cpu.
		*
		* Caution: this function does not check that the caller has disabled
		* preemption, thus the result might have a time-of-check-to-time-of-use
		* race. The caller is responsible to use it correctly, for example:
		*
		* - from a non-preemptable section (of course)
		*
		* - from a thread that is bound to a single CPU
		*
		* - in a loop with very short iterations (e.g. a polling loop)
		*/
		bool single_task_running(void)
		{
		if (cpu_rq(smp_processor_id())->nr_running == 1)
		return true;
		else
		return false;
		return raw_rq()->nr_running == 1;
		}
		EXPORT_SYMBOL(single_task_running);

Admin message