From patchwork Thu Jul 27 19:33:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 108853 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2484329qge; Thu, 27 Jul 2017 12:33:56 -0700 (PDT) X-Received: by 10.99.109.5 with SMTP id i5mr5037882pgc.440.1501184036038; Thu, 27 Jul 2017 12:33:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501184036; cv=none; d=google.com; s=arc-20160816; b=y4G399Ilx6EOQ1yToqqKZoxBlYtpjH92+vRIFzRdcARqZ6mikPtvaWNLGxryHRXZuG jKS2Y22HyfxCI+4jul9b4iNY1Ka12Mg7Pkoh88dcD5EvVrPjJ51fvMwBsr4PCngddvZm gGwbT6APBHLMA0TDOc1fWHyk8INJKN1D+d4Q6kru9F7DCpGBPDJFrITTCD8l37+3p6we qScPB60G4eJcP7+C2ctvTDCXw8f9oC+APky5hSMqRLb97hB2kc84htJntyXCbOVeEWKX DZs1EpjL49nMqbg3/DwCh8hypse5wTZ7UBmC/lV4e9P+mKKHCcZrzWQVwGF8290Z4Ixq IXSQ== 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=axeEJLaS1RsEVGOf1dfGMHRh1xW5eKJE4H3UaDcb7yY=; b=cCMBZd2CIA0vHpHtp5N8y5m1TXXZPu+gJO2pe5VJD1Sg3J9cs6czj1BxI1zA+a/wfT T5jPvxAesQnzJCQ4Iv69SGy0MDdneX1jhpRsPhbOF4j1ZXToL/VRMR+ZkGrHaQVtulvi CUUPECC7s1geKDDcoHpA+o3Nrh+c1Wy9UQQPNI3Ij2jJU4Ph09topdmm+kIl8CeIO2Fy aeQNLG9eDoqmU/Hkm6e4PG8U6gvXFJZyAeujYqbdH8tRrjfk3PEGtGuyj9iATkZF0lTx Y0DI1IxTwOTFRai5SP0tQncH2CoLmhs1ECe5H7CLKPTw7jVQJWrJvCl5MVsv5UJONZkW 0TCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 a5si12124886pli.880.2017.07.27.12.33.55; Thu, 27 Jul 2017 12:33:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751792AbdG0Tdx (ORCPT + 13 others); Thu, 27 Jul 2017 15:33:53 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:51116 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751790AbdG0Tdw (ORCPT ); Thu, 27 Jul 2017 15:33:52 -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 368AF1650; Thu, 27 Jul 2017 12:33:52 -0700 (PDT) Received: from e107985-lin.cambridge.arm.com (e107985-lin.cambridge.arm.com [10.1.210.41]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id F02003F540; Thu, 27 Jul 2017 12:33:49 -0700 (PDT) From: Dietmar Eggemann To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, linux@arm.linux.org.uk, Greg Kroah-Hartman , Russell King , Catalin Marinas , Will Deacon , Juri Lelli , Vincent Guittot , Peter Zijlstra , Morten Rasmussen , Viresh Kumar , "Rafael J . Wysocki" , Sudeep Holla Subject: [PATCH v3 06/10] drivers base/arch_topology: allow inlining cpu-invariant accounting support Date: Thu, 27 Jul 2017 20:33:08 +0100 Message-Id: <20170727193312.9849-7-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170727193312.9849-1-dietmar.eggemann@arm.com> References: <20170727193312.9849-1-dietmar.eggemann@arm.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Allow inlining of topology_get_cpu_scale() into the task scheduler fast path (e.g. __update_load_avg_se()) by coding it as a static inline function in the arch topology header file. Cc: Greg Kroah-Hartman Cc: Juri Lelli Signed-off-by: Dietmar Eggemann --- drivers/base/arch_topology.c | 7 +------ include/linux/arch_topology.h | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.11.0 Acked-by: Viresh Kumar diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index af9ab98a233e..c8cd92ba4cc0 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -37,12 +37,7 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, } static DEFINE_MUTEX(cpu_scale_mutex); -static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE; - -unsigned long topology_get_cpu_scale(struct sched_domain *sd, int cpu) -{ - return per_cpu(cpu_scale, cpu); -} +DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE; void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity) { diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index 3e3c2657c9a1..0c4e43d6a3bb 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -11,8 +11,14 @@ void topology_normalize_cpu_scale(void); struct device_node; int topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu); +DECLARE_PER_CPU(unsigned long, cpu_scale); + struct sched_domain; -unsigned long topology_get_cpu_scale(struct sched_domain *sd, int cpu); +static inline +unsigned long topology_get_cpu_scale(struct sched_domain *sd, int cpu) +{ + return per_cpu(cpu_scale, cpu); +} void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity);