Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753207AbbHTVN3 (ORCPT ); Thu, 20 Aug 2015 17:13:29 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:55901 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038AbbHTVN2 (ORCPT ); Thu, 20 Aug 2015 17:13:28 -0400 Date: Thu, 20 Aug 2015 23:13:23 +0200 From: Peter Zijlstra To: Yuyang Du Cc: byungchul.park@lge.com, mingo@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 4/5] sched: sync a se with its cfs_rq when switching sched class to fair class Message-ID: <20150820211323.GD3161@worktop.event.rightround.com> References: <1439966836-11266-1-git-send-email-byungchul.park@lge.com> <1439966836-11266-5-git-send-email-byungchul.park@lge.com> <20150819171241.GQ20948@worktop> <20150819201106.GA27777@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150819201106.GA27777@intel.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: 2155 Lines: 53 On Thu, Aug 20, 2015 at 04:11:06AM +0800, Yuyang Du wrote: > On Wed, Aug 19, 2015 at 07:12:41PM +0200, Peter Zijlstra wrote: > > 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. > > In case of enqueue_entity_load_avg(), that seems to be ok. > > However, the problem is that he made it "entangled": > > In enqueue_entity_load_avg(): > > if (migrated) > attach_entity_load_avg(); > > while in attach_entity_load_avg(): > > if (!migrated) > __update_load_avg(); > > so, if attach() is called from enqueue(), that if() is never true. Right, I noticed the same yesterday when I took a second look at that stuff. It was a little confusing indeed. -- 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/