sched/fair: Fix update min_vruntime in dequeue_entity()
PATCH 1/1 sched/fair: Fix update min_vruntime in dequeue_entity()
The comment and the code around 2nd update_min_vruntime() are not in agreement. From commit b60205c7c558 ("sched/fair: Fix min_vruntime tracking"), I think that we want to update min_vruntime when a task is sleeping/migrating. So, the check is inverted there.
--- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
@@ -4003,7 +4003,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)* put back on, and if we advance min_vruntime, we'll be placed back * further than we started -- ie. we'll be penalized. */ -if ((flags & (DEQUEUE_SAVE |DEQUEUE_MOVE )) ==DEQUEUE_SAVE ) +if ((flags & (DEQUEUE_SAVE |DEQUEUE_MOVE )) !=DEQUEUE_SAVE )update_min_vruntime (cfs_rq); }
Signature · 1 line
2.17.1
tip-bot for Song Muchun
merge bot[tip:sched/urgent] sched/fair: Fix the min_vruntime update logic in dequeue_entity()
sched/fair: Fix the min_vruntime update logic in dequeue_entity()
Commit-ID: 9845c49cc9bbb317a0bc9e9cf78d8e09d54c9af0 Gitweb: https://git.kernel.org/tip/9845c49cc9bbb317a0bc9e9cf78d8e09d54c9af0 Author: Song Muchun <[email protected]> AuthorDate: Sun, 14 Oct 2018 19:26:12 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 16 Oct 2018 09:36:01 +0200
sched/fair: Fix the min_vruntime update logic in dequeue_entity()
The comment and the code around the update_min_vruntime() call in dequeue_entity() are not in agreement.
From commit:
b60205c7c558 ("sched/fair: Fix min_vruntime tracking")
I think that we want to update min_vruntime when a task is sleeping/migrating. So, the check is inverted there - fix it.
--- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
@@ -4001,7 +4001,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)* put back on, and if we advance min_vruntime, we'll be placed back * further than we started -- ie. we'll be penalized. */ -if ((flags & (DEQUEUE_SAVE |DEQUEUE_MOVE )) ==DEQUEUE_SAVE ) +if ((flags & (DEQUEUE_SAVE |DEQUEUE_MOVE )) !=DEQUEUE_SAVE )update_min_vruntime (cfs_rq); }