From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941663AbcIONBx (ORCPT ); Thu, 15 Sep 2016 09:01:53 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:52293 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935125AbcIOMzj (ORCPT ); Thu, 15 Sep 2016 08:55:39 -0400 Date: Thu, 15 Sep 2016 14:55:31 +0200 From: Peter Zijlstra To: Vincent Guittot Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, yuyang.du@intel.com, Morten.Rasmussen@arm.com, linaro-kernel@lists.linaro.org, dietmar.eggemann@arm.com, pjt@google.com, bsegall@google.com Subject: Re: [PATCH 4/7 v3] sched: propagate load during synchronous attach/detach Message-ID: <20160915125531.GP5008@twins.programming.kicks-ass.net> References: <1473666472-13749-1-git-send-email-vincent.guittot@linaro.org> <1473666472-13749-5-git-send-email-vincent.guittot@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1473666472-13749-5-git-send-email-vincent.guittot@linaro.org> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 12, 2016 at 09:47:49AM +0200, Vincent Guittot wrote: +/* Take into account change of utilization of a child task group */ > +static inline void > +update_tg_cfs_util(struct cfs_rq *cfs_rq, struct sched_entity *se) > +{ > + struct cfs_rq *gcfs_rq = group_cfs_rq(se); > + long delta = gcfs_rq->avg.util_avg - se->avg.util_avg; > + > + /* Nothing to update */ > + if (!delta) > + return; > + > + /* Set new sched_entity's utilizaton */ > + se->avg.util_avg = gcfs_rq->avg.util_avg; > + se->avg.util_sum = se->avg.util_avg * LOAD_AVG_MAX; > + > + /* Update parent cfs_rq utilization */ > + cfs_rq->avg.util_avg = max_t(long, cfs_rq->avg.util_avg + delta, 0); This.. > + cfs_rq->avg.util_sum = cfs_rq->avg.util_avg * LOAD_AVG_MAX; > +} > + > +/* Take into account change of load of a child task group */ > +static inline void > +update_tg_cfs_load(struct cfs_rq *cfs_rq, struct sched_entity *se) > +{ > + struct cfs_rq *gcfs_rq = group_cfs_rq(se); > + long delta, load = gcfs_rq->avg.load_avg; > + > + /* If the load of group cfs_rq is null, the load of the > + * sched_entity will also be null so we can skip the formula > + */ > + if (load) { > + long tg_load; > + > + /* Get tg's load and ensure tg_load > 0 */ > + tg_load = atomic_long_read(&gcfs_rq->tg->load_avg) + 1; > + > + /* Ensure tg_load >= load and updated with current load*/ > + tg_load -= gcfs_rq->tg_load_avg_contrib; > + tg_load += load; > + > + /* scale gcfs_rq's load into tg's shares*/ > + load *= scale_load_down(gcfs_rq->tg->shares); > + load /= tg_load; > + > + /* > + * we need to compute a correction term in the case that the > + * task group is consuming <1 cpu so that we would contribute > + * the same load as a task of equal weight. > + */ > + if (tg_load < scale_load_down(gcfs_rq->tg->shares)) { > + load *= tg_load; > + load /= scale_load_down(gcfs_rq->tg->shares); > + } > + } > + > + delta = load - se->avg.load_avg; > + > + /* Nothing to update */ > + if (!delta) > + return; > + > + /* Set new sched_entity's load */ > + se->avg.load_avg = load; > + se->avg.load_sum = se->avg.load_avg * LOAD_AVG_MAX; > + > + /* Update parent cfs_rq load */ > + cfs_rq->avg.load_avg = max_t(long, cfs_rq->avg.load_avg + delta, 0); And this.. > + cfs_rq->avg.load_sum = cfs_rq->avg.load_avg * LOAD_AVG_MAX; > +} Re-introduce the issue from: 897418922215 ("sched/fair: Fix cfs_rq avg tracking underflow").