Commit 3d23ef05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 86baa549 bbce3de7

kernel/sched/fair.c

+1 −3
Original line number Diff line number Diff line
@@ -7081,9 +7081,6 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags) 
		h_nr_idle = task_has_idle_policy(p);

		if (task_sleep || task_delayed || !se->sched_delayed)

			h_nr_runnable = 1;

	} else {

		cfs_rq = group_cfs_rq(se);

		slice = cfs_rq_min_slice(cfs_rq);

	}



	for_each_sched_entity(se) {
@@ -7093,6 +7090,7 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags) 
			if (p && &p->se == se)

				return -1;



			slice = cfs_rq_min_slice(cfs_rq);

			break;

		}