sched: fix incorrect schedstats for rt and dl thread
Subsystems (2)
PATCH RESEND v2 1/1 sched: fix incorrect schedstats for rt and dl thread
For RT and DL thread, only 'set_next_task_(rt/dl)' will call 'update_stats_wait_end_(rt/dl)' to update schedstats information. However, during the migration process, 'update_stats_wait_start_(rt/dl)' will be called twice, which will cause the values of wait_max and wait_sum to be incorrect. The specific output as follows:
$ cat /proc/6046/task/6046/sched | grep wait wait_start : 0.000000 wait_max : 496717.080029 wait_sum : 7921540.776553
A complete schedstats information update flow of migrate should be __update_stats_wait_start() [enter queue A, stage 1] ->__update_stats_wait_end() [leave queue A, stage 2] ->__update_stats_wait_start() [enter queue B, stage 3] ->__update_stats_wait_end() [start running on queue B, stage 4]
Stage 1: prev_wait_start is 0, and in the end, wait_start records the time of entering the queue.
Stage 2: task_on_rq_migrating(p) is true, and wait_start is updated to the waiting time on queue A.
Stage 3: prev_wait_start is the waiting time on queue A, wait_start is the time of entering queue B, and wait_start is expected to be greater than prev_wait_start. Under this condition, wait_start is updated to (the moment of entering queue B) - (the waiting time on queue A). Stage 4: the final wait time = (time when starting to run on queue B)
- (time of entering queue B) + (waiting time on queue A) = waiting time on queue B + waiting time on queue A.
The current problem is that stage 2 does not call __update_stats_wait_end to update wait_start, which causes the final computed wait time = waiting time on queue B + the moment of entering queue A, leading to incorrect wait_max and wait_sum.
Add 'update_stats_wait_end_(rt/dl)' in 'update_stats_dequeue_(rt/dl)' to update schedstats information when dequeue_task.
---
v2: changes according to Peter's suggestions
1. add fix for dl class;
2. add more commit message to explain the reasons for the modifications.
--- kernel/sched/deadline.c | 4 ++++ kernel/sched/rt.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)
kernel/sched/deadline.c +4 -0
@@ -2115,10 +2115,14 @@ update_stats_dequeue_dl(struct dl_rq *dl_rq, struct sched_dl_entity *dl_se, int flags) {struct task_struct *p =dl_task_of (dl_se); +struct rq *rq =rq_of_dl_rq (dl_rq);if (!schedstat_enabled ())return ; +if (p != rq->curr) +update_stats_wait_end_dl (dl_rq, dl_se); +if ((flags &DEQUEUE_SLEEP )) {unsigned int state;
kernel/sched/rt.c +6 -1
@@ -1302,13 +1302,18 @@ update_stats_dequeue_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se, int flags) {struct task_struct *p =NULL ; +struct rq *rq =rq_of_rt_rq (rt_rq);if (!schedstat_enabled ())return ; -if (rt_entity_is_task (rt_se)) +if (rt_entity_is_task (rt_se)) { p =rt_task_of (rt_se); +if (p != rq->curr) +update_stats_wait_end_rt (rt_rq, rt_se); + } +if ((flags &DEQUEUE_SLEEP ) && p) {unsigned int state;
Signature · 1 line
2.43.0
[tip: sched/core] sched: Fix incorrect schedstats for rt and dl thread
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: c0e1832ba6dad7057acf3f485a87e0adccc23141 Gitweb: https://git.kernel.org/tip/c0e1832ba6dad7057acf3f485a87e0adccc23141 Author: Dengjun Su <[email protected]> AuthorDate: Wed, 04 Feb 2026 19:59:29 +08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 23 Feb 2026 18:04:11 +01:00
sched: Fix incorrect schedstats for rt and dl thread
For RT and DL thread, only 'set_next_task_(rt/dl)' will call 'update_stats_wait_end_(rt/dl)' to update schedstats information. However, during the migration process, 'update_stats_wait_start_(rt/dl)' will be called twice, which will cause the values of wait_max and wait_sum to be incorrect. The specific output as follows:
$ cat /proc/6046/task/6046/sched | grep wait wait_start : 0.000000 wait_max : 496717.080029 wait_sum : 7921540.776553
A complete schedstats information update flow of migrate should be __update_stats_wait_start() [enter queue A, stage 1] ->__update_stats_wait_end() [leave queue A, stage 2] ->__update_stats_wait_start() [enter queue B, stage 3] ->__update_stats_wait_end() [start running on queue B, stage 4]
Stage 1: prev_wait_start is 0, and in the end, wait_start records the time of entering the queue.
Stage 2: task_on_rq_migrating(p) is true, and wait_start is updated to the waiting time on queue A.
Stage 3: prev_wait_start is the waiting time on queue A, wait_start is the time of entering queue B, and wait_start is expected to be greater than prev_wait_start. Under this condition, wait_start is updated to (the moment of entering queue B) - (the waiting time on queue A). Stage 4: the final wait time = (time when starting to run on queue B)
- (time of entering queue B) + (waiting time on queue A) = waiting time on queue B + waiting time on queue A.
The current problem is that stage 2 does not call __update_stats_wait_end to update wait_start, which causes the final computed wait time = waiting time on queue B + the moment of entering queue A, leading to incorrect wait_max and wait_sum.
Add 'update_stats_wait_end_(rt/dl)' in 'update_stats_dequeue_(rt/dl)' to update schedstats information when dequeue_task.
--- kernel/sched/deadline.c | 4 ++++ kernel/sched/rt.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)
kernel/sched/deadline.c +4 -0
@@ -2142,10 +2142,14 @@ update_stats_dequeue_dl(struct dl_rq *dl_rq, struct sched_dl_entity *dl_se, int flags) {struct task_struct *p =dl_task_of (dl_se); +struct rq *rq =rq_of_dl_rq (dl_rq);if (!schedstat_enabled ())return ; +if (p != rq->curr) +update_stats_wait_end_dl (dl_rq, dl_se); +if ((flags &DEQUEUE_SLEEP )) {unsigned int state;
kernel/sched/rt.c +6 -1
@@ -1302,13 +1302,18 @@ update_stats_dequeue_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se, int flags) {struct task_struct *p =NULL ; +struct rq *rq =rq_of_rt_rq (rt_rq);if (!schedstat_enabled ())return ; -if (rt_entity_is_task (rt_se)) +if (rt_entity_is_task (rt_se)) { p =rt_task_of (rt_se); +if (p != rq->curr) +update_stats_wait_end_rt (rt_rq, rt_se); + } +if ((flags &DEQUEUE_SLEEP ) && p) {unsigned int state;