From patchwork Fri Aug 25 14:32:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dietmar Eggemann X-Patchwork-Id: 111023 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp1045623ybm; Fri, 25 Aug 2017 07:32:49 -0700 (PDT) X-Received: by 10.99.124.74 with SMTP id l10mr7947543pgn.261.1503671569233; Fri, 25 Aug 2017 07:32:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503671569; cv=none; d=google.com; s=arc-20160816; b=i0myBbxXIAwblJ3cUbSRYgsBRRxy4PYphdQBg4QLlJgXigBVp5TVTRmb84bTwb9xkt XydYYviWQKA4sCljbDRkxBOtWUEJpI+W8wHssGWadHiuxP5zjdgRt2fZSdjl6Rnt/dq9 GdcqHmkuUeEgA2Hk+O7jlEtlxoPGlm7G2fLD1mtxJR50foEDGEA+xhcHBytJTvFhp/bo Fo1jqYCYy6v1D/YEdlHTgpQWxee77KGZFjZkVRnCPvxy2St/GWTrIygBoa69WG8A4tjM 2DOI7P6OKb31yGVCeeOTf/Asn2G+mV98LdNXRpTexLcWc6ceQUHpwD2iIJadS5Vaeo58 ZjDQ== 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=hdDRcaOvy4fipxHN/7p3et/BSX1b40gvOxz3uIqNP1s=; b=r4M8XCB/IKTgrGDnTmhlHQxHbh38qOBYNGDuicBJ2lENkYANKH6IihHQP3DJEPjYKI 808XOq5diJQQBeSsS9qmKp8g8p2hAR+NsltHpSVOsg6Y5XkCwFdMRsNikOFnaZHBf2zy wKRjQkCU8A6Okw4YSF7TddRWp0XMXIP2Th0HSC/Jw3k/rVnSqFgE9Lk8ufOyAjXg/0QT OQcU/FNTYCH4nd/LyKVt9L1vN/itje1xdrIVQlAnFT/piGRnClwYz+PdYpvDt1UnkF4x W9od6Y71nz+igpi25sytDp9jY/t3+uF2T/jDX1waeKGmI10Xv6+D+y62VMt/mzd/3NA2 dVWw== 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 e23si5366940pli.113.2017.08.25.07.32.48; Fri, 25 Aug 2017 07:32:49 -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 S932860AbdHYOco (ORCPT + 26 others); Fri, 25 Aug 2017 10:32:44 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54100 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932735AbdHYOck (ORCPT ); Fri, 25 Aug 2017 10:32:40 -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 80C271715; Fri, 25 Aug 2017 07:32:40 -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 8F1D03F540; Fri, 25 Aug 2017 07:32:38 -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 , Juri Lelli , Vincent Guittot , Peter Zijlstra , Morten Rasmussen , Viresh Kumar , "Rafael J . Wysocki" , Sudeep Holla Subject: [PATCH v4 06/10] drivers base/arch_topology: allow inlining cpu-invariant accounting support Date: Fri, 25 Aug 2017 15:32:02 +0100 Message-Id: <20170825143206.30467-7-dietmar.eggemann@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170825143206.30467-1-dietmar.eggemann@arm.com> References: <20170825143206.30467-1-dietmar.eggemann@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 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);