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 S1161630AbcFBR1n (ORCPT <rfc822;w@1wt.eu>);
	Thu, 2 Jun 2016 13:27:43 -0400
Received: from foss.arm.com ([217.140.101.70]:46868 "EHLO foss.arm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1161410AbcFBR1m (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 2 Jun 2016 13:27:42 -0400
Subject: Re: [RFC PATCH 3/3] sched/fair: Change @running of
 __update_load_avg() to @update_util
To: Juri Lelli <juri.lelli@arm.com>
References: <1464809962-25814-1-git-send-email-dietmar.eggemann@arm.com>
 <1464809962-25814-4-git-send-email-dietmar.eggemann@arm.com>
 <20160602092539.GD9340@e106622-lin>
Cc: Peter Zijlstra <peterz@infradead.org>, linux-kernel@vger.kernel.org,
        Vincent Guittot <vincent.guittot@linaro.org>,
        Ben Segall <bsegall@google.com>,
        Morten Rasmussen <morten.rasmussen@arm.com>,
        Yuyang Du <yuyang.du@intel.com>
From: Dietmar Eggemann <dietmar.eggemann@arm.com>
Message-ID: <57506C8B.4050407@arm.com>
Date: Thu, 2 Jun 2016 18:27:39 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.8.0
MIME-Version: 1.0
In-Reply-To: <20160602092539.GD9340@e106622-lin>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 02/06/16 10:25, Juri Lelli wrote:

[...]

>> @@ -2757,7 +2754,7 @@ __update_load_avg(u64 now, int cpu, struct sched_avg *sa,
>>  						weight * scaled_delta_w;
>>  			}
>>  		}
>> -		if (update_util && running)
>> +		if (update_util == 0x3)
> 
> How about a define for these masks?

Something like this?

+#define UTIL_RUNNING   1
+#define UTIL_UPDATE    2
+
 /*
  * We can represent the historical contribution to runnable average as the
  * coefficients of a geometric series.  To do this we sub-divide our runnable
@@ -2724,7 +2727,7 @@ static u32 __compute_runnable_contrib(u64 n)
  */
 static __always_inline int
 __update_load_avg(u64 now, int cpu, struct sched_avg *sa,
-                 unsigned long weight, int update_util, struct cfs_rq *cfs_rq)
+                 unsigned long weight, int util_flags, struct cfs_rq *cfs_rq)
 {
        u64 delta, scaled_delta, periods;
        u32 contrib;
@@ -2775,7 +2778,7 @@ __update_load_avg(u64 now, int cpu, struct sched_avg *sa,
                                                weight * scaled_delta_w;
                        }
                }
-               if (update_util == 0x3)
+               if (util_flags == (UTIL_UPDATE | UTIL_RUNNING))
                        sa->util_sum += scaled_delta_w * scale_cpu;
...