From patchwork Mon Dec 4 10:23:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juri Lelli X-Patchwork-Id: 120502 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4245031qgn; Mon, 4 Dec 2017 02:24:36 -0800 (PST) X-Google-Smtp-Source: AGs4zMYqmQXX5ssQMDl8/CXjWy0slATyaUTNvBM87mOZXnvF2vh1xB+8dzy06onK29VRy0hO7Bkc X-Received: by 10.99.111.1 with SMTP id k1mr5644507pgc.401.1512383076329; Mon, 04 Dec 2017 02:24:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512383076; cv=none; d=google.com; s=arc-20160816; b=j/zygjKjHSveMk+dfLcpH6PAsuQD1Fssno/QwDwEstMtTRtDujz8fMdUvMicAu155A x3RAfVGjwKbDJzG4bMjw4wGQv4RbwTlwOZzioquvNvgcgjkYDePrnohNzYR9tOgjE3fH 2iXXke6YTkYCZmHF+iS5LQ3ANaw1jJmVjs4b/ZVJWDCORvWb6oXAulKd/eOs1leZeJMm Stro7Th358CtsVwzI4/u79Mshj60TrQtHrtLQAZpPxgrzFUZc8GwIz6byglh9g1pD/Jl wlqSn+X2kItRytol3Y7Zpwc46CdNvwkx6EY5xFvOOQ0JYjYUe3BPmznzMlV0RgEQ7DEb /0LQ== 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=OpMmTNGDvXNwFAi0/4Gz4YTMkJOw7JNssamTuu++29w=; b=BmyTAvQSvjsgq4EEqie0dnfS9ZWiLw+9lUoPJc78cWOoyfElp4P2o+KxI4Hku3UrcV zxII3WGa2rSfzssq/eCRzClldnU6mBAKLeADZHR96e2D14vmyJ1lYCLQ04JOsR3+j8BP 3uNgJrfMGCP2DbG+1WIHh7oVp5w7wZYevGUKIESeoLSLIzBXAHpF+zno94u7xwslMczx lShPlPeWBzcgW2xysqbSRX1xLjVXmNlCEW0Y1YlYInfqIJclqx1hpVTeVagEX/TXEkNv I+JPU0g02SC0Zj1tevNbdVVvkviqQPJrYu5rLpVXtmr8F6lAR7OXf+CqVnVfGk3xV5QU TOvQ== 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 h90si9425784plb.320.2017.12.04.02.24.36; Mon, 04 Dec 2017 02:24:36 -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 S1753746AbdLDKYe (ORCPT + 28 others); Mon, 4 Dec 2017 05:24:34 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35513 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753671AbdLDKY2 (ORCPT ); Mon, 4 Dec 2017 05:24:28 -0500 Received: by mail-wm0-f65.google.com with SMTP id f9so13309263wmh.0 for ; Mon, 04 Dec 2017 02:24:28 -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=OpMmTNGDvXNwFAi0/4Gz4YTMkJOw7JNssamTuu++29w=; b=L1Pp+BWW4+2ATRixyRjqyhxeO9R3e0xZcrXyQLqAe5UafBIehtuacu+L4E2PwD6EnD 6dVGa396bxjsC3Tv0Vb3NF2QQwi1Bl+SILo8IWPNOCxgmC2xMz0QmFGgfzFFaAhsRFpd mpFVjFgjOxzOrGiCJqlldXjXiGZWD15wCn5xcvYR+9sgGAJzklXbu91XpE4aZAhprYLf gidgVrpUnJoQKCGQX/QreZ01W2sp+SWmwCVo6XMzcvz4A/if/LvJbxDdlV6+DDKdcBpw KjUjpC21YwFurZJDGUx9PVz8SdpAtMJ9pINDycu75FQc/dccewHCdRW5QhD5jxabwvyJ 3zOA== X-Gm-Message-State: AKGB3mJvwdrUgUMJcSmuebPMqpb6z9XnAyFEq1/pi9bftIk4ltKXZnca 64eB49AFtKtWjzlNgz8d49SkJQ== X-Received: by 10.28.110.24 with SMTP id j24mr6341723wmc.100.1512383066797; Mon, 04 Dec 2017 02:24:26 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Dec 2017 02:24:26 -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 6/8] sched/sched.h: remove sd arch_scale_freq_capacity parameter Date: Mon, 4 Dec 2017 11:23:23 +0100 Message-Id: <20171204102325.5110-7-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 sd parameter is never used in arch_scale_freq_capacity (and it's hard to see where information coming from scheduling domains might help doing frequency invariance scaling). Remove it; also in anticipation of moving arch_scale_freq_capacity outside CONFIG_SMP. Signed-off-by: Juri Lelli Cc: Peter Zijlstra Cc: Ingo Molnar --- include/linux/arch_topology.h | 2 +- kernel/sched/fair.c | 2 +- kernel/sched/sched.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.14.3 diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index 304511267c82..2b709416de05 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -27,7 +27,7 @@ void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity); DECLARE_PER_CPU(unsigned long, freq_scale); static inline -unsigned long topology_get_freq_scale(struct sched_domain *sd, int cpu) +unsigned long topology_get_freq_scale(int cpu) { return per_cpu(freq_scale, cpu); } diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 4037e19bbca2..535d9409f4af 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3122,7 +3122,7 @@ accumulate_sum(u64 delta, int cpu, struct sched_avg *sa, u32 contrib = (u32)delta; /* p == 0 -> delta < 1024 */ u64 periods; - scale_freq = arch_scale_freq_capacity(NULL, cpu); + scale_freq = arch_scale_freq_capacity(cpu); scale_cpu = arch_scale_cpu_capacity(NULL, cpu); delta += sa->period_contrib; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 280b421a82e8..b64207d54a55 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1712,7 +1712,7 @@ extern void sched_avg_update(struct rq *rq); #ifndef arch_scale_freq_capacity static __always_inline -unsigned long arch_scale_freq_capacity(struct sched_domain *sd, int cpu) +unsigned long arch_scale_freq_capacity(int cpu) { return SCHED_CAPACITY_SCALE; } @@ -1731,7 +1731,7 @@ unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { - rq->rt_avg += rt_delta * arch_scale_freq_capacity(NULL, cpu_of(rq)); + rq->rt_avg += rt_delta * arch_scale_freq_capacity(cpu_of(rq)); sched_avg_update(rq); } #else