From patchwork Thu Oct 3 08:42: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: 175062 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1085ill; Thu, 3 Oct 2019 01:43:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqxu0MBvOlvCXYbhDTe+n6nNIHubdxfSKfCdC/zsPEuKHUyivoi4ioiJS3y/Bx2T5mr4SmFk X-Received: by 2002:aa7:d803:: with SMTP id v3mr8302225edq.146.1570092183855; Thu, 03 Oct 2019 01:43:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570092183; cv=none; d=google.com; s=arc-20160816; b=QV+bNvE3pMTJc2fQkB0M2x/5rf+NhBfEsfnMacpEVBo3XVN61YRDTKO5oJ8tP0q1HT cfDvZkY1QvVbfIaGOEh5lHp/Nr3dYD7C5sfkI1Oeekbq9WEEynU9sPEfU2warNCyfGqI IQTnxsE069uASoIH4VanlsKcaHKN5TZBxN2Fuff6UmxSDBFS5x8Jc/IYO8RsA61pmK0q oxB68mE4PYX6rKnUJ2nHDEBSH2u1OW+CmfCz3vH8jtDYDW6KRNGRgfv9oR/I9pdGP2Hl j+pAQN7nfPvHPumUcCbZZ6t6TiFe8R3SqRgqHMJ/p7eIUL1dOzgHX/VsAR9NxsbVcC8V He1w== 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=odawl8FFS06ZpSGBB5Pezvvx3lJRWzOpGgq0TcvgjOg=; b=gk2eGnNUGZTerT/Lrp/BeJbykFwyHZLv91HkaRiw3MfbVkx59c+ePSJQGBFACmCj1q 5RoBKYyFAilc2UfcBebulUpXjVX88hPTDnYxECN1l3hnAHKAg/Cg99ro/rjYh8NGBtXw zLHe/ty2zR/97SYTwm2QbPv5AIPFhj6A02tt20VjXOQp4g/P9VKsEWYLuVngAyin8tPi qKjlwwH7vi2LtfcA4vj0Eb+qnl6ADeHHOgjUib2mY+YqAF9Q8aZ0qEV3DWqPIAm9lNww p2ftslbE8FpXAFMU4qwq55EBQp858QuX8g6YvgLtiGWAoq/wDyfZhEi53RwyGnyc8A4d Vc8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v7y4rzaK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 h19si950703edv.393.2019.10.03.01.43.03; Thu, 03 Oct 2019 01:43:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=v7y4rzaK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1729086AbfJCInC (ORCPT + 27 others); Thu, 3 Oct 2019 04:43:02 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41354 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728848AbfJCInB (ORCPT ); Thu, 3 Oct 2019 04:43:01 -0400 Received: by mail-wr1-f68.google.com with SMTP id q9so1988902wrm.8 for ; Thu, 03 Oct 2019 01:42:59 -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=v7y4rzaK0MQgPuMbb5NWETwWGPueVDGszHCqSbJJjVsZxpxHu7xhb1LPnPejnbbkTc iR6Q4ZXi25WJIVuZRzzuw8QwvO3ihKaaBoiBhmv6HsczC0bmN8/W56KKK4iGGINj1ICG Am9nxP435ym+y+DPS8tkpmF8jdZ8SCangB5ymHZ9GEkscZCMBrmdr7782hFXI8blcfg1 Dg61klwuoahEFTVByjwtOV//mlPARlGxJSMiSIKS0WRZE2Rl35hh3bEFCuhxbqKFufhm TwEbya5lvVOVym3xYPqNflXhm0X2DpUa5ri7tq/sqiL3aDnxM0YWIzL9zY73sA7ezrLq vyvQ== 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=ph87t1HZU2Y6IsM59sZw7qaT+SRJdsgaIicA0hFrM49epfrRZHz96ENxWrsogtkGyT tIUErW1NBGivVnwd56hLikgh6pgHXUb3hQAnxUgvaWgZDNiJDNm3zhviNNEdB8LoCr40 hJuklCU9TJsnKTVFcCEh1oeUfJn9iY1orZX8anSsokEg+R/YQ7BHNHCi9y45sjnX038c N1yJdpvcQ8XmE8HznV/H90kEzMnA5COK/lsX16i29rBt/HiVCQfszO9Kp1fzDyOE+kh1 0Vr11yJEwjhNQsE7Fl76tb+zw1aymEge68q6WP5OzoL3xBRRDxDbJLYQl3V9hI3nVt51 lriQ== X-Gm-Message-State: APjAAAXaWu2+qoWVOCSN7dOWQxpxPcVwCHiqDc3hjv7tzO068HINuWBC Nvpoj/5c/Z8xGmNGfKryAL8cGg== X-Received: by 2002:adf:9d87:: with SMTP id p7mr5813676wre.245.1570092178160; Thu, 03 Oct 2019 01:42:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:7990:8bfa:5771:282b]) by smtp.gmail.com with ESMTPSA id z3sm1519702wmi.30.2019.10.03.01.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2019 01:42:57 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org Cc: Mathieu Poirier , "Rafael J. Wysocki" , 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 V2 1/3] cpuidle: play_idle: Make play_idle more flexible Date: Thu, 3 Oct 2019 10:42:39 +0200 Message-Id: <20191003084242.8655-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 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 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();