Skip to content

Commit 1151354

Browse files
author
Peter Zijlstra
committed
sched/deadline: Fix 'stuck' dl_server
Andrea reported the dl_server getting stuck for him. He tracked it down to a state where dl_server_start() saw dl_defer_running==1, but the dl_server's job is no longer valid at the time of dl_server_start(). In the state diagram this corresponds to [4] D->A (or dl_server_stop() due to no more runnable tasks) followed by [1], which in case of a lapsed deadline must then be A->B. Now our A has dl_defer_running==1, while B demands dl_defer_running==0, therefore it must get cleared when the CBS wakeup rules demand a replenish. Fixes: a110a81 ("sched/deadline: Deferrable dl server") Reported-by: Andrea Righi arighi@nvidia.com Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Juri Lelli <juri.lelli@redhat.com> Tested-by: Andrea Righi arighi@nvidia.com Link: https://lkml.kernel.org/r/20260123161645.2181752-1-arighi@nvidia.com Link: https://patch.msgid.link/20260130124100.GC1079264@noisy.programming.kicks-ass.net
1 parent 63804fe commit 1151354

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

kernel/sched/deadline.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,12 @@ static void update_dl_entity(struct sched_dl_entity *dl_se)
10341034
return;
10351035
}
10361036

1037+
/*
1038+
* When [4] D->A is followed by [1] A->B, dl_defer_running
1039+
* needs to be cleared, otherwise it will fail to properly
1040+
* start the zero-laxity timer.
1041+
*/
1042+
dl_se->dl_defer_running = 0;
10371043
replenish_dl_new_period(dl_se, rq);
10381044
} else if (dl_server(dl_se) && dl_se->dl_defer) {
10391045
/*
@@ -1655,6 +1661,12 @@ void dl_server_update(struct sched_dl_entity *dl_se, s64 delta_exec)
16551661
* dl_server_active = 1;
16561662
* enqueue_dl_entity()
16571663
* update_dl_entity(WAKEUP)
1664+
* if (dl_time_before() || dl_entity_overflow())
1665+
* dl_defer_running = 0;
1666+
* replenish_dl_new_period();
1667+
* // fwd period
1668+
* dl_throttled = 1;
1669+
* dl_defer_armed = 1;
16581670
* if (!dl_defer_running)
16591671
* dl_defer_armed = 1;
16601672
* dl_throttled = 1;

0 commit comments

Comments
 (0)