]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sched/eevdf: Force propagating min_slice of cfs_rq when {en,de}queue tasks
authorTianchen Ding <dtcccc@linux.alibaba.com>
Tue, 11 Feb 2025 06:36:59 +0000 (14:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:10 +0000 (14:39 +0200)
[ Upstream commit 563bc2161b94571ea425bbe2cf69fd38e24cdedf ]

When a task is enqueued and its parent cgroup se is already on_rq, this
parent cgroup se will not be enqueued again, and hence the root->min_slice
leaves unchanged. The same issue happens when a task is dequeued and its
parent cgroup se has other runnable entities, and the parent cgroup se
will not be dequeued.

Force propagating min_slice when se doesn't need to be enqueued or
dequeued. Ensure the se hierarchy always get the latest min_slice.

Fixes: aef6987d8954 ("sched/eevdf: Propagate min_slice up the cgroup hierarchy")
Signed-off-by: Tianchen Ding <dtcccc@linux.alibaba.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20250211063659.7180-1-dtcccc@linux.alibaba.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/sched/fair.c

index 49e340f9fa71b453195394ac73b6e42d84f42e0e..ceb023629d48dd19ce9b9b0eb14a8d95981839e2 100644 (file)
@@ -7103,6 +7103,8 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
                update_cfs_group(se);
 
                se->slice = slice;
+               if (se != cfs_rq->curr)
+                       min_vruntime_cb_propagate(&se->run_node, NULL);
                slice = cfs_rq_min_slice(cfs_rq);
 
                cfs_rq->h_nr_running++;
@@ -7232,6 +7234,8 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags)
                update_cfs_group(se);
 
                se->slice = slice;
+               if (se != cfs_rq->curr)
+                       min_vruntime_cb_propagate(&se->run_node, NULL);
                slice = cfs_rq_min_slice(cfs_rq);
 
                cfs_rq->h_nr_running -= h_nr_running;