Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5fc6611 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Ingo Molnar
Browse files

sched: Fix race in idle_balance()



The scheduler main function 'schedule()' checks if there are no more tasks
on the runqueue. Then it checks if a task should be pulled in the current
runqueue in idle_balance() assuming it will go to idle otherwise.

But idle_balance() releases the rq->lock in order to look up the sched
domains and takes the lock again right after. That opens a window where
another cpu may put a task in our runqueue, so we won't go to idle but
we have filled the idle_stamp, thinking we will.

This patch closes the window by checking if the runqueue has been modified
but without pulling a task after taking the lock again, so we won't go to idle
right after in the __schedule() function.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Cc: alex.shi@linaro.org
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1389949444-14821-2-git-send-email-daniel.lezcano@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b4f2ab43
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -6589,6 +6589,13 @@ void idle_balance(struct rq *this_rq)


	raw_spin_lock(&this_rq->lock);
	raw_spin_lock(&this_rq->lock);


	/*
	 * While browsing the domains, we released the rq lock.
	 * A task could have be enqueued in the meantime
	 */
	if (this_rq->nr_running && !pulled_task)
		return;

	if (pulled_task || time_after(jiffies, this_rq->next_balance)) {
	if (pulled_task || time_after(jiffies, this_rq->next_balance)) {
		/*
		/*
		 * We are going idle. next_balance may be set based on
		 * We are going idle. next_balance may be set based on