From patchwork Mon Dec 4 10:23:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juri Lelli X-Patchwork-Id: 120505 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4245945qgn; Mon, 4 Dec 2017 02:25:42 -0800 (PST) X-Google-Smtp-Source: AGs4zMaLuxhzbqrEa0zmddipkL59FRP2fvg9Utc1daAgaWkWY1wqSagEnAYRDmSULmetS0HpcW7E X-Received: by 10.84.174.129 with SMTP id r1mr14280749plb.337.1512383142196; Mon, 04 Dec 2017 02:25:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512383142; cv=none; d=google.com; s=arc-20160816; b=so5r4eBg0MleazNYeXBByJKq/z21R6XQ999WR78jlp55cWiQ2lOCv0F4ZO1OQSMWOI CzHe0xWPOIqV3A4JjoElHSn7ComRMwE2rQUG98uw8nEyUkLkzDGnse7TjRIbHt8pGGH2 XHdlcqBqFW2tMaJZSZXFZBYGPMIRmauxq5xPL17hDNkHjIET08SYwCyBGdSy21Sf4sni WstKZCOVQr8+DaY8vLtk3LE8hYyc/N7VjjioXV746wn2r9JoBlxUTqaeViQp6Kz3awxp Bh45rRVcL/q8+xSPujLFAprdaJj1kl9TVpgj/kcUFNjxh1JIZS6ygh+APE+pm37VdtSG AXjw== 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=tLn4GyCuFxGfw4Hk63E/gxzsjQsZx/a2/VQMhr7uee4=; b=o/0G47wGKaQO0lBQCbXCC4Fo5jPRkuRMF8eGtx6wAZmwwZ0wXODJB42T7aYR1VWq8X mE+z+BK/upAADmXnXgyW5CwXe0LThAsqpIs/2jXKXdENqkOwMm8rdEwwjRCeHlS6OiPP aj2E6MV2Ym7k0n0e/3EITQjOmJ0kfYSIfwjM1gJGHBemm73K6LdpL09ohVHCHelpFXgO 92YvY1t38L9T9GAuV1HSHIsajRAJmOz0u2WxkI0XtGZIrN/DrcEVoORF1wcS5AgCJDam Z4/WC2/9UzAf69DJsVvVg6jOeo6zQQ7COHpM6f6A4cRTzRLHt9/GKeSbM+z/+r/1LjLw n6cA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d2si9123343pgq.658.2017.12.04.02.25.41; Mon, 04 Dec 2017 02:25:42 -0800 (PST) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753915AbdLDKZi (ORCPT + 28 others); Mon, 4 Dec 2017 05:25:38 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:45738 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753677AbdLDKYa (ORCPT ); Mon, 4 Dec 2017 05:24:30 -0500 Received: by mail-wm0-f65.google.com with SMTP id 9so4783875wme.4 for ; Mon, 04 Dec 2017 02:24:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tLn4GyCuFxGfw4Hk63E/gxzsjQsZx/a2/VQMhr7uee4=; b=XtvYq3J/oQuwF800F4O/QYdDP2ZNrcqu31N9wawlhQD9AYPIp/ldSfuh2hpiZNSP7q snJUnPOHl8OzscifAILS08UNuzDajnHVNjgWHf1Z52br73O5j/lbGRMBioQ/vIIlBNK+ +U4CAQW6DKjMCmZWCbFyNb8u1t63YdYWRYoQwmPPFfje/Uq+0mngbHL2DUEL1dFli4OJ XWTAdqE9QDK3UPcVm5bkVpGO6sajZzZJM1ghHkMjir/S880YdQ8vNGhTcCJa7JuaLZux WJgpNpoBqyzzcXA+0Rx0Qek0OdZ+L9caMemiik5LWrgnpDjpaqxMXEQLs+1gB+34I8DQ Btiw== X-Gm-Message-State: AKGB3mIPdOwCIn+H2PpjJQbRdhANE9wF7QR8C1PDdLMOmf9osoanktHL 7ulRPXF7bm8S9SfjXVB+Bm3y3w== X-Received: by 10.28.169.198 with SMTP id s189mr7554851wme.65.1512383069514; Mon, 04 Dec 2017 02:24:29 -0800 (PST) Received: from localhost.localdomain.com ([151.68.92.1]) by smtp.gmail.com with ESMTPSA id y2sm13542473wra.18.2017.12.04.02.24.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Dec 2017 02:24:29 -0800 (PST) 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, morten.rasmussen@arm.com, dietmar.eggemann@arm.com, patrick.bellasi@arm.com, alessio.balsini@arm.com, juri.lelli@redhat.com, Juri Lelli , Ingo Molnar Subject: [RFC PATCH v2 7/8] sched/sched.h: move arch_scale_{freq, cpu}_capacity outside CONFIG_SMP Date: Mon, 4 Dec 2017 11:23:24 +0100 Message-Id: <20171204102325.5110-8-juri.lelli@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171204102325.5110-1-juri.lelli@redhat.com> References: <20171204102325.5110-1-juri.lelli@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Juri Lelli Currently, frequency and cpu capacity scaling is only performed on CONFIG_SMP systems (as CFS PELT signals are only present for such systems). However, other scheduling classes want to do freq/cpu scaling, and for !CONFIG_SMP configurations as well. 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 Reviewed-by: Steven Rostedt (VMware) --- include/linux/sched/topology.h | 12 ++++++------ kernel/sched/sched.h | 13 ++++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) -- 2.14.3 diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index cf257c2e728d..26347741ba50 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: */ @@ -27,12 +33,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 b64207d54a55..0022c649fabb 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1707,9 +1707,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) @@ -1718,6 +1715,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) @@ -1735,6 +1735,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