From patchwork Tue Sep 26 16:41:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 114271 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4042793qgf; Tue, 26 Sep 2017 09:42:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAFFIZJ67o/hfp5UNnUBPWhl4wz7jK4XChCL2djQ5s9XueRXwGZxr6a/VzkFtBBeqNWtxvE X-Received: by 10.98.69.137 with SMTP id n9mr11691676pfi.164.1506444160637; Tue, 26 Sep 2017 09:42:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506444160; cv=none; d=google.com; s=arc-20160816; b=F04on7voqWqdh3OysrCbWYKHuc/+w4BWvBL/igZhcM4sF9IQTFGjzwPckfe61WAnxY b+JvcVwyLqBMW59PL/Slwd94cUfXuHDcqQkVyJKUVLzWl25lT+yg/5oza+7gczIjh5ek EPxlsGoQITEfetC8v4yyWCKkGWO1fAcjyNiCmIAJlJMXbxY5yUEGY9TGEnIsJ0elprvL 3X1OL4wegn34AvLR4Z5SMKrmLQqmF9o7xB6TDgwgCwfhAeU1AkmaMMSfwA6uPvZr9XrK HAspn56wYNMqQzYlhvY3y/B7zPLX+RUQipnqsez7w2sgtddHfx1esNCYMgm5OiQh5Jww wSbQ== 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=xyTfN/TLR9lJVaFlrtq/vhaONQlHafFAbk5qyJtgYKY=; b=Rdjd+Rz2MxTSk/rtQqZ7juHVnPdNA0sOjWOtnQ5hY5KKPnzLTHkQV815zu07f30xx+ B2eGzeNSQAr9rKTMwXHCoIAs3/nkxA0qRq6pvzA0K+sm3rsjETYBMHc2FJHHVk+5oSZA 5UK8e7tlBBktXGhouf7HrfMUptuTMYW4+E+YO/vwHA91m3+wXSNtCMyZqbm/P5TBIzhK zyoySNRfVoejqKe6OwWoUIZ2waeoiuAJ01UEJSfOOVq/Zpq4sv02hUpfJuoFHmAWonTV vN1eQPKFaZcgWprjgEW997NMS4BjxcBejfwfBY9kET9TOYGkBbc9nwQHGfNzL/vL4V/U gTJQ== 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 g192si5876504pfc.267.2017.09.26.09.42.40; Tue, 26 Sep 2017 09:42:40 -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 S1030756AbdIZQmj (ORCPT + 12 others); Tue, 26 Sep 2017 12:42:39 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:36068 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030638AbdIZQmh (ORCPT ); Tue, 26 Sep 2017 12:42:37 -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 98DD81682; Tue, 26 Sep 2017 09:42:36 -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 3FE393F483; Tue, 26 Sep 2017 09:42:34 -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 v5 06/10] drivers base/arch_topology: allow inlining cpu-invariant accounting support Date: Tue, 26 Sep 2017 17:41:11 +0100 Message-Id: <20170926164115.32367-7-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170926164115.32367-1-dietmar.eggemann@arm.com> References: <20170926164115.32367-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 Acked-by: Viresh Kumar --- drivers/base/arch_topology.c | 7 +------ include/linux/arch_topology.h | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.11.0 diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 416ec2f5211d..aea0b9d521f6 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 f6e490312e4d..c189de3ef5df 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -12,8 +12,14 @@ void topology_normalize_cpu_scale(void); struct device_node; bool 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);