From patchwork Tue Jul 7 18:24:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Rasmussen X-Patchwork-Id: 6738211 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1370EC05AC for ; Tue, 7 Jul 2015 18:57:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1996206F9 for ; Tue, 7 Jul 2015 18:57:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0C29206ED for ; Tue, 7 Jul 2015 18:57:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934452AbbGGSyQ (ORCPT ); Tue, 7 Jul 2015 14:54:16 -0400 Received: from foss.arm.com ([217.140.101.70]:37709 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932968AbbGGSXk (ORCPT ); Tue, 7 Jul 2015 14:23: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 13659627; Tue, 7 Jul 2015 11:24:07 -0700 (PDT) Received: from e105550-lin.cambridge.arm.com (e105550-lin.cambridge.arm.com [10.2.131.193]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C9B183F23A; Tue, 7 Jul 2015 11:23:37 -0700 (PDT) From: Morten Rasmussen To: peterz@infradead.org, mingo@redhat.com Cc: vincent.guittot@linaro.org, daniel.lezcano@linaro.org, Dietmar Eggemann , yuyang.du@intel.com, mturquette@baylibre.com, rjw@rjwysocki.net, Juri Lelli , sgurrappadi@nvidia.com, pang.xunlei@zte.com.cn, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Juri Lelli Subject: [RFCv5 PATCH 39/46] sched/cpufreq_sched: use static key for cpu frequency selection Date: Tue, 7 Jul 2015 19:24:22 +0100 Message-Id: <1436293469-25707-40-git-send-email-morten.rasmussen@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436293469-25707-1-git-send-email-morten.rasmussen@arm.com> References: <1436293469-25707-1-git-send-email-morten.rasmussen@arm.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Juri Lelli Introduce a static key to only affect scheduler hot paths when sched governor is enabled. cc: Ingo Molnar cc: Peter Zijlstra Signed-off-by: Juri Lelli Reviewed-by: Michael Turquette --- kernel/sched/cpufreq_sched.c | 14 ++++++++++++++ kernel/sched/fair.c | 1 + kernel/sched/sched.h | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/kernel/sched/cpufreq_sched.c b/kernel/sched/cpufreq_sched.c index 5020f24..2968f3a 100644 --- a/kernel/sched/cpufreq_sched.c +++ b/kernel/sched/cpufreq_sched.c @@ -203,6 +203,18 @@ void cpufreq_sched_set_cap(int cpu, unsigned long capacity) return; } +static inline void set_sched_energy_freq(void) +{ + if (!sched_energy_freq()) + static_key_slow_inc(&__sched_energy_freq); +} + +static inline void clear_sched_energy_freq(void) +{ + if (sched_energy_freq()) + static_key_slow_dec(&__sched_energy_freq); +} + static int cpufreq_sched_start(struct cpufreq_policy *policy) { struct gov_data *gd; @@ -243,6 +255,7 @@ static int cpufreq_sched_start(struct cpufreq_policy *policy) policy->governor_data = gd; gd->policy = policy; + set_sched_energy_freq(); return 0; err: @@ -254,6 +267,7 @@ static int cpufreq_sched_stop(struct cpufreq_policy *policy) { struct gov_data *gd = policy->governor_data; + clear_sched_energy_freq(); if (cpufreq_driver_might_sleep()) { kthread_stop(gd->task); } diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index f7cb6c9..d395bc9 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4282,6 +4282,7 @@ static inline void hrtick_update(struct rq *rq) #endif static bool cpu_overutilized(int cpu); +struct static_key __sched_energy_freq __read_mostly = STATIC_KEY_INIT_FALSE; /* * The enqueue_task method is called before nr_running is diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 30aa0c4..b5e27d9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1476,6 +1476,12 @@ unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) } #endif +extern struct static_key __sched_energy_freq; +static inline bool sched_energy_freq(void) +{ + return static_key_false(&__sched_energy_freq); +} + #ifdef CONFIG_CPU_FREQ_GOV_SCHED void cpufreq_sched_set_cap(int cpu, unsigned long util); #else