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 S932931AbcDHMze (ORCPT <rfc822;w@1wt.eu>);
	Fri, 8 Apr 2016 08:55:34 -0400
Received: from mail-wm0-f53.google.com ([74.125.82.53]:38550 "EHLO
	mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932765AbcDHMz1 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 8 Apr 2016 08:55:27 -0400
Date: Fri, 8 Apr 2016 14:55:22 +0200
From: Frederic Weisbecker <fweisbec@gmail.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
        Byungchul Park <byungchul.park@lge.com>,
        Chris Metcalf <cmetcalf@ezchip.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Luiz Capitulino <lcapitulino@redhat.com>,
        Christoph Lameter <cl@linux.com>,
        "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>,
        Mike Galbraith <efault@gmx.de>, Rik van Riel <riel@redhat.com>,
        Ingo Molnar <mingo@elte.hu>
Subject: Re: [PATCH 3/3] sched: Optimize !CONFIG_NO_HZ_COMMON cpu load updates
Message-ID: <20160408125521.GC24956@lerouge>
References: <1460077633-23431-1-git-send-email-fweisbec@gmail.com>
 <1460077633-23431-4-git-send-email-fweisbec@gmail.com>
 <20160408104821.GM3448@twins.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160408104821.GM3448@twins.programming.kicks-ass.net>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Apr 08, 2016 at 12:48:21PM +0200, Peter Zijlstra wrote:
> On Fri, Apr 08, 2016 at 03:07:13AM +0200, Frederic Weisbecker wrote:
> > index 4c522a7..59a2821 100644
> > --- a/kernel/sched/core.c
> > +++ b/kernel/sched/core.c
> > @@ -7327,8 +7327,9 @@ void __init sched_init(void)
> >  
> >  		for (j = 0; j < CPU_LOAD_IDX_MAX; j++)
> >  			rq->cpu_load[j] = 0;
> > -
> > +#ifdef CONFIG_NO_HZ_COMMON
> >  		rq->last_load_update_tick = jiffies;
> > +#endif
> >  
> >  #ifdef CONFIG_SMP
> >  		rq->sd = NULL;
> > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> > index 1dd864d..4618e5b 100644
> > --- a/kernel/sched/fair.c
> > +++ b/kernel/sched/fair.c
> > @@ -4661,8 +4680,10 @@ static inline void cpu_load_update_nohz(struct rq *this_rq,
> >  
> >  static void cpu_load_update_periodic(struct rq *this_rq, unsigned long load)
> >  {
> > +#ifdef CONFIG_NO_HZ_COMMON
> >  	/* See the mess around cpu_load_update_nohz(). */
> >  	this_rq->last_load_update_tick = READ_ONCE(jiffies);
> > +#endif
> >  	cpu_load_update(this_rq, load, 1);
> >  }
> >  
> 
> Here you do the simple #ifdef, while here you make a giant mess instead
> of the relatively straight forward:
> 
> > @@ -4540,17 +4568,8 @@ static void cpu_load_update(struct rq *this_rq, unsigned long this_load,
> >  
> >  		/* scale is effectively 1 << i now, and >> i divides by scale */
> >  
> > -		old_load = this_rq->cpu_load[i];
> #ifdef CONFIG_NO_HZ_COMMON
> > -		old_load = decay_load_missed(old_load, pending_updates - 1, i);
> > -		if (tickless_load) {
> > -			old_load -= decay_load_missed(tickless_load, pending_updates - 1, i);
> > -			/*
> > -			 * old_load can never be a negative value because a
> > -			 * decayed tickless_load cannot be greater than the
> > -			 * original tickless_load.
> > -			 */
> > -			old_load += tickless_load;
> > -		}
> #endif

Ah sure, if you prefer it that way, I can do that.

Thanks.