From patchwork Mon Sep 9 14:50:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 173380 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp4464104ilq; Mon, 9 Sep 2019 07:50:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxWaCS3g6p+j5Bf5BHVlRfZImJrcZRJ+NNsay02Rtnm3+Lh8YhIHM/+wNAY0GOdH0SgVFMr X-Received: by 2002:a17:906:c304:: with SMTP id s4mr19895733ejz.71.1568040634811; Mon, 09 Sep 2019 07:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568040634; cv=none; d=google.com; s=arc-20160816; b=q6ncucLldST/UD25POjOsDtnGb/Wq/bzHoXp2KDVMStmO/PQe9L+fkEa/6efyACi29 396dxqoplmX+ZLa8kqGjGW5GQ4VSQ/z5jyxKm9pouDAzn0ETidTn2WTHs/dFpvQLl3q4 LD8q2LJBV/fP0KqyKtdt5H2h341j/SySZBazrmC5gH4lsV2Kgrmm0YwON/wiZezIhNEq +7VCKN9/CifWdXgm+feIxWp9I0bexY1Le7XGlv7j9QIsvU+QZBlzitEIIiH7NTXD6T3g YXllgkdtnkt9ZVHADkxR4xryw+Ugd0NJjJvNzCXISyIqD+o1krGfBKvbYg0Fbtoyjkhb lIVg== 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=oZP76rv205az1grwmWrhe63M4bBh0NcdK+s6AYL0I9k=; b=azA5kxbqg+ejcvCKAvkNQZmKt2Um9r5z/Z/1fEA8wAfiYIxbdVm6aA625g2cCMved7 TK1P+z+fQ5oTmimBAo5kSIce3dGVWgc8HlLGykHwVIZYMKcqTzcNMuMeO9FRyTe3ILTG qekIkq/OdzoYIN+f4r1J6nbGHAwj74bw6nEmsyvBjlyOR9Fbq66wiehZQRVTAZL0YGch y0tsXDHQBKpFj6fjBvgf5UsuhDZ1uSTGvA4pb+XBGP/EXTf+NvJlgsWNih8FXXwSRN/5 9Xl5v0l9Ecq+Tkn3mo/YYU28/GFNpAjOj8npomSLNeh7plHZ/RIxqGmzX4hn36P6S6ed XJWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VIVD28W2; 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 q28si8306286eda.322.2019.09.09.07.50.33; Mon, 09 Sep 2019 07:50:34 -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=VIVD28W2; 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 S1726370AbfIIOub (ORCPT + 11 others); Mon, 9 Sep 2019 10:50:31 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34112 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726070AbfIIOua (ORCPT ); Mon, 9 Sep 2019 10:50:30 -0400 Received: by mail-wr1-f67.google.com with SMTP id a11so4406313wrx.1 for ; Mon, 09 Sep 2019 07:50:28 -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=oZP76rv205az1grwmWrhe63M4bBh0NcdK+s6AYL0I9k=; b=VIVD28W221Guao0m1eI/Gf84qrm9EzISk8mpzmf0mCDJvaxsfM6/bn1PUlGdc83KqG /JKcFfGgQyz1H9UBfT2+Yy2YajrU59IcWnhZVVECJIL7treWesJPdb549rgd6HZ1/ghL v+qQUnVytjDRgXzLpjW2Nun0gWle3PyJlZdXaeELKvBOHApghj6XfYAhOwlMTfalBrxf dFhhhji8M8A9kCev4kuvWV+fKVobuqUotTFtwO5cCRDVOlqXK2n0Frvj1RCvosZ+iwRO pGKo4/euBYQZxu+uWZmXnJYSrg0+7YbPT4piB5bOUrQRxbsaHuGPc5vIS17FDcsP+C/F fhXA== 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=oZP76rv205az1grwmWrhe63M4bBh0NcdK+s6AYL0I9k=; b=t/16Jm8DfovcbgbsWrDHxOFZfmN5D7n7VP9l5KgP73Lj06tyyCATvsK0XmDsl4exaD O80cYRXbXymTYyjX+twnM6MiGpQBdvYl4Wau9N/hk/EMcBABhs3htAWaaGKb5mof7t8q WP3bsrmwETceW9/GaZ+RNfZ6pMoAAIc5guIy3aEPwg2ZtvxLW5vASHQ0JI3kGDIsRsLu szc4Y8xk4pIHE+lU+UMChYSb6+Lg91AqGOZjoxIQexMqazuhp4XsZuXGWIg0DqWGb8bf 9y7IfGIJEqjBSjOJ3Z5j4VCqfggEX5i7SnGbFl/2F5INXXAnUx/ZcWzV+dU5CWeQCRBg txNg== X-Gm-Message-State: APjAAAWRKrlDzOrF5gyMR5SyubjRX1iHeKi01H8q9F3KFHGShc8yL+0A LH3bAzpZabSd97uf1wrvmdtXrA== X-Received: by 2002:adf:ead2:: with SMTP id o18mr18785414wrn.107.1568040627643; Mon, 09 Sep 2019 07:50:27 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:a060:80d2:1467:e511]) by smtp.gmail.com with ESMTPSA id v2sm31921147wmf.18.2019.09.09.07.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2019 07:50:27 -0700 (PDT) From: Daniel Lezcano To: rafael@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Ingo Molnar , Peter Zijlstra Subject: [PATCH 1/3] cpuidle: play_idle: Make play_idle more flexible Date: Mon, 9 Sep 2019 16:50:13 +0200 Message-Id: <20190909145015.26317-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 --- drivers/cpuidle/cpuidle.c | 21 +++++++++++---------- include/linux/cpuidle.h | 14 +++++++------- kernel/sched/idle.c | 10 +++++----- 3 files changed, 23 insertions(+), 22 deletions(-) -- 2.17.1 Acked-by: Mathieu Poirier 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 1a9f54eb3aa1..a1839122e219 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,12 @@ 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; @@ -200,19 +202,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();