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: 11173771 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4939D16B1 for ; Fri, 4 Oct 2019 08:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E02B21A4C for ; Fri, 4 Oct 2019 08:32:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="gLVoTxTY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730147AbfJDIce (ORCPT ); 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-Google-Smtp-Source: APXvYqwLFT1XQ84Dvr29PPk+Tn+ldePovSJTVW+Cy/vU2EoaglqFpt0A09jqIP+J2sR7KjOhUkR/KQ== 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(-) 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(); From patchwork Fri Oct 4 08:32:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 11173773 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC15A16B1 for ; Fri, 4 Oct 2019 08:32:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0B0B21D81 for ; Fri, 4 Oct 2019 08:32:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="efZ/l09I" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730698AbfJDIcq (ORCPT ); Fri, 4 Oct 2019 04:32:46 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50973 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730501AbfJDIcq (ORCPT ); Fri, 4 Oct 2019 04:32:46 -0400 Received: by mail-wm1-f65.google.com with SMTP id 5so4866358wmg.0 for ; Fri, 04 Oct 2019 01:32:42 -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:in-reply-to:references; bh=uHtN2KXg7csKh0URhIaVh4s7+YGI4rv+4/HJKnQimAk=; b=efZ/l09IxEYYv4a/hJ1ShKs5ROhMTgZVYiI2UmVudReioN0INj79IdyA1YLTqaKjdU R85CI/nMyCs0pj2FYsyDGYgtbbS0ZzUdlkTaaw3shGGWavs/dJhOHpwSXNFQVl8QRNGz 3hE3o5PBHB4/mDthrTC9fMwBeMyo5/CJplg1nTwjIjWLIEDiiHGrD2GnmwvIzS3lUWOH 11dEBnrsnE6OcUesIY9VdGArID7bbpIT+gVsl4lB9DGhbtf8jebAwnBapV3aGwEFj5Je SicEA40oONMKb9WayHKe0YkOgYK470O0O2ZMKNJBrFTxYisie7jwoCkdJlfwe384b3Lc UgXw== 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=uHtN2KXg7csKh0URhIaVh4s7+YGI4rv+4/HJKnQimAk=; b=d9sc+xGnY1cilYHqS1fJxp4Y+yqueAGZFvgGZh0E3tWyZTV+u3r+oaXjpWRHYbE5Ie YDsKfplD9bDeIy+gCvoZmJBwBPWbTf/PLl71ZjX6pmcp/GXAMnCBSOLHf3tvriqmCpfT Gb4BeGxcVjkyuuubTqNtRndEum59gXhvl3hQ9N6FwOhbZEJ2o4HpMFHL5aqJk1pHL2ar U6K+sgWwbbUE+UpwHp+ywTIo8MAzZoLFp8CTdPhTlCUaV/txo4AghrlBXhm0rdSnG+CD Ws5/oRcUIizM9JkHM9aOJbx3EyiDz9VSSdSP00I1JCMgtiyDFRh2/R2zsC+1TrAZRT7J h+Ig== X-Gm-Message-State: APjAAAX1pR7VbkRcon/XMrswrrVSMrmnxv+6maV4NlPkFMX7n6GYkWfY hajQWHBPMDbH0/zmFbcLZacAQw== X-Google-Smtp-Source: APXvYqwJnjCRZKWVHF3uoTgFE2tUYZlg5wj1aIUzlB4L/JOqO6EYeEcXVIxdXW6rUSJ2LpdDyQZYnw== X-Received: by 2002:a7b:cf0e:: with SMTP id l14mr10198941wmg.138.1570177961872; Fri, 04 Oct 2019 01:32:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 01:32:41 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: Mathieu Poirier , Zhang Rui , Eduardo Valentin , Ingo Molnar , Peter Zijlstra , Greg Kroah-Hartman , Allison Randal , Luc Van Oostenryck , Thomas Gleixner , Amit Kucheria , Josh Poimboeuf , Nicholas Piggin , Jiri Kosina , linux-pm@vger.kernel.org (open list:CPU IDLE TIME MANAGEMENT FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 2/3] cpuidle: play_idle: Specify play_idle with an idle state Date: Fri, 4 Oct 2019 10:32:04 +0200 Message-Id: <20191004083205.29302-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191004083205.29302-1-daniel.lezcano@linaro.org> References: <20191004083205.29302-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently, the play_idle function does not allow to tell which idle state we want to go. Improve this by passing the idle state as parameter to the function. Export cpuidle_find_deepest_state() symbol as it is used from the intel_powerclamp driver as a module. There is no functional changes, the cpuidle state is the deepest one. Signed-off-by: Daniel Lezcano Acked-by: Mathieu Poirier --- V4: - Add EXPORT_SYMBOL_GPL(cpuidle_find_deepest_state) for the intel_powerclamp driver when this one is compiled as a module V3: - Add missing cpuidle.h header --- drivers/cpuidle/cpuidle.c | 1 + drivers/powercap/idle_inject.c | 4 +++- drivers/thermal/intel/intel_powerclamp.c | 4 +++- include/linux/cpu.h | 2 +- kernel/sched/idle.c | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index f8b54f277589..94804e532b9a 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -126,6 +126,7 @@ int cpuidle_find_deepest_state(void) return find_deepest_state(drv, dev, UINT_MAX, 0, false); } +EXPORT_SYMBOL_GPL(cpuidle_find_deepest_state); #ifdef CONFIG_SUSPEND static void enter_s2idle_proper(struct cpuidle_driver *drv, diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c index cd1270614cc6..233c878cbf46 100644 --- a/drivers/powercap/idle_inject.c +++ b/drivers/powercap/idle_inject.c @@ -38,6 +38,7 @@ #define pr_fmt(fmt) "ii_dev: " fmt #include +#include #include #include #include @@ -138,7 +139,8 @@ static void idle_inject_fn(unsigned int cpu) */ iit->should_run = 0; - play_idle(READ_ONCE(ii_dev->idle_duration_us)); + play_idle(READ_ONCE(ii_dev->idle_duration_us), + cpuidle_find_deepest_state()); } /** diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c index 53216dcbe173..b55786c169ae 100644 --- a/drivers/thermal/intel/intel_powerclamp.c +++ b/drivers/thermal/intel/intel_powerclamp.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -430,7 +431,8 @@ static void clamp_idle_injection_func(struct kthread_work *work) if (should_skip) goto balance; - play_idle(jiffies_to_usecs(w_data->duration_jiffies)); + play_idle(jiffies_to_usecs(w_data->duration_jiffies), + cpuidle_find_deepest_state()); balance: if (clamping && w_data->clamping && cpu_online(w_data->cpu)) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 88dc0c653925..76e3038b63ce 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -179,7 +179,7 @@ void arch_cpu_idle_dead(void); int cpu_report_state(int cpu); int cpu_check_up_prepare(int cpu); void cpu_set_state_online(int cpu); -void play_idle(unsigned long duration_us); +void play_idle(unsigned long duration_us, int state); #ifdef CONFIG_HOTPLUG_CPU bool cpu_wait_death(unsigned int cpu, int seconds); diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 17da9cb309e1..ead439dab2b5 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -311,7 +311,7 @@ static enum hrtimer_restart idle_inject_timer_fn(struct hrtimer *timer) return HRTIMER_NORESTART; } -void play_idle(unsigned long duration_us) +void play_idle(unsigned long duration_us, int state) { struct idle_timer it; @@ -328,7 +328,7 @@ void play_idle(unsigned long duration_us) rcu_sleep_check(); preempt_disable(); current->flags |= PF_IDLE; - cpuidle_use_state(cpuidle_find_deepest_state()); + cpuidle_use_state(state); it.done = 0; hrtimer_init_on_stack(&it.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); From patchwork Fri Oct 4 08:32:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 11173775 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D0AE139A for ; Fri, 4 Oct 2019 08:32:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B6F3222CB for ; Fri, 4 Oct 2019 08:32:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oVFmdVVI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730489AbfJDIct (ORCPT ); Fri, 4 Oct 2019 04:32:49 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:53105 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730703AbfJDIct (ORCPT ); Fri, 4 Oct 2019 04:32:49 -0400 Received: by mail-wm1-f68.google.com with SMTP id r19so4861220wmh.2 for ; Fri, 04 Oct 2019 01:32:47 -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:in-reply-to:references; bh=kEN8tPAT2fA9Rfc8gxL4d7nyWjikV+WP3V/1RcMXwQA=; b=oVFmdVVIc11Zlr4x2tuAKbzp/HjGfsCcy3KvaDNrBP3pQyFmahO5cujD6Dgz/X+32V 0AfGj9c9G9TKU7Rl18LwQ/fxFmX/eHgsWxH7xZ2s316BEkEiFDm5WY+NptQv+4UU6Xf3 fw8BOki+utT0NRmQbzptfCED2+w9XG5eeJTVNKnQFI22ZOgBB5STQIUHEyJQdqwK05uV 14XAqphVXRycHew3AAUXuU/sQGkdEOxBEEDAu4BgoN6GhnQZkN3MiGmZEPJwUYNdIZB6 ajCsQCjQ5tsUz9iSyLvQSwFtK9KdT/tv1O9HUg+UB+ezyG9LeaD4F5J2ULOKrQFrfs9B JvBA== 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=kEN8tPAT2fA9Rfc8gxL4d7nyWjikV+WP3V/1RcMXwQA=; b=ULY2+fxbhZGOg1IP7oEslHqe/0i+34lhSNzauPKRRtPI2DTCjl8RhWaANFv3oQMtTm nTiTugeYiAYxw5ce1kq6h9Hh0pb67UlYNYpiL9Bt2BSXUiETWLc/la6bz0SpxoQ0CtBA 4zs9gwLnt/tiY/cKane8bmCW3VehCu11khyMLKAoXFO75wvsIJssxj0DN5BdpgGxEEMv wi/zkXLYHhqblWQM31hUxf0OuphYwRJ8CqFIXy3WTlPMywPRHfhvuchkp/Yq121KU4f3 GtK+hcefYAfJgjv+b0J/drb+Xhsn2Eo0LgpKXJNqldwPvsaPkdEq+xIW+nXTnriH4BKD XPQQ== X-Gm-Message-State: APjAAAXu3NR1EJQ70R5lp/0t0DYMCUL9Nro++9njZPIn8rfkBYNTR/xo 3HmcNBqG58vT0FhoG0tnoLZ0t4owcQk= X-Google-Smtp-Source: APXvYqzJFIWMoTzEnQVH74TDRAD+YRGy7EoLnrDhnaHEaPkYov+ye/FVp+PtuZejfYxQPWbE6476Yw== X-Received: by 2002:a1c:29c4:: with SMTP id p187mr10545862wmp.28.1570177967088; Fri, 04 Oct 2019 01:32:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 01:32:46 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: Mathieu Poirier , linux-pm@vger.kernel.org (open list:POWER MANAGEMENT CORE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 3/3] powercap/drivers/idle_inject: Specify the idle state to inject Date: Fri, 4 Oct 2019 10:32:05 +0200 Message-Id: <20191004083205.29302-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191004083205.29302-1-daniel.lezcano@linaro.org> References: <20191004083205.29302-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently the idle injection framework only allows to inject the deepest idle state available on the system. Give the opportunity to specify which idle state we want to inject by adding a new function helper to set the state and use it when calling play_idle(). There is no functional changes, the cpuidle state is the deepest one. Signed-off-by: Daniel Lezcano Acked-by: Mathieu Poirier --- drivers/powercap/idle_inject.c | 14 +++++++++++++- include/linux/idle_inject.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c index 233c878cbf46..a612c425d74c 100644 --- a/drivers/powercap/idle_inject.c +++ b/drivers/powercap/idle_inject.c @@ -66,6 +66,7 @@ struct idle_inject_thread { */ struct idle_inject_device { struct hrtimer timer; + int state; unsigned int idle_duration_us; unsigned int run_duration_us; unsigned long int cpumask[0]; @@ -140,7 +141,7 @@ static void idle_inject_fn(unsigned int cpu) iit->should_run = 0; play_idle(READ_ONCE(ii_dev->idle_duration_us), - cpuidle_find_deepest_state()); + READ_ONCE(ii_dev->state)); } /** @@ -171,6 +172,16 @@ void idle_inject_get_duration(struct idle_inject_device *ii_dev, *idle_duration_us = READ_ONCE(ii_dev->idle_duration_us); } +/** + * idle_inject_set_state - set the idle state to inject + * @state: an integer for the idle state to inject + */ +void idle_inject_set_state(struct idle_inject_device *ii_dev, int state) +{ + if (state >= CPUIDLE_STATE_NOUSE && state < CPUIDLE_STATE_MAX) + WRITE_ONCE(ii_dev->state, state); +} + /** * idle_inject_start - start idle injections * @ii_dev: idle injection control device structure @@ -299,6 +310,7 @@ struct idle_inject_device *idle_inject_register(struct cpumask *cpumask) cpumask_copy(to_cpumask(ii_dev->cpumask), cpumask); hrtimer_init(&ii_dev->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ii_dev->timer.function = idle_inject_timer_fn; + ii_dev->state = cpuidle_find_deepest_state(); for_each_cpu(cpu, to_cpumask(ii_dev->cpumask)) { diff --git a/include/linux/idle_inject.h b/include/linux/idle_inject.h index a445cd1a36c5..e2b26b9ccd34 100644 --- a/include/linux/idle_inject.h +++ b/include/linux/idle_inject.h @@ -26,4 +26,7 @@ void idle_inject_set_duration(struct idle_inject_device *ii_dev, void idle_inject_get_duration(struct idle_inject_device *ii_dev, unsigned int *run_duration_us, unsigned int *idle_duration_us); + +void idle_inject_set_state(struct idle_inject_device *ii_dev, int state); + #endif /* __IDLE_INJECT_H__ */