From patchwork Tue May 23 08:53:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juri Lelli X-Patchwork-Id: 100361 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp217793qge; Tue, 23 May 2017 01:56:23 -0700 (PDT) X-Received: by 10.99.250.69 with SMTP id g5mr30719299pgk.11.1495529783798; Tue, 23 May 2017 01:56:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495529783; cv=none; d=google.com; s=arc-20160816; b=U7xQsBaCNPtRPItEWlgBNLaU2QbkN4+1wYnxjxVtoePiXJpZa6MkRllk/sDoNZeo1h hhqISEwCFWZDOAa/tDJTMdzDqc7M7Vcm6pKlNzt9vKq+SZz0LClERmcWSwKjcu24ETHw aBkgXmpGCEJLhgvNSq4f7UZq1f0TX4pdm7jmlDrMrLoqlai5iiXp6Jk497fEIatlUG3V Oe68f9m0r517lGeHsDQBR26B7++VNGXsCNtavMCwzQLbD6MNsqMJ6NyniUnC3VSh494v iczVlpK3RW2SWkE/npvoaVl2VGiJ8QZyDSy7CaVPNq7D1z3neshYxf5GNTl5K3qRdUJm NECQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=hZy+2513ohGSaHfhQxnsVM88dcNtzdeOy0hLyP60rq4=; b=quh2se8zili87Ptsu5kfXw8Em7QudePB0UU5RMbQrHr3Gr6vGTTc/jFHc4PlNt+9ol ntJlGlbsD3eqg3Xn4ldTI51NBwUGZVjtWJ/aANlelHQ4kXRSiyVE3JYLatNz1Qyb6Wi1 mawbVnlsXEoxXXNblchR6Z6ZFTDGdlzZEgD3BSpVoxcV1gnNR25vdVv2wxqXiOQ2Uym3 Xq5jPkdY5EwiZFuIHmgViwyn2xgy4rZyD88HRu7A9w3DrCI7I7WBE8Vn4Rkh/eDxHgLy ThgRM0zvrYL79L69PEQv4y6dYJQZoY6gFyx+kHVzfqbv6DKtDIsuRH558NDneqGyHnTf DKJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r184si20343188pgr.157.2017.05.23.01.56.23; Tue, 23 May 2017 01:56:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936791AbdEWI4T (ORCPT + 25 others); Tue, 23 May 2017 04:56:19 -0400 Received: from foss.arm.com ([217.140.101.70]:48234 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932873AbdEWIyy (ORCPT ); Tue, 23 May 2017 04:54:54 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F2F27344; Tue, 23 May 2017 01:54:53 -0700 (PDT) Received: from cam-smtp0.cambridge.arm.com (e106622-lin.cambridge.arm.com [10.1.211.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 33FC13F53D; Tue, 23 May 2017 01:54:50 -0700 (PDT) From: Juri Lelli To: peterz@infradead.org, mingo@redhat.com, rjw@rjwysocki.net, viresh.kumar@linaro.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, tglx@linutronix.de, vincent.guittot@linaro.org, rostedt@goodmis.org, luca.abeni@santannapisa.it, claudio@evidence.eu.com, tommaso.cucinotta@santannapisa.it, bristot@redhat.com, mathieu.poirier@linaro.org, tkjos@android.com, joelaf@google.com, andresoportus@google.com, morten.rasmussen@arm.com, dietmar.eggemann@arm.com, patrick.bellasi@arm.com, juri.lelli@arm.com, Ingo Molnar Subject: [PATCH RFC 7/8] sched/sched.h: move arch_scale_{freq, cpu}_capacity outside CONFIG_SMP Date: Tue, 23 May 2017 09:53:50 +0100 Message-Id: <20170523085351.18586-8-juri.lelli@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170523085351.18586-1-juri.lelli@arm.com> References: <20170523085351.18586-1-juri.lelli@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, frequency and cpu capacity scaling is only performed on CONFIG_SMP system (as CFS PELT signals are only present for such systems as well). However, other scheduling class want to do freq/cpu scaling as well, and for !CONFIG_SMP configurations too. arch_scale_freq_capacity is useful to implement frequency scaling even on !CONFIG_SMP platforms, so we simply move it outside CONFIG_SMP ifdeffery. Even if arch_scale_cpu_capacity is not useful on !CONFIG_SMP platforms, we make a default implementation available for such configurations anyway to simplify scheduler code doing CPU scale invariance. Signed-off-by: Juri Lelli Cc: Peter Zijlstra Cc: Ingo Molnar --- include/linux/sched/topology.h | 12 ++++++------ kernel/sched/sched.h | 13 ++++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) -- 2.11.0 diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 7d065abc7a47..953cf4f889ec 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -6,6 +6,12 @@ #include /* + * Increase resolution of cpu_capacity calculations + */ +#define SCHED_CAPACITY_SHIFT SCHED_FIXEDPOINT_SHIFT +#define SCHED_CAPACITY_SCALE (1L << SCHED_CAPACITY_SHIFT) + +/* * sched-domains (multiprocessor balancing) declarations: */ #ifdef CONFIG_SMP @@ -26,12 +32,6 @@ #define SD_OVERLAP 0x2000 /* sched_domains of this level overlap */ #define SD_NUMA 0x4000 /* cross-node balancing */ -/* - * Increase resolution of cpu_capacity calculations - */ -#define SCHED_CAPACITY_SHIFT SCHED_FIXEDPOINT_SHIFT -#define SCHED_CAPACITY_SCALE (1L << SCHED_CAPACITY_SHIFT) - #ifdef CONFIG_SCHED_SMT static inline int cpu_smt_flags(void) { diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 063fd8c47e75..cc474c62cd18 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1636,9 +1636,6 @@ static inline int hrtick_enabled(struct rq *rq) #endif /* CONFIG_SCHED_HRTICK */ -#ifdef CONFIG_SMP -extern void sched_avg_update(struct rq *rq); - #ifndef arch_scale_freq_capacity static __always_inline unsigned long arch_scale_freq_capacity(int cpu) @@ -1647,6 +1644,9 @@ unsigned long arch_scale_freq_capacity(int cpu) } #endif +#ifdef CONFIG_SMP +extern void sched_avg_update(struct rq *rq); + #ifndef arch_scale_cpu_capacity static __always_inline unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) @@ -1664,6 +1664,13 @@ static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) sched_avg_update(rq); } #else +#ifndef arch_scale_cpu_capacity +static __always_inline +unsigned long arch_scale_cpu_capacity(void __always_unused *sd, int cpu) +{ + return SCHED_CAPACITY_SCALE; +} +#endif static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { } static inline void sched_avg_update(struct rq *rq) { } #endif