From patchwork Fri Oct 4 08:32:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 175208 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp389157ill; Fri, 4 Oct 2019 01:32:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcyCp/ibhdGEgQSGjLsoxdXSW4rOtQwTd25KrYTP253AhmgcPSo++Efap55de4c9/e6reg X-Received: by 2002:a50:9eac:: with SMTP id a41mr14207132edf.193.1570177958082; Fri, 04 Oct 2019 01:32:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570177958; cv=none; d=google.com; s=arc-20160816; b=e/b8duPw0P3LEfX/+nLVnKGOqbFsVSqW//c9z7SNcBmm5fi+4SU9/NOvrA+E25JFz9 eERvIB4xl3BFW0G4qGARXmKdEPJha8XMNwT9Wsl+/zFZ2XFtAsXZseIQ8as0k084XXRZ tL8t9lb42xv42i5DF/EHTvlVafXHFA4vhweBcW6hBx1V9nRVwVASaC7csc8s1QSJ62rR O2mBDulI8D2YMUNXfWYS1waK81Fbib8cdq3gzrvECILyErkVKbwLuPzFBns0AhGBrbZS Tqn1QpO36oiZqkQ0R3p84ZXA+HlogkOg1wEsttrfXV6hP2xfEFV44xwKEMb9YY0g5wUn tvlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=odawl8FFS06ZpSGBB5Pezvvx3lJRWzOpGgq0TcvgjOg=; b=GeAVFRlqxVADS1Dm7P9yjkOACZ4D7f2MYxPS3q+2mSRitpXc4kbD0sxvhtLkBCXSiY SuOo2JGZCbzfCVg6gX5w4umlh10ew0qWr2RQ1lS0PdNInjyNhARF7PRgqKjuUZrJbUrV f0b8Kfdk3tAAemppCnI8i/egW+Rcrbkw390fJWpvUrY4wOgr5MYc/jhpC+OBn06YtfbH Bh8jLwm5W8Ys63uxLMKfkTIlXcmkBXhNbthy6n7NvaYMfSpJHYtVMVRMoRndbI8/FsmL nHDs0AuVjnCMYy94vfdC8vLEShNrJeWGrTKhJ7ynG/EDbTGSn7FG4nXPcTj73ybtWuY0 zXfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gLVoTxTY; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s17si2494309ejz.148.2019.10.04.01.32.37; Fri, 04 Oct 2019 01:32:38 -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; dkim=pass header.i=@linaro.org header.s=google header.b=gLVoTxTY; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730147AbfJDIce (ORCPT + 10 others); Fri, 4 Oct 2019 04:32:34 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36590 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728037AbfJDIce (ORCPT ); Fri, 4 Oct 2019 04:32:34 -0400 Received: by mail-wr1-f66.google.com with SMTP id y19so6046946wrd.3 for ; Fri, 04 Oct 2019 01:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=odawl8FFS06ZpSGBB5Pezvvx3lJRWzOpGgq0TcvgjOg=; b=gLVoTxTYU4YJJs5PxMDO/rAdoZSdOQm4A/y0U5DDHjyjlcr/OO5sO/eqP/gwd9cynE VGggA9SR5FpSQBl+A/TBs5VbPtrp5qV2DhJLKnPdj7pKfIiyaN28mLihZncEC8uZwLBP 3WqL84Y0dWvPiNF9/W6Hd97g8R/7NUtbnA0npwx1Tc9IQjv0nBr+t61pGk+vGiUWk+y8 7Bfd4IddY9DStT4mNRzdbJDoRmqqo4vjsuZzQ0kLEnPbztiuv5bV7ihpT5t1te5kHkE0 /txVt3ZLr+NFXJmCkVjbzN9BDEUTDcTsGhHgyjZyK6XNhU3OMgvzwxKskYPDyDiTi1rL ExSw== 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; bh=odawl8FFS06ZpSGBB5Pezvvx3lJRWzOpGgq0TcvgjOg=; b=Ta/d2UJ2b+DljGxgzZZCMLUTxGFHwxkSzcx4CfU5RiH3bmlo4ByKzKolM8/41aj2cL +UpFZPD1BBR1YFvsTR8J1wKHqVmNIcNIKKldGqb3iM0s5Z42oaNxzmGs1BZIeBXZG8pJ Riy07E7sWomO+qAx+H2qviatYk3FGG4Vg2329tDeE7dBILVkjL35V+nO0dSYOhmVYTBj BqIINokrsN8Ayo1eIC/kyYcyliPC3qvul9Q2VD37wU2YLt3CwKvS5R7wXY6Vaj12KP70 elcoK8yIKwZCvkHltxYInvoxp4+mZhs1Cpvd1AGfQiVEj10ZASuz6WivBA/gDuD8U2O3 2jdQ== X-Gm-Message-State: APjAAAXx+jRRkhZGOht8xi+JEHPYt23pq4cdfxRTFVLwEIOXZDN1VOH/ hz+a+V+TIwlPWqRzYYAxidLl8Q== X-Received: by 2002:adf:e951:: with SMTP id m17mr10383807wrn.154.1570177951050; Fri, 04 Oct 2019 01:32:31 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:15f7:68ed:c037:86e6]) by smtp.gmail.com with ESMTPSA id 59sm6488304wrc.23.2019.10.04.01.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 01:32:30 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: Mathieu Poirier , Ingo Molnar , Peter Zijlstra , linux-pm@vger.kernel.org (open list:CPU IDLE TIME MANAGEMENT FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 1/3] cpuidle: play_idle: Make play_idle more flexible Date: Fri, 4 Oct 2019 10:32:03 +0200 Message-Id: <20191004083205.29302-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The play_idle function has two users, the intel powerclamp and the idle_injection. The idle injection cooling device uses the function via the idle_injection powercap's APIs. Unfortunately, play_idle is currently limited by the idle state depth: by default the deepest idle state is selected. On the ARM[64] platforms, most of the time it is the cluster idle state, the exit latency and the residency can be very high. That reduces the scope of the idle injection usage because the impact on the performances can be very significant. If the idle injection cycles can be done with a shallow state like a retention state, the cooling effect would eventually give similar results than the cpufreq cooling device. In order to prepare the function to receive an idle state parameter, let's replace the 'use_deepest_state' boolean field with 'use_state' and use this value to enter the specific idle state. The current code keeps the default behavior which is go to the deepest idle state. Signed-off-by: Daniel Lezcano Acked-by: Mathieu Poirier --- drivers/cpuidle/cpuidle.c | 21 +++++++++++---------- include/linux/cpuidle.h | 13 ++++++------- kernel/sched/idle.c | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 0895b988fa92..f8b54f277589 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -99,31 +99,31 @@ static int find_deepest_state(struct cpuidle_driver *drv, } /** - * cpuidle_use_deepest_state - Set/clear governor override flag. - * @enable: New value of the flag. + * cpuidle_use_state - Force the cpuidle framework to enter an idle state. + * @state: An integer for an idle state * - * Set/unset the current CPU to use the deepest idle state (override governors - * going forward if set). + * Specify an idle state the cpuidle framework must step in and bypass + * the idle state selection process. */ -void cpuidle_use_deepest_state(bool enable) +void cpuidle_use_state(int state) { struct cpuidle_device *dev; preempt_disable(); dev = cpuidle_get_device(); if (dev) - dev->use_deepest_state = enable; + dev->use_state = state; preempt_enable(); } /** * cpuidle_find_deepest_state - Find the deepest available idle state. - * @drv: cpuidle driver for the given CPU. - * @dev: cpuidle device for the given CPU. */ -int cpuidle_find_deepest_state(struct cpuidle_driver *drv, - struct cpuidle_device *dev) +int cpuidle_find_deepest_state(void) { + struct cpuidle_device *dev = cpuidle_get_device(); + struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); + return find_deepest_state(drv, dev, UINT_MAX, 0, false); } @@ -554,6 +554,7 @@ static void __cpuidle_unregister_device(struct cpuidle_device *dev) static void __cpuidle_device_init(struct cpuidle_device *dev) { memset(dev->states_usage, 0, sizeof(dev->states_usage)); + dev->use_state = CPUIDLE_STATE_NOUSE; dev->last_residency = 0; dev->next_hrtimer = 0; } diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 2dc4c6b19c25..ba0751b26e37 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -15,6 +15,7 @@ #include #include +#define CPUIDLE_STATE_NOUSE -1 #define CPUIDLE_STATE_MAX 10 #define CPUIDLE_NAME_LEN 16 #define CPUIDLE_DESC_LEN 32 @@ -80,11 +81,11 @@ struct cpuidle_driver_kobj; struct cpuidle_device { unsigned int registered:1; unsigned int enabled:1; - unsigned int use_deepest_state:1; unsigned int poll_time_limit:1; unsigned int cpu; ktime_t next_hrtimer; + int use_state; int last_state_idx; int last_residency; u64 poll_limit_ns; @@ -203,19 +204,17 @@ static inline struct cpuidle_device *cpuidle_get_device(void) {return NULL; } #endif #ifdef CONFIG_CPU_IDLE -extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv, - struct cpuidle_device *dev); +extern int cpuidle_find_deepest_state(void); extern int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev); -extern void cpuidle_use_deepest_state(bool enable); +extern void cpuidle_use_state(int state); #else -static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv, - struct cpuidle_device *dev) +static inline int cpuidle_find_deepest_state(void) {return -ENODEV; } static inline int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev) {return -ENODEV; } -static inline void cpuidle_use_deepest_state(bool enable) +static inline void cpuidle_use_state(int state) { } #endif diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index b98283fc6914..17da9cb309e1 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -165,7 +165,8 @@ static void cpuidle_idle_call(void) * until a proper wakeup interrupt happens. */ - if (idle_should_enter_s2idle() || dev->use_deepest_state) { + if (idle_should_enter_s2idle() || + dev->use_state != CPUIDLE_STATE_NOUSE) { if (idle_should_enter_s2idle()) { rcu_idle_enter(); @@ -181,8 +182,7 @@ static void cpuidle_idle_call(void) tick_nohz_idle_stop_tick(); rcu_idle_enter(); - next_state = cpuidle_find_deepest_state(drv, dev); - call_cpuidle(drv, dev, next_state); + call_cpuidle(drv, dev, dev->use_state); } else { bool stop_tick = true; @@ -328,7 +328,7 @@ void play_idle(unsigned long duration_us) rcu_sleep_check(); preempt_disable(); current->flags |= PF_IDLE; - cpuidle_use_deepest_state(true); + cpuidle_use_state(cpuidle_find_deepest_state()); it.done = 0; hrtimer_init_on_stack(&it.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); @@ -339,7 +339,7 @@ void play_idle(unsigned long duration_us) while (!READ_ONCE(it.done)) do_idle(); - cpuidle_use_deepest_state(false); + cpuidle_use_state(CPUIDLE_STATE_NOUSE); current->flags &= ~PF_IDLE; preempt_fold_need_resched();