From patchwork Thu Nov 14 20:49:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 179468 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11575526ilf; Thu, 14 Nov 2019 12:49:28 -0800 (PST) X-Google-Smtp-Source: APXvYqz3rCpfAcvRI4BadgFI+TmLSftXeykXjO6zTe15ymM9NFKpU96Z0CiAP4IcmmM2XeecIc1h X-Received: by 2002:a1c:f20c:: with SMTP id s12mr9519518wmc.37.1573764568517; Thu, 14 Nov 2019 12:49:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573764568; cv=none; d=google.com; s=arc-20160816; b=i1RhjgIry29MXJxs+E+9oQG/3HByj4VRx3JaEm9Ch3MCOVldxTOrFbpKheO8BDS/RA VF9IpawP/ZZAJjnMzW4dBmbPy1WB7U5dYUx9NKgJb4MaoKJMBIBsaaDWNJTDA2YJWPB3 MlkowxXAfJvWZT5X5m6JJWQXxj1/CK59pjd1kTowZ7VzRCYni4bsisQHvyVEgPfnHdZr HKQvPT0MCxSY+bKb/s5ru33itNJUK32UNn6DF7LU+PfSS7XAWJkQCbvDObG5aCxhp2zj IHgJK2P6k1rkFgzQgf1p18kzDRVSr0XlmQIadM8iiUs1RqS8d66+9HoSDpCs5F/g3xze 2xyw== 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=oWWPOw6fdrBRTkuHcbjpSalRr8DpkMzBATp+Y4u/Wi8=; b=gLS0pXKKPKDQRuWt5EjKEg2O7alWe1K7LH7x+CPu1QrNu7F0WbyfVv2ExALe+0F7vE o3nP6RFFixygvlPINhJLelD5VF5DKQPbfWVlBgAaVPAirXwgPRXLTZlHE+C25iEHf14p bLLMxHBWYVrlBSu1uTZofyLzs634efAOCh+Rhxz7qbx9KfMrtcSHzy905LbfCPsOmeD+ +4yXr8Kya1PBZmDPAIg++Ln57tjyYAAt5Mxu3bRXVx8x04RrswzAiKGirCTndrYWjZFD Og8byokFrjg2xVl/qYbpe4jPiLcuEoXM/2PpLtm7qN/zW/LwjUUzYoZ37uKnCJyGeaVD lxtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rt/a7IWy"; 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 v13si4274615eju.409.2019.11.14.12.49.28; Thu, 14 Nov 2019 12:49:28 -0800 (PST) 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="rt/a7IWy"; 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 S1727021AbfKNUt1 (ORCPT + 10 others); Thu, 14 Nov 2019 15:49:27 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34242 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726812AbfKNUt1 (ORCPT ); Thu, 14 Nov 2019 15:49:27 -0500 Received: by mail-wr1-f65.google.com with SMTP id e6so8323222wrw.1 for ; Thu, 14 Nov 2019 12:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=oWWPOw6fdrBRTkuHcbjpSalRr8DpkMzBATp+Y4u/Wi8=; b=rt/a7IWypW4wtkJoudbYLho4zeXLAf5IPNd5Ze8W+5q2lq5CjFfKrbC9nzmJDaH7Jx gaSXhhoNvyRV9+UBxVZViFNnyAXWrGEg3R4UHApBO2w3VKJvtvnfB0o68MDspdYPOigj 5CGSBySyeqlk5kaeuhWx364d5OxKrB6fufaP3Owj6N79t7/i7L8+5lWG8hQyd+ahfrnd UZuTb7d7K2MbsBcPT5ta5ebG37ckCpzIxTxK0zgliAEi4S4zhAtYbhH1BdraLWCVw6bz OXQjYt68pcve1IejybTh3R5+0zdJlvdqzaotZrokJWC6y2ztJBlzUnZpkc0LqwRvKm3n 9DdQ== 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=oWWPOw6fdrBRTkuHcbjpSalRr8DpkMzBATp+Y4u/Wi8=; b=g6wqc99Drg2zGLTaoq6JawY8FCW3d+lDhbxjxpjMIMkdgdsCC+E3owNJCKMl5PiALK Vw88nhpXISpNHKXYfZL/lq2jNRj5ARsn8aqkHRBgc74Gks8H13qthS4eddSYmgw6rIlr QiOpFW6oxWfNfXizOZeHNjlUP2sQe690AMRuFsL887BwK9NLfmbgO9DxcoXwo4GtnlOv qD84JesVdsOWZId2GjEE6s/h5Tf7od0ImXbmXH30W8yH2YtO1zy61cFwftg8XQJ7t4ff y4xxvowvUY7eQ3gU1ZkSvZVlxWjPedIWerr/CwumWvAJ1x7eheA7KAKMBd30HkwhAKMw 4Okg== X-Gm-Message-State: APjAAAWorlCrwlMLI6gLn+e+exOqgytOxftXdNwcCdJ8khtkHJnySuTm oH2IIaeW/vcYGJmIY22OW1eRpw== X-Received: by 2002:a5d:6607:: with SMTP id n7mr8014390wru.133.1573764564226; Thu, 14 Nov 2019 12:49:24 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:3115:aefb:2495:829a]) by smtp.gmail.com with ESMTPSA id a206sm7954485wmf.15.2019.11.14.12.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 12:49:23 -0800 (PST) From: Daniel Lezcano To: rafael@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org Subject: [PATCH V1 1/3] cpuidle: Replace use_deepest_state flag by forced_idle_latency_limit_ns Date: Thu, 14 Nov 2019 21:49:12 +0100 Message-Id: <20191114204914.21206-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 We want to specify a latency constraint when choosing an idle state at play_idle time. Instead of duplicating the information in the structure or propagate the latency in the call stack, change the use_deepest_state by forced_latency_limit_ns to introduce this constraint. The idea being that when it is set, idle is forced (i.e. no governors), but there is a latency limit for the state to use. A zero latency constraint means "do not use the deepest idle state path" as the 'use_deepest_state' boolean was used in the cpuidle_idle_call. Suggested-by: Rafael J. Wysocki Signed-off-by: Daniel Lezcano --- drivers/cpuidle/cpuidle.c | 10 +++++----- include/linux/cpuidle.h | 6 +++--- kernel/sched/idle.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 44ae39f2b47a..62226fadc02d 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -100,19 +100,19 @@ static int find_deepest_state(struct cpuidle_driver *drv, /** * cpuidle_use_deepest_state - Set/clear governor override flag. - * @enable: New value of the flag. + * @latency_limit_ns: A latency limit constraint * - * Set/unset the current CPU to use the deepest idle state (override governors - * going forward if set). + * Set/unset the current CPU to use the deepest idle state with the exit + * latency within @latency_limit_ns */ -void cpuidle_use_deepest_state(bool enable) +void cpuidle_use_deepest_state(u64 latency_limit_ns) { struct cpuidle_device *dev; preempt_disable(); dev = cpuidle_get_device(); if (dev) - dev->use_deepest_state = enable; + dev->forced_idle_latency_limit_ns = latency_limit_ns; preempt_enable(); } diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index d23a3b1ddcf6..1f3f4dd01e48 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -83,7 +83,6 @@ 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; @@ -91,6 +90,7 @@ struct cpuidle_device { int last_state_idx; int last_residency; u64 poll_limit_ns; + u64 forced_idle_latency_limit_ns; struct cpuidle_state_usage states_usage[CPUIDLE_STATE_MAX]; struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX]; struct cpuidle_driver_kobj *kobj_driver; @@ -210,7 +210,7 @@ extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv, struct cpuidle_device *dev); 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_deepest_state(u64 latency_limit_ns); #else static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv, struct cpuidle_device *dev) @@ -218,7 +218,7 @@ static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv, 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_deepest_state(u64 latency_limit_ns) { } #endif diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 8dad5aa600ea..d4681b3d7074 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -165,7 +165,7 @@ 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->forced_idle_latency_limit_ns) { if (idle_should_enter_s2idle()) { rcu_idle_enter(); @@ -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_deepest_state(1); 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_deepest_state(0); current->flags &= ~PF_IDLE; preempt_fold_need_resched();