All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: peterz@infradead.org, mingo@kernel.org
Cc: linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org,
	alex.shi@linaro.org
Subject: [PATCH 2/4] sched: Fix race in idle_balance()
Date: Fri, 17 Jan 2014 10:04:02 +0100	[thread overview]
Message-ID: <1389949444-14821-2-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1389949444-14821-1-git-send-email-daniel.lezcano@linaro.org>

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 the idle_balance() releases the rq->lock in order to lookup in 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: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 kernel/sched/fair.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index d601df3..502c51c 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6417,6 +6417,13 @@ void idle_balance(struct rq *this_rq)
 
 	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)) {
 		/*
 		 * We are going idle. next_balance may be set based on
-- 
1.7.9.5


  reply	other threads:[~2014-01-17  9:04 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-17  9:04 [PATCH 1/4] sched: Remove 'cpu' parameter for idle_balance() Daniel Lezcano
2014-01-17  9:04 ` Daniel Lezcano [this message]
2014-01-17 13:33   ` [PATCH 2/4] sched: Fix race in idle_balance() Peter Zijlstra
2014-01-17 13:44     ` Daniel Lezcano
2014-02-11 12:15   ` [tip:sched/core] " tip-bot for Daniel Lezcano
2014-01-17  9:04 ` [PATCH 3/4] sched: Move idle_stamp up to the core Daniel Lezcano
2014-02-11 12:16   ` [tip:sched/core] sched: Move rq->idle_stamp " tip-bot for Daniel Lezcano
2014-01-17  9:04 ` [PATCH 4/4] sched: Idle task shortcut optimization Daniel Lezcano
2014-01-17 14:09   ` Peter Zijlstra
2014-01-17 15:09     ` Daniel Lezcano
2014-01-17 15:23       ` Peter Zijlstra
2014-01-17 14:26   ` Peter Zijlstra
2014-01-17 15:06     ` Daniel Lezcano
2014-01-17 15:23       ` Peter Zijlstra
2014-01-17 15:26         ` Daniel Lezcano
2014-01-17 15:33           ` Peter Zijlstra
2014-01-17 16:06             ` Daniel Lezcano
2014-01-17 16:37             ` Daniel Lezcano
2014-01-17 16:45               ` [PATCH 1/2] sched/deadline: Fix compilation error Daniel Lezcano
2014-01-17 16:45                 ` [PATCH 2/2] sched: Use idle task shortcut Daniel Lezcano
2014-01-21  8:41             ` [PATCH 4/4] sched: Idle task shortcut optimization Daniel Lezcano
2014-01-21  9:06               ` Peter Zijlstra
2014-01-21  9:28                 ` Daniel Lezcano
2014-02-11 12:15 ` [tip:sched/core] sched: Remove 'cpu' parameter from idle_balance( ) tip-bot for Daniel Lezcano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389949444-14821-2-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=alex.shi@linaro.org \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.