Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753513AbbGIQVO (ORCPT ); Thu, 9 Jul 2015 12:21:14 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:24264 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752918AbbGIQVG convert rfc822-to-8bit (ORCPT ); Thu, 9 Jul 2015 12:21:06 -0400 Message-ID: <559E9F7E.1060906@arm.com> Date: Thu, 09 Jul 2015 17:21:18 +0100 From: Juri Lelli User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Michael Turquette , Morten Rasmussen , "peterz@infradead.org" , "mingo@redhat.com" CC: "vincent.guittot@linaro.org" , "daniel.lezcano@linaro.org" , Dietmar Eggemann , "yuyang.du@intel.com" , "rjw@rjwysocki.net" , "sgurrappadi@nvidia.com" , "pang.xunlei@zte.com.cn" , "linux-kernel@vger.kernel.org" , "linux-pm@vger.kernel.org" Subject: Re: [RFCv5 PATCH 40/46] sched/cpufreq_sched: compute freq_new based on capacity_orig_of() References: <1436293469-25707-1-git-send-email-morten.rasmussen@arm.com> <1436293469-25707-41-git-send-email-morten.rasmussen@arm.com> <20150708152221.9112.2951@quantum> In-Reply-To: <20150708152221.9112.2951@quantum> X-OriginalArrivalTime: 09 Jul 2015 16:21:03.0464 (UTC) FILETIME=[40280E80:01D0BA63] X-MC-Unique: x-CzzrQFQVSe1L_BN1wtfA-1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3009 Lines: 90 Hi Mike, On 08/07/15 16:22, Michael Turquette wrote: > Quoting Morten Rasmussen (2015-07-07 11:24:23) >> From: Juri Lelli >> >> capacity is both cpu and freq scaled with EAS. We thus need to compute >> freq_new using capacity_orig_of(), so that we properly scale back the thing >> on heterogeneous architectures. In fact, capacity_orig_of() returns only >> the cpu scaled part of capacity (see update_cpu_capacity()). So, to scale >> freq_new correctly, we multiply policy->max by capacity/capacity_orig_of() >> instead of capacity/1024. >> >> cc: Ingo Molnar >> cc: Peter Zijlstra >> >> Signed-off-by: Juri Lelli > > Looks good to me. Please feel free to add my Reviewed-by or Acked-by as > appropriate. > Thanks for reviewing it! Best, - Juri > Regards, > Mike > >> --- >> kernel/sched/cpufreq_sched.c | 2 +- >> kernel/sched/fair.c | 2 +- >> kernel/sched/sched.h | 2 ++ >> 3 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/kernel/sched/cpufreq_sched.c b/kernel/sched/cpufreq_sched.c >> index 2968f3a..7071528 100644 >> --- a/kernel/sched/cpufreq_sched.c >> +++ b/kernel/sched/cpufreq_sched.c >> @@ -184,7 +184,7 @@ void cpufreq_sched_set_cap(int cpu, unsigned long capacity) >> goto out; >> >> /* Convert the new maximum capacity request into a cpu frequency */ >> - freq_new = capacity * policy->max >> SCHED_CAPACITY_SHIFT; >> + freq_new = (capacity * policy->max) / capacity_orig_of(cpu); >> >> /* No change in frequency? Bail and return current capacity. */ >> if (freq_new == policy->cur) >> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c >> index d395bc9..f74e9d2 100644 >> --- a/kernel/sched/fair.c >> +++ b/kernel/sched/fair.c >> @@ -4625,7 +4625,7 @@ static unsigned long capacity_of(int cpu) >> return cpu_rq(cpu)->cpu_capacity; >> } >> >> -static unsigned long capacity_orig_of(int cpu) >> +unsigned long capacity_orig_of(int cpu) >> { >> return cpu_rq(cpu)->cpu_capacity_orig; >> } >> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h >> index b5e27d9..1327dc7 100644 >> --- a/kernel/sched/sched.h >> +++ b/kernel/sched/sched.h >> @@ -1476,6 +1476,8 @@ unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) >> } >> #endif >> >> +unsigned long capacity_orig_of(int cpu); >> + >> extern struct static_key __sched_energy_freq; >> static inline bool sched_energy_freq(void) >> { >> -- >> 1.9.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pm" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/