From: Peter Zijlstra Date: Fri, 19 Dec 2025 08:04:45 +0000 (+0100) Subject: sched/fair: Fix sched_avg fold X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ab7973f254071faf20fe5fcc502a3fe9ca14a47;p=thirdparty%2Fkernel%2Flinux.git sched/fair: Fix sched_avg fold After the robot reported a regression wrt commit: 089d84203ad4 ("sched/fair: Fold the sched_avg update"), Shrikanth noted that two spots missed a factor se_weight(). Fixes: 089d84203ad4 ("sched/fair: Fold the sched_avg update") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202512181208.753b9f6e-lkp@intel.com Debugged-by: Shrikanth Hegde Signed-off-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20251218102020.GO3707891@noisy.programming.kicks-ass.net --- diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 76f5e4b78b306..7377f91175010 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3775,13 +3775,15 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se) static inline void enqueue_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) { - __update_sa(&cfs_rq->avg, load, se->avg.load_avg, se->avg.load_sum); + __update_sa(&cfs_rq->avg, load, se->avg.load_avg, + se_weight(se) * se->avg.load_sum); } static inline void dequeue_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) { - __update_sa(&cfs_rq->avg, load, -se->avg.load_avg, -se->avg.load_sum); + __update_sa(&cfs_rq->avg, load, -se->avg.load_avg, + se_weight(se) * -se->avg.load_sum); } static void place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags);