diff options
author | Yiwei Lin <s921975628@gmail.com> | 2023-11-17 16:01:06 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-25 15:35:14 -0800 |
commit | 20c09814782b5a174fd3388611f8f4a4784c9eba (patch) | |
tree | 672359811defdd8b0d2835438b533f0612baf30a /kernel | |
parent | 024352f7928b28f53609660663329d8c0f4ad032 (diff) | |
download | linux-stable-20c09814782b5a174fd3388611f8f4a4784c9eba.tar.gz linux-stable-20c09814782b5a174fd3388611f8f4a4784c9eba.tar.bz2 linux-stable-20c09814782b5a174fd3388611f8f4a4784c9eba.zip |
sched/fair: Update min_vruntime for reweight_entity() correctly
[ Upstream commit 5068d84054b766efe7c6202fc71b2350d1c326f1 ]
Since reweight_entity() may have chance to change the weight of
cfs_rq->curr entity, we should also update_min_vruntime() if
this is the case
Fixes: eab03c23c2a1 ("sched/eevdf: Fix vruntime adjustment on reweight")
Signed-off-by: Yiwei Lin <s921975628@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Abel Wu <wuyun.abel@bytedance.com>
Link: https://lore.kernel.org/r/20231117080106.12890-1-s921975628@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched/fair.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index fa9fff0f9620..d336af9cba13 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3771,17 +3771,17 @@ static void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, enqueue_load_avg(cfs_rq, se); if (se->on_rq) { update_load_add(&cfs_rq->load, se->load.weight); - if (!curr) { - /* - * The entity's vruntime has been adjusted, so let's check - * whether the rq-wide min_vruntime needs updated too. Since - * the calculations above require stable min_vruntime rather - * than up-to-date one, we do the update at the end of the - * reweight process. - */ + if (!curr) __enqueue_entity(cfs_rq, se); - update_min_vruntime(cfs_rq); - } + + /* + * The entity's vruntime has been adjusted, so let's check + * whether the rq-wide min_vruntime needs updated too. Since + * the calculations above require stable min_vruntime rather + * than up-to-date one, we do the update at the end of the + * reweight process. + */ + update_min_vruntime(cfs_rq); } } |