From patchwork Fri Nov 7 14:31:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 40411 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 934F7240F7 for ; Fri, 7 Nov 2014 14:31:47 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id h11sf1970648wiw.7 for ; Fri, 07 Nov 2014 06:31:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=8QRsVq8yYzLvcHf6rJ1MEoxLeiyLyQ9032TqimI1TT0=; b=eHYq05GfCUPCXnRyok9M5cN69X959UxuhwkU2Ow396yp0KyUoUG3EmlS7/cQUGAN0/ NyYlc6XQ2MY8p49qZ2nPe+x0+y/OsEGegoCXJPNsgUeMx10qE6oJaTLnh4Vu5VstUhNQ lBHydvcvGaF+LAFdhiALNUWuaKXvN1ktJXbGTMJEL9zuurcJ8PUUDKVkMKmLBjHuEdQU 6oG30DfxSZzvHrV5evBzysHHdmuEc2fuZ3ZBTjh7HkdUWgDiKLy+QH/40CPSt6BSnHhu ecLyaWNj2nHb4iIiikbNha/7QShekqZfHOh89t1OojZE1FfletPx7a3la5TiXmOZiGe8 fSLA== X-Gm-Message-State: ALoCoQnFSA1drNpQQjwQZ6uFUTr9zeQJqKbwFGsY5Xl0aukaQ7qAZ+NX5IhGQa+aTeywf1CsPVgs X-Received: by 10.180.182.164 with SMTP id ef4mr729174wic.0.1415370705323; Fri, 07 Nov 2014 06:31:45 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.225 with SMTP id bb1ls171070lab.47.gmail; Fri, 07 Nov 2014 06:31:45 -0800 (PST) X-Received: by 10.112.56.134 with SMTP id a6mr11625255lbq.25.1415370704997; Fri, 07 Nov 2014 06:31:44 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id l8si15374918lah.23.2014.11.07.06.31.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 06:31:44 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so3012053lbj.23 for ; Fri, 07 Nov 2014 06:31:44 -0800 (PST) X-Received: by 10.152.120.199 with SMTP id le7mr11309879lab.67.1415370704861; Fri, 07 Nov 2014 06:31:44 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp206760lbc; Fri, 7 Nov 2014 06:31:44 -0800 (PST) X-Received: by 10.194.172.131 with SMTP id bc3mr17351407wjc.64.1415370703749; Fri, 07 Nov 2014 06:31:43 -0800 (PST) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com. [209.85.212.172]) by mx.google.com with ESMTPS id yu10si15510450wjc.112.2014.11.07.06.31.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 06:31:41 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of daniel.lezcano@linaro.org: DNS timeout) client-ip=209.85.212.172; Received: by mail-wi0-f172.google.com with SMTP id bs8so4661576wib.11 for ; Fri, 07 Nov 2014 06:31:41 -0800 (PST) X-Received: by 10.180.212.42 with SMTP id nh10mr5577940wic.52.1415370700971; Fri, 07 Nov 2014 06:31:40 -0800 (PST) Received: from localhost.localdomain (AToulouse-656-1-898-91.w109-223.abo.wanadoo.fr. [109.223.3.91]) by mx.google.com with ESMTPSA id bl9sm2231926wib.24.2014.11.07.06.31.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Nov 2014 06:31:40 -0800 (PST) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: preeti@linux.vnet.ibm.com, nicolas.pitre@linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, lenb@kernel.org Subject: [PATCH V3 3/6] sched: idle: Get the next timer event and pass it the cpuidle framework Date: Fri, 7 Nov 2014 15:31:24 +0100 Message-Id: <1415370687-18688-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415370687-18688-1-git-send-email-daniel.lezcano@linaro.org> References: <1415370687-18688-1-git-send-email-daniel.lezcano@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Following the logic of the previous patch, retrieve from the idle task the expected timer sleep duration and pass it to the cpuidle framework. Take the opportunity to remove the unused headers in the menu.c file. This patch does not change the current behavior. Signed-off-by: Daniel Lezcano Acked-by: Nicolas Pitre Reviewed-by: Len Brown Reviewed-by: Preeti U. Murthy --- drivers/cpuidle/cpuidle.c | 10 ++++------ drivers/cpuidle/governors/ladder.c | 3 ++- drivers/cpuidle/governors/menu.c | 8 ++------ include/linux/cpuidle.h | 8 +++++--- kernel/sched/idle.c | 13 +++++++++---- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 86f6cb8..f3e7b73 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -8,16 +8,12 @@ * This code is licenced under the GPL. */ -#include #include #include -#include #include #include #include #include -#include -#include #include #include @@ -156,11 +152,12 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, * @drv: the cpuidle driver * @dev: the cpuidle device * @latency_req: the latency constraint when choosing an idle state + * @next_timer_event: the duration until the timer expires * * Returns the index of the idle state. */ int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, - int latency_req) + int latency_req, int next_timer_event) { if (off || !initialized) return -ENODEV; @@ -171,7 +168,8 @@ int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, if (unlikely(use_deepest_state)) return cpuidle_find_deepest_state(drv, dev); - return cpuidle_curr_governor->select(drv, dev, latency_req); + return cpuidle_curr_governor->select(drv, dev, latency_req, + next_timer_event); } /** diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index 53113c2..51c9ccd 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c @@ -64,7 +64,8 @@ static inline void ladder_do_selection(struct ladder_device *ldev, * @dev: the CPU */ static int ladder_select_state(struct cpuidle_driver *drv, - struct cpuidle_device *dev, int latency_req) + struct cpuidle_device *dev, + int latency_req, int next_timer_event) { struct ladder_device *ldev = this_cpu_ptr(&ladder_devices); struct ladder_device_state *last_state; diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 9b7c0b9..91b3000 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -13,10 +13,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include @@ -288,7 +284,7 @@ again: * @dev: the CPU */ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, - int latency_req) + int latency_req, int next_timer_event) { struct menu_device *data = this_cpu_ptr(&menu_devices); int i; @@ -303,7 +299,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, data->last_state_idx = CPUIDLE_DRIVER_STATE_START - 1; /* determine the expected residency time, round up */ - data->next_timer_us = ktime_to_us(tick_nohz_get_sleep_length()); + data->next_timer_us = next_timer_event; get_iowait_load(&nr_iowaiters, &cpu_load); data->bucket = which_bucket(data->next_timer_us, nr_iowaiters); diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index fb465c1..d477746 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -122,7 +122,8 @@ struct cpuidle_driver { extern void disable_cpuidle(void); extern int cpuidle_select(struct cpuidle_driver *drv, - struct cpuidle_device *dev, int latency_req); + struct cpuidle_device *dev, + int latency_req, int next_timer_event); extern int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev, int index); extern void cpuidle_reflect(struct cpuidle_device *dev, int index); @@ -150,7 +151,8 @@ extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev) #else static inline void disable_cpuidle(void) { } static inline int cpuidle_select(struct cpuidle_driver *drv, - struct cpuidle_device *dev, int latency_req) + struct cpuidle_device *dev, + int latency_req, int next_timer_event) {return -ENODEV; } static inline int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev, int index) @@ -206,7 +208,7 @@ struct cpuidle_governor { int (*select) (struct cpuidle_driver *drv, struct cpuidle_device *dev, - int latency_req); + int latency_req, int next_timer_event); void (*reflect) (struct cpuidle_device *dev, int index); struct module *owner; diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 189e80a..0a7a1d1 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -80,7 +80,8 @@ static inline int cpu_idle_poll(void) * set, and it returns with polling set. If it ever stops polling, it * must clear the polling bit. */ -static void cpuidle_idle_call(unsigned int latency_req) +static void cpuidle_idle_call(unsigned int latency_req, + unsigned int next_timer_event) { struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices); struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev); @@ -113,7 +114,7 @@ static void cpuidle_idle_call(unsigned int latency_req) * Ask the cpuidle framework to choose a convenient idle state. * Fall back to the default arch idle method on errors. */ - next_state = cpuidle_select(drv, dev, latency_req); + next_state = cpuidle_select(drv, dev, latency_req, next_timer_event); if (next_state < 0) { use_default: /* @@ -194,7 +195,7 @@ exit_idle: */ static void cpu_idle_loop(void) { - unsigned int latency_req; + unsigned int latency_req, next_timer_event; while (1) { /* @@ -221,6 +222,9 @@ static void cpu_idle_loop(void) latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); + next_timer_event = + ktime_to_us(tick_nohz_get_sleep_length()); + /* * In poll mode we reenable interrupts and spin. * @@ -238,7 +242,8 @@ static void cpu_idle_loop(void) tick_check_broadcast_expired()) cpu_idle_poll(); else - cpuidle_idle_call(latency_req); + cpuidle_idle_call(latency_req, + next_timer_event); arch_cpu_idle_exit(); }