Skip to content

Commit 3d23ef0

Browse files
committed
Merge tag 'sched-urgent-2025-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Ingo Molnar: "Fix sporadic crashes in dequeue_entities() due to ... bad math. [ Arguably if pick_eevdf()/pick_next_entity() was less trusting of complex math being correct it could have de-escalated a crash into a warning, but that's for a different patch ]" * tag 'sched-urgent-2025-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/eevdf: Fix se->slice being set to U64_MAX and resulting crash
2 parents 86baa54 + bbce3de commit 3d23ef0

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

kernel/sched/fair.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7081,9 +7081,6 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags)
70817081
h_nr_idle = task_has_idle_policy(p);
70827082
if (task_sleep || task_delayed || !se->sched_delayed)
70837083
h_nr_runnable = 1;
7084-
} else {
7085-
cfs_rq = group_cfs_rq(se);
7086-
slice = cfs_rq_min_slice(cfs_rq);
70877084
}
70887085

70897086
for_each_sched_entity(se) {
@@ -7093,6 +7090,7 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags)
70937090
if (p && &p->se == se)
70947091
return -1;
70957092

7093+
slice = cfs_rq_min_slice(cfs_rq);
70967094
break;
70977095
}
70987096

0 commit comments

Comments
 (0)