Commit 42740a2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched_urgent_for_v5.18_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Borislav Petkov:

 - Fix a corner case when calculating sched runqueue variables

That fix also removes a check for a zero divisor in the code, without
mentioning it.  Vincent clarified that it's ok after I whined about it:

  https://lore.kernel.org/all/CAKfTPtD2QEyZ6ADd5WrwETMOX0XOwJGnVddt7VHgfURdqgOS-Q@mail.gmail.com/

* tag 'sched_urgent_for_v5.18_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/pelt: Fix attach_entity_load_avg() corner case
parents 5206548f 40f5aa4c

kernel/sched/fair.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -3829,11 +3829,11 @@ static void attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *s 




	se->avg.runnable_sum = se->avg.runnable_avg * divider;

	se->avg.runnable_sum = se->avg.runnable_avg * divider;





	se->avg.load_sum = divider;

	se->avg.load_sum = se->avg.load_avg * divider;

	if (se_weight(se)) {

	if (se_weight(se) < se->avg.load_sum)

		se->avg.load_sum =

		se->avg.load_sum = div_u64(se->avg.load_sum, se_weight(se));

			div_u64(se->avg.load_avg * se->avg.load_sum, se_weight(se));

	else

	}

		se->avg.load_sum = 1;





	enqueue_load_avg(cfs_rq, se);

	enqueue_load_avg(cfs_rq, se);

	cfs_rq->avg.util_avg += se->avg.util_avg;

	cfs_rq->avg.util_avg += se->avg.util_avg;