From patchwork Wed Aug 19 18:47:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Bellasi X-Patchwork-Id: 7038811 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 18BD89F372 for ; Wed, 19 Aug 2015 18:48:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 462AD20547 for ; Wed, 19 Aug 2015 18:48:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55CC620480 for ; Wed, 19 Aug 2015 18:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751804AbbHSSrt (ORCPT ); Wed, 19 Aug 2015 14:47:49 -0400 Received: from foss.arm.com ([217.140.101.70]:53355 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258AbbHSSrr (ORCPT ); Wed, 19 Aug 2015 14:47:47 -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 3771E592; Wed, 19 Aug 2015 11:47:38 -0700 (PDT) Received: from e105326-lin.cambridge.arm.com (e105326-lin.cambridge.arm.com [10.2.131.33]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E13843F21A; Wed, 19 Aug 2015 11:47:45 -0700 (PDT) From: Patrick Bellasi To: Peter Zijlstra , Ingo Molnar Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Juri Lelli Subject: [RFC PATCH 04/14] sched/{fair, cpufreq_sched}: add reset_capacity interface Date: Wed, 19 Aug 2015 19:47:14 +0100 Message-Id: <1440010044-3402-5-git-send-email-patrick.bellasi@arm.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1440010044-3402-1-git-send-email-patrick.bellasi@arm.com> References: <1440010044-3402-1-git-send-email-patrick.bellasi@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.5 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 When a CPU is going idle it is pointless to ask for an OPP update as we would wake up another task only to ask for the same capacity we are already running at (utilization gets moved to blocked_utilization). We thus add cpufreq_sched_reset_capacity() interface to just reset our current capacity request without triggering any real update. At wakeup we will use the decayed utilization to select an appropriate OPP. cc: Ingo Molnar cc: Peter Zijlstra Signed-off-by: Juri Lelli --- kernel/sched/cpufreq_sched.c | 12 ++++++++++++ kernel/sched/fair.c | 8 ++++++-- kernel/sched/sched.h | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/kernel/sched/cpufreq_sched.c b/kernel/sched/cpufreq_sched.c index 2968f3a..e6b4a22 100644 --- a/kernel/sched/cpufreq_sched.c +++ b/kernel/sched/cpufreq_sched.c @@ -203,6 +203,18 @@ out: return; } +/** + * cpufreq_sched_reset_capacity - interface to scheduler for resetting capacity + * requests + * @cpu: cpu whose capacity request has to be reset + * + * This _wont trigger_ any capacity update. + */ +void cpufreq_sched_reset_cap(int cpu) +{ + per_cpu(pcpu_capacity, cpu) = 0; +} + static inline void set_sched_energy_freq(void) { if (!sched_energy_freq()) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a75ea07..2961e29 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4218,8 +4218,12 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) * during load balancing, but in these cases it seems wise to trigger * as single request after load balancing is done. */ - if (task_sleep) - update_capacity_of(cpu_of(rq)); + if (task_sleep) { + if (rq->cfs.nr_running) + update_capacity_of(cpu_of(rq)); + else if (sched_energy_freq()) + cpufreq_sched_reset_cap(cpu_of(rq)); + } } hrtick_update(rq); } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1f0b433..ad9293b 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1424,9 +1424,12 @@ static inline bool sched_energy_freq(void) #ifdef CONFIG_CPU_FREQ_GOV_SCHED void cpufreq_sched_set_cap(int cpu, unsigned long util); +void cpufreq_sched_reset_cap(int cpu); #else static inline void cpufreq_sched_set_cap(int cpu, unsigned long util) { } +static inline void cpufreq_sched_reset_cap(int cpu) +{ } #endif static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta)