From patchwork Thu Nov 14 20:49:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 179469 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11575654ilf; Thu, 14 Nov 2019 12:49:36 -0800 (PST) X-Google-Smtp-Source: APXvYqyvefhCnuR0mQkS5OZzMIMMZQiAottfqqe6/anpxNfB1JK5x9nEO7gCqPAaqSYXnGYgfcdD X-Received: by 2002:a1c:480a:: with SMTP id v10mr10576639wma.138.1573764576598; Thu, 14 Nov 2019 12:49:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573764576; cv=none; d=google.com; s=arc-20160816; b=jyrjm8h/9Yz1RZYP4UXCydzQv46+ykMgeTZvRBGzrFBE+IxUScvzTjCIkZvbFSPl7X riJ8lJ9WV8lr6JKz99syxxFUiyOJzM4hXDZbLyyd7NoUJB9SOETm7aVLjP3rzfnxHjCJ 81y4rH20it5lbyCEri6culqpItbHvhe1/slNU16zFQBdkkxJ4wuMs+VL1m3hCeZ5YEvu B1/lIwPnWZ1NkuQyPLyo2u1t85hAdsle4dn/DIOIvjwgsAJ8hGZa72Cm6oQ7a7S7sMxj umDZMsdqC6aJEUwe9b+UQ0lqC4LxIyFcq8OveIiW/Rvw8RoAIuYSisxG9O2xuJcbo4dw y2SQ== 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=fBRrOeFjzqnzfONE7OUt/W61tGgjVczN6HnwGIweIMY=; b=K7izyOvlckX4mrCY9B0qGmehgzj7EGK3o1yxN+C3SZwOIpNaUGCoSM1soRTBYxed62 xUw8IiaEsxLQDHVhAb5AYqmCFfxp9JwmABqQu8wdq1YT2bsthYmEwv8DkA9uRXw354zr 6dmFHT0cp/vRKLhCwNyBbdDYIvzhLzilNt84y5IcvWnVC04t+QAE7geHO7vQ4etK6/Za dsGKowDdsYEqcEIesUMniZ39v5wiM2rqdVbWZIsP42KyrYi4eQbUz7zE5o+XsuBnpmT8 3oucunkALuCtZTLQ1DdkhJp05bHE+xun7BRQc+3JTpfC1bpygH8C53ncJpynKyxaCpyJ mk0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UyAH0ik3; 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 q8si4243258ejt.321.2019.11.14.12.49.36; Thu, 14 Nov 2019 12:49:36 -0800 (PST) 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=UyAH0ik3; 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 S1727112AbfKNUtc (ORCPT + 26 others); Thu, 14 Nov 2019 15:49:32 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53641 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727036AbfKNUta (ORCPT ); Thu, 14 Nov 2019 15:49:30 -0500 Received: by mail-wm1-f66.google.com with SMTP id u18so7294650wmc.3 for ; Thu, 14 Nov 2019 12:49:27 -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:in-reply-to:references; bh=fBRrOeFjzqnzfONE7OUt/W61tGgjVczN6HnwGIweIMY=; b=UyAH0ik3h3xmZNBuHt5kE41PVk00D0xHfOmVezEgZri2dDGhwR/WyRVVGBCdd0x6dv Xxv+5awZJ/xz+ELjzjwK8QBT+X5QFDj8HNbKxLYVTPi/LECGs4mGFrQwf1hsw7tlV98+ uIN4rgFBWDQOkpsqp4nJj+PB4GS9xQUVZhBmmlwbOX6ghrzy/DCT9lTDO9GyuL1hzdKE zt4FcyNBYMPKH9Zp7P/80gxHB7e2vxljNfmIizAvdbln7bCaAeOSPa092ecmyLz5MrHC BsA24QnBw/Uh/TmGv/ON91JnOiV/6DIm35mFY37NZm70wtl+/EAa/pFy+sWJNd6fmBHd kGRQ== 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=fBRrOeFjzqnzfONE7OUt/W61tGgjVczN6HnwGIweIMY=; b=SelzIBwNdZhkXOdG84iuG15/i9IcHEZU0QlPNFHryRGycIIuV1YiaRNLWjTBlrDgF+ 9paYYV1yB5dbDA57XO35sLH68QyBhXWFRYRexUUWp9uxDKg9akR5tgu+cqskZoYXrGl7 WBkbI2ZT2Ok5AXuSRnJE5JIcHT44Gbz9KvmBCK29ZIb1AbCTnxYbkMW60ct39E3SOWW2 RtNnxOuTeRIiMxAE/HFcm+UoNeLcaynwENij15N2oR+yl4iKD6NyohkAVNjrJBFMEP7J 2E2m/3qqnijY3nh4oeYuaoVW0QfUA/fLNmpFzDTrBBfz1y4cD+MU0sQ5bTdiV/FUjsVB rsQg== X-Gm-Message-State: APjAAAWV2k2EYuqZUm7I7lMhmmghEcC2M3pGyfl0oOKB2dOdtmDwXsXA zXNP7bX2d9Cz1VFWZ16/kV4OTQ== X-Received: by 2002:a05:600c:294e:: with SMTP id n14mr9964213wmd.18.1573764566284; Thu, 14 Nov 2019 12:49:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 12:49:25 -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 3/3] cpuidle: Use the latency to call find_deepest_idle_state Date: Thu, 14 Nov 2019 21:49:14 +0100 Message-Id: <20191114204914.21206-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191114204914.21206-1-daniel.lezcano@linaro.org> References: <20191114204914.21206-1-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As the dev->forced_idle_latency_limit_ns is filled with the latency value when this function is called, use it as a parameter to the find_deepest_idle_state() function. Suggested-by: Rafael J. Wysocki Signed-off-by: Daniel Lezcano --- drivers/cpuidle/cpuidle.c | 7 +++++-- include/linux/cpuidle.h | 6 ++++-- kernel/sched/idle.c | 8 +++++++- 3 files changed, 16 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 62226fadc02d..a02b701fc289 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -122,9 +122,12 @@ void cpuidle_use_deepest_state(u64 latency_limit_ns) * @dev: cpuidle device for the given CPU. */ int cpuidle_find_deepest_state(struct cpuidle_driver *drv, - struct cpuidle_device *dev) + struct cpuidle_device *dev, + u64 latency_limit_ns) { - return find_deepest_state(drv, dev, UINT_MAX, 0, false); + return find_deepest_state(drv, dev, + div_u64(latency_limit_ns, NSEC_PER_USEC), + 0, false); } #ifdef CONFIG_SUSPEND diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 1f3f4dd01e48..b60f35b7d53e 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -207,13 +207,15 @@ static inline struct cpuidle_device *cpuidle_get_device(void) {return NULL; } #ifdef CONFIG_CPU_IDLE extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv, - struct cpuidle_device *dev); + struct cpuidle_device *dev, + u64 latency_limit_ns); extern int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev); 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) + struct cpuidle_device *dev, + u64 latency_limit_ns) {return -ENODEV; } static inline int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev) diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 0a817e907192..fd4a8747e602 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -166,6 +166,9 @@ static void cpuidle_idle_call(void) */ if (idle_should_enter_s2idle() || dev->forced_idle_latency_limit_ns) { + + u64 latency_limit_ns = dev->forced_idle_latency_limit_ns; + if (idle_should_enter_s2idle()) { rcu_idle_enter(); @@ -176,12 +179,15 @@ static void cpuidle_idle_call(void) } rcu_idle_exit(); + + latency_limit_ns = U64_MAX; } tick_nohz_idle_stop_tick(); rcu_idle_enter(); - next_state = cpuidle_find_deepest_state(drv, dev); + next_state = cpuidle_find_deepest_state(drv, dev, + latency_limit_ns); call_cpuidle(drv, dev, next_state); } else { bool stop_tick = true;