Skip to contentSkip to conversation

sched: Fix nr_uninterruptible count

tip:sched/core tip-bot for Peter Zijlstra 1 participant 1 message Apr 2, 2010

lore
Share & tools
lore
#0 lore raw
Commit-ID:  cc87f76a601d2d256118f7bab15e35254356ae21
Gitweb:     http://git.kernel.org/tip/cc87f76a601d2d256118f7bab15e35254356ae21
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Fri, 26 Mar 2010 12:22:14 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 2 Apr 2010 20:12:04 +0200

sched: Fix nr_uninterruptible count

The cpuload calculation in calc_load_account_active() assumes rq->nr_uninterruptible will not change on an offline cpu after migrate_nr_uninterruptible(). However the recent migrate on wakeup changes broke that and would result in decrementing the offline cpu's rq->nr_uninterruptible.

Fix this by accounting the nr_uninterruptible on the waking cpu.

LKML-Reference: <new-submission>

---
 kernel/sched.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
kernel/sched.c +6 -2
index 51d336e..14c8d2a 100644
@@ -2378,8 +2378,12 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
 	 *
 	 * First fix up the nr_uninterruptible count:
 	 */
-	if (task_contributes_to_load(p))
-		rq->nr_uninterruptible--;
+	if (task_contributes_to_load(p)) {
+		if (likely(cpu_online(orig_cpu)))
+			rq->nr_uninterruptible--;
+		else
+			this_rq()->nr_uninterruptible--;
+	}
 	p->state = TASK_WAKING;
 
 	if (p->sched_class->task_waking)