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

Commit cc87f76a authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 65cc8e48

kernel/sched.c

+6 −2
Original line number Diff line number Diff line
@@ -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))

	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)