projects/linux·commit 65bfd707

Merge tag 'sched-urgent-2026-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

65bfd707 · Linus Torvalds <[email protected]> · 2026-08-02 11:39:10 -07:00

Pull scheduler fix from Ingo Molnar:

 - Fix wakeups of deferred DL servers to be actually deferred (Gabriele
   Monaco)

* tag 'sched-urgent-2026-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/deadline: Use revised wakeup rule only for running dl_server
Commit
65bfd707fd9807586b970bdad85fc23c83b65521
Parents
e1f05cd3 · 1842bf97

Merge commit. Changes below are compared with the first parent: e1f05cd3.

Changes

1 files changed · +2 −1

FileStatusAddDelContent
kernel/sched/deadline.cmodified+2−1View file

kernel/sched/deadline.c

View file
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index 0f858b9..2003000 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -1017,7 +1017,8 @@ static void update_dl_entity(struct sched_dl_entity *dl_se)
if (dl_time_before(dl_se->deadline, rq_clock(rq)) ||
dl_entity_overflow(dl_se, rq_clock(rq))) {
- if (unlikely((!dl_is_implicit(dl_se) || dl_se->dl_defer) &&
+ if (unlikely((!dl_is_implicit(dl_se) ||
+ (dl_se->dl_defer && dl_se->dl_defer_running)) &&
!dl_time_before(dl_se->deadline, rq_clock(rq)) &&
!is_dl_boosted(dl_se))) {
update_dl_revised_wakeup(dl_se, rq);