Skip to content

Commit fecfcbc

Browse files
Vincent DonnefortPeter Zijlstra
authored andcommitted
sched/rt: Fix RT utilization tracking during policy change
RT keeps track of the utilization on a per-rq basis with the structure avg_rt. This utilization is updated during task_tick_rt(), put_prev_task_rt() and set_next_task_rt(). However, when the current running task changes its policy, set_next_task_rt() which would usually take care of updating the utilization when the rq starts running RT tasks, will not see a such change, leaving the avg_rt structure outdated. When that very same task will be dequeued later, put_prev_task_rt() will then update the utilization, based on a wrong last_update_time, leading to a huge spike in the RT utilization signal. The signal would eventually recover from this issue after few ms. Even if no RT tasks are run, avg_rt is also updated in __update_blocked_others(). But as the CPU capacity depends partly on the avg_rt, this issue has nonetheless a significant impact on the scheduler. Fix this issue by ensuring a load update when a running task changes its policy to RT. Fixes: 371bf42 ("sched/rt: Add rt_rq utilization tracking") Signed-off-by: Vincent Donnefort <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Vincent Guittot <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 2f064a5 commit fecfcbc

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

kernel/sched/rt.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,13 +2341,20 @@ void __init init_sched_rt_class(void)
23412341
static void switched_to_rt(struct rq *rq, struct task_struct *p)
23422342
{
23432343
/*
2344-
* If we are already running, then there's nothing
2345-
* that needs to be done. But if we are not running
2346-
* we may need to preempt the current running task.
2347-
* If that current running task is also an RT task
2344+
* If we are running, update the avg_rt tracking, as the running time
2345+
* will now on be accounted into the latter.
2346+
*/
2347+
if (task_current(rq, p)) {
2348+
update_rt_rq_load_avg(rq_clock_pelt(rq), rq, 0);
2349+
return;
2350+
}
2351+
2352+
/*
2353+
* If we are not running we may need to preempt the current
2354+
* running task. If that current running task is also an RT task
23482355
* then see if we can move to another run queue.
23492356
*/
2350-
if (task_on_rq_queued(p) && rq->curr != p) {
2357+
if (task_on_rq_queued(p)) {
23512358
#ifdef CONFIG_SMP
23522359
if (p->nr_cpus_allowed > 1 && rq->rt.overloaded)
23532360
rt_queue_push_tasks(rq);

0 commit comments

Comments
 (0)