From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751917AbcFXNd5 (ORCPT ); Fri, 24 Jun 2016 09:33:57 -0400 Received: from merlin.infradead.org ([205.233.59.134]:50855 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751900AbcFXNdz (ORCPT ); Fri, 24 Jun 2016 09:33:55 -0400 Date: Fri, 24 Jun 2016 15:33:47 +0200 From: Peter Zijlstra To: Vincent Guittot Cc: Jirka Hladky , linux-kernel , Ingo Molnar , Kamil Kolakowski , Morten Rasmussen , Yuyang Du , Dietmar Eggemann , Mike Galbraith , Benjamin Segall , Paul Turner , Matt Fleming Subject: Re: Kernel 4.7rc3 - Performance drop 30-40% for SPECjbb2005 and SPECjvm2008 benchmarks against 4.6 kernel Message-ID: <20160624133347.GA30154@twins.programming.kicks-ass.net> References: <20160616172256.GJ30921@twins.programming.kicks-ass.net> <20160623183318.GN30154@twins.programming.kicks-ass.net> <20160623184318.GX30927@twins.programming.kicks-ass.net> <20160624120250.GY30154@twins.programming.kicks-ass.net> <20160624130932.GA30909@twins.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 Fri, Jun 24, 2016 at 03:23:37PM +0200, Vincent Guittot wrote: > On 24 June 2016 at 15:09, Peter Zijlstra wrote: > > On Fri, Jun 24, 2016 at 02:44:07PM +0200, Vincent Guittot wrote: > > > >> > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > >> > index 22d64b3f5876..d4f6fb2f3057 100644 > >> > --- a/kernel/sched/fair.c > >> > +++ b/kernel/sched/fair.c > >> > @@ -2484,7 +2484,7 @@ static inline long calc_tg_weight(struct task_group *tg, struct cfs_rq *cfs_rq) > >> > */ > >> > tg_weight = atomic_long_read(&tg->load_avg); > >> > tg_weight -= cfs_rq->tg_load_avg_contrib; > >> > - tg_weight += cfs_rq->load.weight; > >> > + tg_weight += cfs_rq->avg.load_avg; > >> > >> IIUC, you are reverting > >> commit fde7d22e01aa (sched/fair: Fix overly small weight for > >> interactive group entities) > > > > Ah!, I hadn't yet done a git-blame on this. Right you are, we should > > have put a comment there. > > > > So the problem here is that since commit: > > > > 2159197d6677 ("sched/core: Enable increased load resolution on 64-bit kernels") > > > > load.weight and avg.load_avg are in different metrics. Which completely > > wrecked things. > > > > The obvious alternative is using: > > > > scale_load_down(cfs_rq->load.weight); > > > > Let me go run that through the benchmark. > > Yes, looks to be good alternative Does indeed also work. Let me go write a Changelog and try and magic it into sched/urgent.