From patchwork Wed Oct 30 07:51:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 178074 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp917795ill; Wed, 30 Oct 2019 00:51:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7ae8tPserYDoYfj0ij01uM5Jlqg5fYGW9TQhMcTjwZhOxCN6MdiF/m1yjrCjfwTYq28x1 X-Received: by 2002:a17:906:1a13:: with SMTP id i19mr7576126ejf.46.1572421912320; Wed, 30 Oct 2019 00:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572421912; cv=none; d=google.com; s=arc-20160816; b=oWvjEDy1WJ43zt007m3YKnbymcXoAyKPt2U4Tcu2dpWnDfXa6HN7R9UUxuLkeHKdV2 chyRnLsyHoooFPSH+HgqBLDN/ojaExxufSho46iAGABFJAvWxWk8ET1iowTWHM15dF/n X/gYXAwjyTQ/5K/NhXHDbGU0Y64nLtEPpOqJcGySXpi+j63SaffrrwfMmdkfxgy+nu7h oA3H/8PPQ6cksF/jWvgBafvsqcvewIzqqx3sN1Gk2yODngLvO6QU/ubRCjK05CDUzF+e AQlL0sKSMCWyD68OEYJqCjZrt5WpdeYIue1cSicgQJnNzbXRUmbYaQw5rYXoLXlszpE6 IttA== 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=BZNIcki3Cc1NFt4MdJedERahJMNfTWN5VN23v6fFhks=; b=Fo1OP/223juVl6AuFrtDgShH7fvwEEw3h8aNFx+2xLgcbiH1kMH7Fyup+BXdGYJalV oY0GMjD7BDVYHV9vHAfHzv5evPk+saEO7i7bgWUNlKzUvbLIaJ4FdKGZJdR33er3AdIC bpjn3NBSQVqToPnakah6RR5gb1Mbhq+V58EEV9FAu3ueeYI0UyqvoqAzjvuFfGIj+AEe su+1WkBusrIVwjH7EiBM8vV4qle7AXWfunVCXraQVh7qlTWfPgEg4+RvFZIlJlEbqQHz KpS7JKzelywte5e1Ei7pR+9kfxHXSQ3zLkTAPQaDxdhFRAGsdMm+CwwecDtEdgkPazTs u6Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MVvgsmb0; 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 s2si698134ejj.327.2019.10.30.00.51.52; Wed, 30 Oct 2019 00:51:52 -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=MVvgsmb0; 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 S1726032AbfJ3Hvv (ORCPT + 10 others); Wed, 30 Oct 2019 03:51:51 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39848 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725822AbfJ3Hvv (ORCPT ); Wed, 30 Oct 2019 03:51:51 -0400 Received: by mail-wr1-f68.google.com with SMTP id a11so1116183wra.6 for ; Wed, 30 Oct 2019 00:51:48 -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=BZNIcki3Cc1NFt4MdJedERahJMNfTWN5VN23v6fFhks=; b=MVvgsmb0yiuED+rnzOJkbrXwPIK5RV1j41jBfmNjk9r+UnsVn4cUFv3msOgZBAFX61 ZYcI3CwAijFxSnDT7kFJ9MMhdOOTgqth/I3X11+y9kjSR7+nzqN0rvewE+ue7+LOtbFo Zanf2lRAuBqY4BWx7kgLaesAR0fhaIY3QaLdwDNafzrKnS5IDCDEnKx+AjcJubjocWTv vf7g6RvNnV3ecQRtraFgica2HgGaig87ScG89cn/k/ybCN94n/YLxMpK4Jkk4s0Z5RFh /wtBt7HxSPsd31G2AXhYyoJz0x+IxQRtJfv8TgprpDNGNWOEpj1Q8PAclZ3rNezVzAhU UVvQ== 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=BZNIcki3Cc1NFt4MdJedERahJMNfTWN5VN23v6fFhks=; b=cGOAjhLo+8jXA7dQSybmYL74GzaKT3IkVmhmMnfG/OhCy0n8alPDcFzpy4GjcALVXx AYylHANqyvf0AiFfUFbQ+d9NDeLrdjBlN+Gu347VBOla19UBxbBX0qOk7xTmRzE1EEj3 poFjzg+9ChlW4xBO5+Nv5YGefnhpjT8286psPCoKB7ML2g6z7i67Nt8xEhUEuEFSu9ZT siSFhHp817BYYKpUVNaOxTSl+M4/5Tg0AJUhE/SeqDIidMFa011bKteIeZnrNGVbFJXV Qt6+1IG3CkzIYw2uznMU1ioWdQxUXXmzugqlz+DTGHIcPWyusqEpjoYlQ0DBeWrZBqzB atcg== X-Gm-Message-State: APjAAAV8K2qVbSn8V+n7k62svUFaENFOBDfv6UuwN3xHOhWCbPP/tKkT LLm15PyShmUASt05bj+e5osuyUvJ3qU= X-Received: by 2002:adf:e651:: with SMTP id b17mr22037702wrn.191.1572421907822; Wed, 30 Oct 2019 00:51:47 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:2c7f:2fc:5551:ee55]) by smtp.gmail.com with ESMTPSA id q11sm1114387wmq.21.2019.10.30.00.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2019 00:51:47 -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 V6 1/3] cpuidle: play_idle: Make play_idle more flexible Date: Wed, 30 Oct 2019 08:51:39 +0100 Message-Id: <20191030075141.1039-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 Reviewed-by: Ulf Hansson --- V6: - Change use_state variable name by use_state_idx: https://lkml.org/lkml/2019/10/28/874 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..18523ea6b11b 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 index) { struct cpuidle_device *dev; preempt_disable(); dev = cpuidle_get_device(); if (dev) - dev->use_deepest_state = enable; + dev->use_state_idx = index; 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_idx = 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..d53ad36cb2de 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_idx; 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 index); #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 index) { } #endif diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 8dad5aa600ea..fb9fc93f1497 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_idx != 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_idx; } 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 Wed Oct 30 07:51:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 178075 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp917798ill; Wed, 30 Oct 2019 00:51:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxTlYNDG09Wg13zlilcPAo9uDa+win0hIdP7xevHiXKVx7Ab3RMx+5EsAL55ZoW/xSrUeeh X-Received: by 2002:aa7:da52:: with SMTP id w18mr18949498eds.205.1572421912857; Wed, 30 Oct 2019 00:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572421912; cv=none; d=google.com; s=arc-20160816; b=HwHZR0VCHRZUWVGHbYpBfyWxzXdyQszzZ8CJaaBuomgRIFIDD+bO22T6snqbEyqC61 0hgpcw2Y7H0Gi8rAZYXXcxiiWbqRP3WGCKv+AeXBtVgDOb4R3fyZEssRL4ioAGocWibu BfoNpFhWcRtOGGZn5Ki0QmYNgXsb7a6h9flY8rptmCzyCB0v40OYEgV/PtSEupob3DAU Ke2xEWKZ5l5hQmiicStSNKTSH7lc04FCo0E+Q9dOCBJLKHNDc9zbP31r+TF0UB1k9RnB DbSs9yq0ALjtObonwafW1Ow8gTlkPcnuAQJKLh4GwXLV1TWGXwFaQN6HKaLxuZlbROK1 fR9Q== 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=dHBCLxQkG9LNvtfSsjY+Tj1w31CstLD8dsr/LClK51s=; b=IFu+SGqMEDm4j03WMqghSIp9vpfhp6buwrsvK3BsrMQx7dgctFKiGxPeGByQa1jB2v W3cvOtiQuF2ihmOkX1EGDsMm8JNHHpS9UhW+lGMjNwQeXqAkFtIzKRvzjWeo6G3E6uDc tO6gPhIJexpIciiPHECGeNzraAjMYT9C14gSsk2EY//gCW0t/rzpIbUuTcHY8n5vP9cJ 8HgW4XyXfyre+/fV/gAjlAlH9VUOwDybaBQ4FExRNL2zXH933xrCiR2kdDeJzcK3gfoD QRFWPKHBYrshtaDopVB6rJS7H28B/XW49W9oy92QEI2l0bJvB52kehJDEKL/TFDPvZIA NkBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h5sMJ2JG; 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 s2si698134ejj.327.2019.10.30.00.51.52; Wed, 30 Oct 2019 00:51:52 -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=h5sMJ2JG; 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 S1726184AbfJ3Hvw (ORCPT + 10 others); Wed, 30 Oct 2019 03:51:52 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46329 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726027AbfJ3Hvw (ORCPT ); Wed, 30 Oct 2019 03:51:52 -0400 Received: by mail-wr1-f65.google.com with SMTP id n15so1079047wrw.13 for ; Wed, 30 Oct 2019 00:51:49 -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=dHBCLxQkG9LNvtfSsjY+Tj1w31CstLD8dsr/LClK51s=; b=h5sMJ2JGuiWmie339WTaqqWjq3k4RHL0GD9MgGQLxWp6AvDjeDynXtCvr5A0ZV0bVY rM0dLkZ6YDga9XevieLAclSdsMv1sGeLatVPiuRfpFIXoI2cHR461v142oABCwHgBqye kMgZF+i8u5zW/2cRjPbg0EmFQu1adD+Ilo8+5spSINVvgdnGrDaGoz+xWbUYuVhpWJRD LGbkeyfuSGaD/CkJ4bK76D+gy6rLEQxG7VErElE4oKAi5TXFDOjKLcpmkkSEPly6BFJW JGWhVnJgnErfa3mFM39PlWCiWmO+jLy6TptkkYTHh2Qecyf5ueszmLyU/KEu9o0/zEUB L+9Q== 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=dHBCLxQkG9LNvtfSsjY+Tj1w31CstLD8dsr/LClK51s=; b=ti1oa1aPooF9Sef0s52CBFMgNeIe9hsvldzmJMZthPqOepd/sJdhd0sGGLi04TbjpI gLPMAvG/LEgTeEaTZ+EMo5Xf4PoVkor4e2tXSelo7kuaq4SdsLdcz8aICqLu0cNBZbQQ n/25vI2zgO+VEB5Bvdwt0HRFPDls1CZVtjlnB4TJSsQ9KCwRBkw830GmHQ4Y2yihUeAt C9djE0S/cslpIPFOd4ARS4T6tkBe3p6JO/AqPE5CHk3ENOKG/F+UomWtZF7XEr/8YV7o 3EagQZ1ZZJZ3Gxp+Vo8AW5c0k++OA0mDBp8BfxGCqTLHSJorpO9xme11U1vLQ5skwSk1 Flyg== X-Gm-Message-State: APjAAAU00eERZkK/9o7IgUK5VQyqC9a5/H5sEF6Z8UsAQHIshSoM2hq3 ypT+Fn6RFestIBdK2lNfGvtzkA== X-Received: by 2002:a5d:544d:: with SMTP id w13mr23937797wrv.19.1572421909082; Wed, 30 Oct 2019 00:51:49 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:2c7f:2fc:5551:ee55]) by smtp.gmail.com with ESMTPSA id q11sm1114387wmq.21.2019.10.30.00.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2019 00:51:48 -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 V6 2/3] cpuidle: play_idle: Specify play_idle with an idle state Date: Wed, 30 Oct 2019 08:51:40 +0100 Message-Id: <20191030075141.1039-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191030075141.1039-1-daniel.lezcano@linaro.org> References: <20191030075141.1039-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 Reviewed-by: Ulf Hansson --- V6: - Change variable name 'state' -> 'index': https://lkml.org/lkml/2019/10/28/874 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 diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 18523ea6b11b..b871fc2e8e67 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..6f5df0b3641a 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 index); #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 fb9fc93f1497..eb9e93b37a97 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 index) { 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(index); it.done = 0; hrtimer_init_on_stack(&it.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); From patchwork Wed Oct 30 07:51:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 178076 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp917862ill; Wed, 30 Oct 2019 00:51:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqxd2qdiRsubrQ5b1tQnnXMJ92kl9yv4s6AuLrWZFqiu82ow5ZTkW9W1gjg07agLlGbPtE0J X-Received: by 2002:aa7:d305:: with SMTP id p5mr30921766edq.80.1572421916472; Wed, 30 Oct 2019 00:51:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572421916; cv=none; d=google.com; s=arc-20160816; b=nUhbNZKhKDBmyHDDStXPrF72spP2JtkN7srvv64rKA3hmkD8GIhCY5o9ms9+Le6wWZ GiAbXGF7WBcO6kx280Q8/UnFxkVaVVZUlAaomCXHau82VIIfzTDhp+zPHp92RTw0Ibig rPxNVyw1fmJTXVWG2x9e+h0YNCwGAC8fpb7YkBjzCLOaNPQ2SGf+meWgDR9g5aiYiCD4 xLeAi7lAosJb0ZUp+9Qza3OGEX9VbsPsq3NYVib2s7iV4q0tcZn+D7WCzg384dpziQ7W F1PcT8AKyOXj1wFFCSTkzZQxg0VxOmO7WQCu9jwjsr+dS1OJWtrDQNbXpz/iPv4FQFPX CbHQ== 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=SOlAXQwY6HSBzz+49x3YKRvdsvjSPYyd9t/VUL7Sm7I=; b=AWHAai8PYi9Ii9koNAxmF149Tesw80d5+mEcM10BV5p1LEJe439vd7UzuiqspU2hi8 fg3EBzwJ8yPvlqzdL8ZzGGvSS5UyeBu9vYSbLVXtuQ2sGsIBX9/81C7VUxi7ajBxW8op SHJ1kiL1ooixZhgE7DYnE7lY597E/WVASYR977yDK3MLql1I+fwUJTCuBwGT5UEdHUgI hnf/Vp0SBNxINXrhk4xtLDoQ35fA0w3Y0vZczyGj8nTqcRwYd+PQj8oDl2sEKStcJa7n GicxxgJPOm9lwl+ze4ilaM6k8C8yE2KTYZGeFSON5qkc4v5FbbTUDsbSINjesq2UYUmW f5IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mwjrt6aT; 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 v8si1077883edi.22.2019.10.30.00.51.56; Wed, 30 Oct 2019 00:51:56 -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=Mwjrt6aT; 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 S1725953AbfJ3Hvx (ORCPT + 10 others); Wed, 30 Oct 2019 03:51:53 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36808 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726028AbfJ3Hvx (ORCPT ); Wed, 30 Oct 2019 03:51:53 -0400 Received: by mail-wr1-f67.google.com with SMTP id w18so1126502wrt.3 for ; Wed, 30 Oct 2019 00:51:51 -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=SOlAXQwY6HSBzz+49x3YKRvdsvjSPYyd9t/VUL7Sm7I=; b=Mwjrt6aT79QE65NzwTdFB425qwP+EQeE3I3yelYdNaqhngfedaIz18+aJHlqYXj8dn vz9zZjona3aDwbRk5A6RrcZTAmcJ9qrBhuliqmc8Th2wmdC4tTEltpAi2r1CJgywWmgR SGqcHpfqHxmRokw2lM6I7hzqddEoB4xN91Rn7JvaIOGR4tF0DixCKQbhgCjsOC2FpV9x JKTM18/W0DSz7qx/yAczRQgyatHNrkv2l+lRElje2ZyUkUl7fKGx/6mdr15WLstIwln2 dr7VF0gjL/q2vhMJidvQMp5V/yNxeAMCLRgX5U1NGGWc5uLX5HGbYX7PtA/cueLpnPO4 +YoQ== 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=SOlAXQwY6HSBzz+49x3YKRvdsvjSPYyd9t/VUL7Sm7I=; b=DlAcg31lgZHZg9BJ9PbiX84JXIiHDb875sNFiMiGVxuPXqnGkWZiKISx/Xr7z7RFqg pz7Y0roGbU+xjmEnAuWDXOttUlUMKlggrL6+taZLjOpvO/UTDeD9fIH+cb1cmnpp+oun H8WG5mIlfUDwlCJwDYrgYSTZdsFVO1Lgl/J4/x+muz8MuZV6k8YCM5SHtx+ANuzDkbcQ odjZvEyFDOmCm8PSVwn//nIul9Cw857nKR6sHE028LbJvdlIm01VXtXEtOn3gDGDv//S ZJRsEVvLGxFdp8sMBg/mD1sc51g2ahQDnwCV7LqpGg+KVvJob4xv+6MxoG9B2Szq05jc OoKw== X-Gm-Message-State: APjAAAW8kWjDkoXrftTYmLKZRDermTFUM0rl6ha6dJUHiee7L00rukuT 4xaogahPnqE4QzAkmjAqJifhQFcaAxs= X-Received: by 2002:adf:e9c7:: with SMTP id l7mr7084881wrn.57.1572421910196; Wed, 30 Oct 2019 00:51:50 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:2c7f:2fc:5551:ee55]) by smtp.gmail.com with ESMTPSA id q11sm1114387wmq.21.2019.10.30.00.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2019 00:51:49 -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 V6 3/3] powercap/drivers/idle_inject: Specify the idle state to inject Date: Wed, 30 Oct 2019 08:51:41 +0100 Message-Id: <20191030075141.1039-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191030075141.1039-1-daniel.lezcano@linaro.org> References: <20191030075141.1039-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(). Signed-off-by: Daniel Lezcano Acked-by: Mathieu Poirier Reviewed-by: Ulf Hansson --- V6: - Rename variable name 'state' -> 'state_idx': https://lkml.org/lkml/2019/10/28/874 --- drivers/powercap/idle_inject.c | 14 +++++++++++++- include/linux/idle_inject.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c index 233c878cbf46..2607d3e9afc5 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_idx; 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_idx)); } /** @@ -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 index) +{ + if (index >= CPUIDLE_STATE_NOUSE && index < CPUIDLE_STATE_MAX) + WRITE_ONCE(ii_dev->state_idx, index); +} + /** * 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_idx = 0; 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..2efc60252d7b 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 index); + #endif /* __IDLE_INJECT_H__ */