From patchwork Fri Nov 21 12:35:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Rasmussen X-Patchwork-Id: 5354521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7BA91C11AC for ; Fri, 21 Nov 2014 12:38:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8753E20160 for ; Fri, 21 Nov 2014 12:38:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96EF72015D for ; Fri, 21 Nov 2014 12:38:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrnRK-00071N-RD; Fri, 21 Nov 2014 12:35:54 +0000 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrnR1-0006l3-KF for linux-arm-kernel@lists.infradead.org; Fri, 21 Nov 2014 12:35:36 +0000 Received: from foss-smtp-na-1.foss.arm.com (unknown [10.80.61.8]) by foss-mx-na.foss.arm.com (Postfix) with ESMTP id D0E6F4E5; Fri, 21 Nov 2014 06:35:11 -0600 (CST) Received: from collaborate-mta1.arm.com (highbank-bc01-b06.austin.arm.com [10.112.81.134]) by foss-smtp-na-1.foss.arm.com (Postfix) with ESMTP id 94FB75FAD7; Fri, 21 Nov 2014 06:35:04 -0600 (CST) Received: from e105550-lin.cambridge.arm.com (e105550-lin.cambridge.arm.com [10.1.197.21]) by collaborate-mta1.arm.com (Postfix) with ESMTPS id A321713F8F5; Fri, 21 Nov 2014 06:35:02 -0600 (CST) Date: Fri, 21 Nov 2014 12:35:59 +0000 From: Morten Rasmussen To: Vincent Guittot Subject: Re: [PATCH v9 05/10] sched: make scale_rt invariant with frequency Message-ID: <20141121123559.GF23177@e105550-lin.cambridge.arm.com> References: <1415033687-23294-1-git-send-email-vincent.guittot@linaro.org> <1415033687-23294-6-git-send-email-vincent.guittot@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1415033687-23294-6-git-send-email-vincent.guittot@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141121_043535_722276_F8B99F7A X-CRM114-Status: GOOD ( 24.53 ) X-Spam-Score: -0.0 (/) Cc: "nicolas.pitre@linaro.org" , "riel@redhat.com" , "linaro-kernel@lists.linaro.org" , "peterz@infradead.org" , "efault@gmx.de" , "linux-kernel@vger.kernel.org" , "kamalesh@linux.vnet.ibm.com" , "preeti@linux.vnet.ibm.com" , "mingo@kernel.org" , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, Nov 03, 2014 at 04:54:42PM +0000, Vincent Guittot wrote: > The average running time of RT tasks is used to estimate the remaining compute > capacity for CFS tasks. This remaining capacity is the original capacity scaled > down by a factor (aka scale_rt_capacity). This estimation of available capacity > must also be invariant with frequency scaling. > > A frequency scaling factor is applied on the running time of the RT tasks for > computing scale_rt_capacity. > > In sched_rt_avg_update, we scale the RT execution time like below: > rq->rt_avg += rt_delta * arch_scale_freq_capacity() >> SCHED_CAPACITY_SHIFT > > Then, scale_rt_capacity can be summarized by: > scale_rt_capacity = SCHED_CAPACITY_SCALE - > ((rq->rt_avg << SCHED_CAPACITY_SHIFT) / period) > > We can optimize by removing right and left shift in the computation of rq->rt_avg > and scale_rt_capacity > > The call to arch_scale_frequency_capacity in the rt scheduling path might be > a concern for RT folks because I'm not sure whether we can rely on > arch_scale_freq_capacity to be short and efficient ? It better be fast :) It is used in critical paths. However, if you really care about latency you probably don't want frequency scaling to mess around. If the architecture provides a fast-path for arch_scale_freq_capacity() returning SCHED_CAPACITY_SCALE when frequency scaling is disabled, the overhead should be minimal. If the architecture doesn't provide arch_scale_freq_capacity() it becomes a constant multiplication and should hopefully go away completely. > > Signed-off-by: Vincent Guittot > --- > kernel/sched/fair.c | 17 +++++------------ > kernel/sched/sched.h | 4 +++- > 2 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index a5039da..b37c27b 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -5785,7 +5785,7 @@ unsigned long __weak arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) > static unsigned long scale_rt_capacity(int cpu) > { > struct rq *rq = cpu_rq(cpu); > - u64 total, available, age_stamp, avg; > + u64 total, used, age_stamp, avg; > s64 delta; > > /* > @@ -5801,19 +5801,12 @@ static unsigned long scale_rt_capacity(int cpu) > > total = sched_avg_period() + delta; > > - if (unlikely(total < avg)) { > - /* Ensures that capacity won't end up being negative */ > - available = 0; > - } else { > - available = total - avg; > - } > + used = div_u64(avg, total); I haven't looked through all the details of the rt avg tracking, but if 'used' is in the range [0..SCHED_CAPACITY_SCALE], I believe it should work. Is it guaranteed that total > 0 so we don't get division by zero? It does get a slightly more complicated if we want to figure out the available capacity at the current frequency (current < max) later. Say, rt eats 25% of the compute capacity, but the current frequency is only 50%. In that case get: curr_avail_capacity = (arch_scale_cpu_capacity() * (arch_scale_freq_capacity() - (SCHED_SCALE_CAPACITY - scale_rt_capacity()))) >> SCHED_CAPACITY_SHIFT With numbers assuming arch_scale_cpu_capacity() = 800: curr_avail_capacity = 800 * (512 - (1024 - 758)) >> 10 = 200 Which isn't actually that bad. Anyway, it isn't needed until we start invovling energy models. > > - if (unlikely((s64)total < SCHED_CAPACITY_SCALE)) > - total = SCHED_CAPACITY_SCALE; > + if (likely(used < SCHED_CAPACITY_SCALE)) > + return SCHED_CAPACITY_SCALE - used; > > - total >>= SCHED_CAPACITY_SHIFT; > - > - return div_u64(available, total); > + return 1; > } > > static void update_cpu_capacity(struct sched_domain *sd, int cpu) > diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h > index c34bd11..fc5b152 100644 > --- a/kernel/sched/sched.h > +++ b/kernel/sched/sched.h > @@ -1312,9 +1312,11 @@ static inline int hrtick_enabled(struct rq *rq) > > #ifdef CONFIG_SMP > extern void sched_avg_update(struct rq *rq); > +extern unsigned long arch_scale_freq_capacity(struct sched_domain *sd, int cpu); I'm not sure if it makes any difference, but shouldn't it be __weak instead of extern? unsigned long __weak arch_scale_freq_capacity(...) Also, now that the function prototype definition is in the header file we can kill the local prototype in fair.c introduced in patch 4: * the * coefficients of a geometric series. To do this we sub-divide our * runnable diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6fd5ac6..921b174 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2277,8 +2277,6 @@ static u32 __compute_runnable_contrib(u64 n) return contrib + runnable_avg_yN_sum[n]; } -unsigned long __weak arch_scale_freq_capacity(struct sched_domain *sd, int cpu); - /* * We can represent the historical contribution to runnable average as