diff mbox

[RFC] sched: Fix min_vruntime calculation in dequeue_entity

Message ID 1305674470-23727-1-git-send-email-john.stultz@linaro.org
State Accepted
Commit 1e876231785d82443a5ac8b6c660e9f51bc5dede
Headers show

Commit Message

John Stultz May 17, 2011, 11:21 p.m. UTC 
From: Peter Zijlstra <peterz@infradead.org>

Peter had sent this patch out in response to a patch from Dima Zavin
<dima@android.com> which tried to address the following issue:

"After pulling the thread off the run-queue during a cgroup change,
the cfs_rq.min_vruntime gets recalculated. The dequeued thread's vruntime
then gets normalized to this new value. This can then lead to the thread
getting an unfair boost in the new group if the vruntime of the next
task in the old run-queue was way further ahead."

Peter suggested the following fix instead.

The full thread can be found here:
https://lkml.org/lkml/2010/11/20/34

While Dima never replied publicly, I bugged him a few weeks ago
and he said that this fix should address his original issue.

I just wanted to resend this patch out so the fix was not missed.

CC: Dima Zavin <dima@android.com>
CC: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 kernel/sched_fair.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 6fa833a..fb321dc 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1072,8 +1072,6 @@  dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	se->on_rq = 0;
 	update_cfs_load(cfs_rq, 0);
 	account_entity_dequeue(cfs_rq, se);
-	update_min_vruntime(cfs_rq);
-	update_cfs_shares(cfs_rq);
 
 	/*
 	 * Normalize the entity after updating the min_vruntime because the
@@ -1082,6 +1080,9 @@  dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	 */
 	if (!(flags & DEQUEUE_SLEEP))
 		se->vruntime -= cfs_rq->min_vruntime;
+
+	update_min_vruntime(cfs_rq);
+	update_cfs_shares(cfs_rq);
 }
 
 /*