From patchwork Mon Oct 28 14:34:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 177928 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3474817ill; Mon, 28 Oct 2019 07:34:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqzB/+ePwamVp/dy4WyxfrJoKjhokCiq3npVYs+MtU/1a4Y3QwW+VYzZIUeLGlkfNP+w2WGL X-Received: by 2002:aa7:dd88:: with SMTP id g8mr19964823edv.247.1572273271656; Mon, 28 Oct 2019 07:34:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572273271; cv=none; d=google.com; s=arc-20160816; b=KPDgGwxZ1UXDkTFzf7Z6Rz3clHQL7OQD44nBmDzOz49z3Px1vXw661ozqodRTyx25w UH5PxBi3HsNZXY5Yh2Mr4QMn3wKsauWUP0QX08lw59c84AT/MKDoADkEq9MxGJ6kbEeJ 13qX6TPqnXf5Zr2Xwa84OC12EHcmAlGRGHlavdlxkH07uv8JQIJyPMlZAMXSqscfgl+z itaKn+EIbQY63nwKQn5oRV+54b6TIoL+1VejnffyGy05/o1uGNXE9G9X56wEoB/yv4sT cijqpupJbsSeMdTvhMr5HGYBh+KV6L6PTI8qGBoklAAuUyQ8lTYSPzuorz7ts7p+HbBe plPw== 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=BEYu7m/BP15PKxS3B/UgDB/KRkLT0CCRGNyhfdY7cDM=; b=r5rhJv8Jwp3kVUQ/iYCZ9tpdfZMF/IDQ9d3V6DBURG1joTq/oHGoscin+ZprYH3d1y POmCPWOCpmhdb65Vw4gCmOPaKtwXDM2LaIUZbsoNDJXoBfylyvSLoKC5ViSc668c14KJ 5a0IjP861eJx2HnQQF0NolXcgI5Oyi7dk/WmUQJuWu5pd6am7wZvBC1c3Q2HhuQJrxc0 Rw8HT9GDxTDk8omD+qlRfNNgNqL01Blfr8ll7RxQ3ZcdSYimqCj5lVGtyaGwCnMGI/9x 10wYc1NQb5ecAxZGDKhwdQbYBWLp4+PkBp8iqdg5PFluWVGV0PI7AC6Fvw+qfnY+A9ks 0Bew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Wys/SgWU"; 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 c36si7567894edb.58.2019.10.28.07.34.31; Mon, 28 Oct 2019 07:34:31 -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="Wys/SgWU"; 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 S2390132AbfJ1Oea (ORCPT + 10 others); Mon, 28 Oct 2019 10:34:30 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35830 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390127AbfJ1Oea (ORCPT ); Mon, 28 Oct 2019 10:34:30 -0400 Received: by mail-wm1-f67.google.com with SMTP id x5so2143808wmi.0 for ; Mon, 28 Oct 2019 07:34: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=BEYu7m/BP15PKxS3B/UgDB/KRkLT0CCRGNyhfdY7cDM=; b=Wys/SgWUXZA1zYzmzVS6ULJQ+rZkhvNARj/2aQx3Um+V5En3UGIAUu5lPaAq6NlAoC oXnZzYO1AIRzADf997O87rUnvIOU5cxuJ8WhHTPVAZUpKxpsafFeXDIFDeRYePVcuJMd ncbSTz05rd692UnYqEoD9+YWYIW5LMsdew9vFFhtU18msfjeYJfonuLa5m259cgEKyje SEWRJhnlKeZ56uomr6cJby2wzWmLizFDMdnB5/ox+FzMWfZqoBeU3hkRhrSA2e1MA/MB YjVW2DiYtI5UlBW8CrK7NHf+LKIiOmyJwPdfD2UazoqsmUwiVCWkjqtdrvgzWXx79lL3 GaEQ== 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=BEYu7m/BP15PKxS3B/UgDB/KRkLT0CCRGNyhfdY7cDM=; b=LIayvr2HHVEk4aJiryIEmsx3drjvEqfUfR98xvfQDd6TycOBeYjnnDFjr8nDZJhx8E ziznuRy3iqux4zT/kA3d0SLhW9TL8YmkuUR1k8QRKqe9fp+iZ0et64hVVEeZau6q15NS RQmtDdIXX9MUBWjh34iQEE8pqQWV//8w1uzVZilbguqz0vsO/15bIs3teLNT7Hyz7AFE UgtXoKYH2DRRM2B1U1LxaosL45ar4ineGhAdmEsrHVKhVtckAMDRLym1MvseDhkXtTzi hCnNdM+KlVBgBY24sYtSDfkR16QPaRAAQRp1C2Oa0xhJGP1+NYUUHtS1ZjHehUM7sosc SqoQ== X-Gm-Message-State: APjAAAWIzmmCE78Hpk3OLo5drd2iBIW7j0umzDtulAwVa/7UdTBssODy UCu4b8DV35F8YMbHYfQ0Mi1HFg== X-Received: by 2002:a1c:48c4:: with SMTP id v187mr267338wma.27.1572273267709; Mon, 28 Oct 2019 07:34:27 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:d48d:c917:1f3e:4a87]) by smtp.gmail.com with ESMTPSA id g5sm14166144wmg.12.2019.10.28.07.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 07:34:27 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: mathieu.poirier@linaro.org, mingo@redhat.com, peterz@infradead.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org Subject: [PATCH V5 1/3] cpuidle: play_idle: Make play_idle more flexible Date: Mon, 28 Oct 2019 15:34:17 +0100 Message-Id: <20191028143419.16236-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 Cc: Ulf Hansson --- V5: - Fix s2idle default idle state value: https://lkml.org/lkml/2019/10/15/522 --- drivers/cpuidle/cpuidle.c | 21 +++++++++++---------- include/linux/cpuidle.h | 13 ++++++------- kernel/sched/idle.c | 11 +++++++---- 3 files changed, 24 insertions(+), 21 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 4b6b5bea8f79..b5602ab28601 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 8dad5aa600ea..fc7f5216b579 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(); @@ -176,12 +177,14 @@ static void cpuidle_idle_call(void) } rcu_idle_exit(); + next_state = cpuidle_find_deepest_state(); + } else { + next_state = dev->use_state; } tick_nohz_idle_stop_tick(); rcu_idle_enter(); - next_state = cpuidle_find_deepest_state(drv, dev); call_cpuidle(drv, dev, next_state); } else { bool stop_tick = true; @@ -328,7 +331,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 +342,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 Mon Oct 28 14:34:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 177929 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3474870ill; Mon, 28 Oct 2019 07:34:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqzp1Svc9ayvihPcLJMOYztIhcSMoEH//veAIUmyUBaOhGcc82U+UMsH+j3WkMpwxEYEBXkb X-Received: by 2002:a17:906:e101:: with SMTP id gj1mr17355962ejb.253.1572273274705; Mon, 28 Oct 2019 07:34:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572273274; cv=none; d=google.com; s=arc-20160816; b=JO5HzwzKlqdUFx5KTN2yz73gkFNrSJMiTIQiJPsuYyJHXN/9Y3TW3wgLYRX/gUzVDx QDinwwBWzZCINb5aNWgLtLL5UJ5bLudoBPjcVAiAJHFIxRaUe/PNACnUJ8OsaSCylQGx P7m3pdv+KDzFWZyB6XN54LMMnYqWv8sedmWjdWwci/kLlZscs90Mk+ILmuepj49eCFF9 0ZluChtCMW9EVa08U/tbwSgvpUgiDCqlk1miTflmwQZ02UlTquTHS9ZTxFi+6qfXIpK/ 5hf9D2V736u4j69eUMBVmmEJKatq+DUcUX3r3kDQHTxeh8k+RIN/oVfo2eTHH8Dx2hrL i9/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=4oykr6hhSS8d3p5gLtPenEIbZRgipyeUhU1SI+xjRiw=; b=WXDJEbnJbSoV2gkVmjrRfCDt5PZDSPvrot2wfX6y6tMD5SZlSQkqaw8CqfA3+T6X/2 N6D59CGpKKfVfQWNjWb/m8minfNLvWjCA+VyFaRPOraYGtIf+VFipP2PAr4ifYTj+M55 SziNPSwnWPT5cVvq6mFJV8YUHvyv2q4vyVn0W9E9RpRwlnPQLD6BMYxcGuFc/AuauVn1 EKCqX5klNlf3c0Wa7ZTZT4raTz6qSbqVvobfBSwlEmONdxS5f/iA+5K82hnPQ4CIl+W1 vDDqHfPi9VZ1MYvq9c9BKu8luDsIlD0RP8POBXSNtsM/lX0ZtOTb/m4BPpZYIUBH1Ifj X9YQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aJ3p1z6E; 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 qw5si6402157ejb.91.2019.10.28.07.34.34; Mon, 28 Oct 2019 07:34: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=aJ3p1z6E; 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 S2390145AbfJ1Oec (ORCPT + 10 others); Mon, 28 Oct 2019 10:34:32 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:44064 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390130AbfJ1Oec (ORCPT ); Mon, 28 Oct 2019 10:34:32 -0400 Received: by mail-wr1-f65.google.com with SMTP id z11so10107332wro.11 for ; Mon, 28 Oct 2019 07:34:29 -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=4oykr6hhSS8d3p5gLtPenEIbZRgipyeUhU1SI+xjRiw=; b=aJ3p1z6EQWyhd80OLGf1tsrUeqZWBC6HyUHS8fwhqb2EzHX+omuOe/u7GDDGpsIrZj veqnLHFwjh/YE7AKfRmDF2cOLw2UeINHKYuJaqEBdd0Jl23DaUy5fFiPwntEoPwpeDym FeeE7nlcO627qs3lyV4TSGsVaOy/P4LcyH0kkRVJUqum/w7IPpbcit16DZUhqo2mFLI+ V9a10F6BN8yhtzpA5p9a2eUqnfTOzRUZxT1f5hWmY9tnZ6IZkTVBJDCY8ZAuQFIUd5aK NqBB+Z5Q/ero5VMfMe0Q5bO5zVk+GAgMFUGlOUI+66qamQcsLyHu/EWJeOpelKUfeazJ OEgQ== 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=4oykr6hhSS8d3p5gLtPenEIbZRgipyeUhU1SI+xjRiw=; b=WUWtxzwHTKn2uD5nGEUfrfsA2IUSOfxq+0HwFGkNcP07BZVrKOYq5c6kfUGSU+z99t GSToJqEZDllPTAsbNk1/WHKT9ejhYroowcKQp9KfMudfmoKvVIAyAPZt9lZU82nKfm2y jp5P/XWMTVdd7SwrFHeyS/vd0XXNjmvOTN2LfOqS+8nJ429L3PT8D1puATrUJpfbTV2N 86j6UVG1m6cQ+n5KAtf2NXHhkFUCZr9tv8oqxNV12B9AuFTdJNW163p7rkccCgFapaWW kAV5Ncb/gpTG58azU46UvjszkDcj/1bpc0i/dzZz5EzX4kQKQmfQU7cn1DG0oP9UcfX4 NDSA== X-Gm-Message-State: APjAAAXb7bYXOt3dQlRu+V4m9J01rijJhtmlPh3V/QJrBGq1VuKabcWE n1n7wWx+wLcPxod6PbDlc6M7FMNrYI4= X-Received: by 2002:adf:f810:: with SMTP id s16mr12632216wrp.127.1572273268819; Mon, 28 Oct 2019 07:34:28 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:d48d:c917:1f3e:4a87]) by smtp.gmail.com with ESMTPSA id g5sm14166144wmg.12.2019.10.28.07.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 07:34:28 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: mathieu.poirier@linaro.org, mingo@redhat.com, peterz@infradead.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org Subject: [PATCH V5 2/3] cpuidle: play_idle: Specify play_idle with an idle state Date: Mon, 28 Oct 2019 15:34:18 +0100 Message-Id: <20191028143419.16236-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191028143419.16236-1-daniel.lezcano@linaro.org> References: <20191028143419.16236-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(-) -- 2.17.1 Reviewed-by: Ulf Hansson 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 d0633ebdaa9c..23478208fc55 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 fc7f5216b579..af90abe0c1b3 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -314,7 +314,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; @@ -331,7 +331,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);