From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751561AbcFXMf7 (ORCPT <rfc822;w@1wt.eu>);
	Fri, 24 Jun 2016 08:35:59 -0400
Received: from mail-vk0-f42.google.com ([209.85.213.42]:33841 "EHLO
	mail-vk0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751210AbcFXMf6 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 24 Jun 2016 08:35:58 -0400
MIME-Version: 1.0
In-Reply-To: <CAE4VaGA0HHD0prP9Xc7okro1qPkHtCdUMkKve0Gun8+yh+t2ag@mail.gmail.com>
References: <CAE4VaGDmCugUDS-fn9jz9UvBgGCZCp2nhENszrSVKr6t+0GnoQ@mail.gmail.com>
 <20160616172256.GJ30921@twins.programming.kicks-ass.net> <CAE4VaGCYvAbvNRD65SPfLPGVCspRfUYDAtfPt-VmkukPbt-L4Q@mail.gmail.com>
 <20160623183318.GN30154@twins.programming.kicks-ass.net> <20160623184318.GX30927@twins.programming.kicks-ass.net>
 <CAE4VaGBzNyhw58cASkQofCVaUHPUYrJ97_U8ymHMw7A9_0mjsg@mail.gmail.com>
 <20160624120250.GY30154@twins.programming.kicks-ass.net> <CAE4VaGA0HHD0prP9Xc7okro1qPkHtCdUMkKve0Gun8+yh+t2ag@mail.gmail.com>
From: Jirka Hladky <jhladky@redhat.com>
Date: Fri, 24 Jun 2016 14:35:56 +0200
Message-ID: <CAE4VaGDnmVijX5pY-1zdrdgB=EFqwiL8VOWqxGDn6scATb0L0A@mail.gmail.com>
Subject: Re: Kernel 4.7rc3 - Performance drop 30-40% for SPECjbb2005 and
 SPECjvm2008 benchmarks against 4.6 kernel
To: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
        Kamil Kolakowski <kkolakow@redhat.com>,
        Morten Rasmussen <morten.rasmussen@arm.com>,
        Yuyang Du <yuyang.du@intel.com>,
        Dietmar Eggemann <dietmar.eggemann@arm.com>,
        Vincent Guittot <vincent.guittot@linaro.org>,
        Mike Galbraith <umgwanakikbuti@gmail.com>, bsegall@google.com,
        pjt@google.com, matt@codeblueprint.co.uk
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

OK, I have applied to v4.7-rc4 via git am

Compiling kernel, should have the results soon.

Jirka

On Fri, Jun 24, 2016 at 2:09 PM, Jirka Hladky <jhladky@redhat.com> wrote:
> Thank you Peter!
>
> Should I apply it to v4.7-rc4 ?
>
> Jirka
>
> On Fri, Jun 24, 2016 at 2:02 PM, Peter Zijlstra <peterz@infradead.org> wrote:
>> On Fri, Jun 24, 2016 at 09:44:41AM +0200, Jirka Hladky wrote:
>>> Hi Peter,
>>>
>>> thanks a lot for looking into it!
>>>
>>> I have tried to disable autogroups
>>>
>>> sysctl -w kernel.sched_autogroup_enabled=0
>>>
>>> and I can confirm that performance is then back at level as in 4.6 kernel.
>>
>> So unless the heat has made me do really silly things, the below seems
>> to cure things. Could you please verify?
>>
>>
>> ---
>>  kernel/sched/fair.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> 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;
>>
>>         return tg_weight;
>>  }
>> @@ -2494,7 +2494,7 @@ static long calc_cfs_shares(struct cfs_rq *cfs_rq, struct task_group *tg)
>>         long tg_weight, load, shares;
>>
>>         tg_weight = calc_tg_weight(tg, cfs_rq);
>> -       load = cfs_rq->load.weight;
>> +       load = cfs_rq->avg.load_avg;
>>
>>         shares = (tg->shares * load);
>>         if (tg_weight)