Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751762AbbHSRM6 (ORCPT ); Wed, 19 Aug 2015 13:12:58 -0400 Received: from casper.infradead.org ([85.118.1.10]:52699 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751257AbbHSRM5 (ORCPT ); Wed, 19 Aug 2015 13:12:57 -0400 Date: Wed, 19 Aug 2015 19:12:41 +0200 From: Peter Zijlstra To: byungchul.park@lge.com Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, yuyang.du@intel.com Subject: Re: [PATCH v3 4/5] sched: sync a se with its cfs_rq when switching sched class to fair class Message-ID: <20150819171241.GQ20948@worktop> References: <1439966836-11266-1-git-send-email-byungchul.park@lge.com> <1439966836-11266-5-git-send-email-byungchul.park@lge.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1439966836-11266-5-git-send-email-byungchul.park@lge.com> User-Agent: Mutt/1.5.22.1 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1445 Lines: 32 On Wed, Aug 19, 2015 at 03:47:15PM +0900, byungchul.park@lge.com wrote: > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index 1be042a..3419f6c 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -2711,6 +2711,17 @@ static inline void update_load_avg(struct sched_entity *se, int update_tg) > > static void attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) > { > + /* > + * in case of migration and cgroup-change, more care should be taken > + * because se's cfs_rq was changed, that means calling __update_load_avg > + * with new cfs_rq->avg.last_update_time is meaningless. so we skip the > + * update here. we have to update it with prev cfs_rq just before changing > + * se's cfs_rq, and get here soon. > + */ > + if (se->avg.last_update_time) > + __update_load_avg(cfs_rq->avg.last_update_time, cpu_of(rq_of(cfs_rq)), > + &se->avg, 0, 0, NULL); > + > se->avg.last_update_time = cfs_rq->avg.last_update_time; > cfs_rq->avg.load_avg += se->avg.load_avg; > cfs_rq->avg.load_sum += se->avg.load_sum; you seem to have forgotten to remove the same logic from enqueue_entity_load_avg(), which will now call __update_load_avg() twice. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/