From patchwork Thu Oct 23 09:01:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 39346 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 86EFD24048 for ; Thu, 23 Oct 2014 09:01:27 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id y10sf338452wgg.6 for ; Thu, 23 Oct 2014 02:01:26 -0700 (PDT) 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=FWtvR5JhWZD/cESVS/fFbPGvqbbpacpHXEai3F5emPQ=; b=X5LsD6Nps5HJb4mLAQexLVByf3Vf4g274dzFaqhFI09EfwdGfab8pd9liL73cVy3hv mrr4oNAdLIZw8eiCQklbuJGR9Y6Sgfwof8qmkVvK2Rmw1ey9TLDjn3dOe4glkOFfd4Vi fbAj78b2wb4Q9w/eni7AXQy3CfJOVui/ZE6j2mXRKko4/4MMt/H8RHhPfeFdyXhy4h/o tkVh+f0lB34swpebdeESx1g1z9c5I4VD0KBer5YoDLnbLAG/rxXjalRiWsDJPjzMYdls Rqyk0UL4YS7GnnvclOB+MBzRC7/qCUtnm5rT2Dt/ly8I02NUpPwwASRhEOBIKuO4ODp3 F2xw== X-Gm-Message-State: ALoCoQmK3DVXQh7csaYpeC30lworioD3J379kwSeJVWwsTHuPNFk4tMbPDLJjjc6IiUCNPuH77v8 X-Received: by 10.194.118.197 with SMTP id ko5mr767804wjb.2.1414054886743; Thu, 23 Oct 2014 02:01:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.106 with SMTP id ln10ls274138lac.103.gmail; Thu, 23 Oct 2014 02:01:26 -0700 (PDT) X-Received: by 10.112.224.162 with SMTP id rd2mr1672692lbc.95.1414054886520; Thu, 23 Oct 2014 02:01:26 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id li6si1594141lbc.87.2014.10.23.02.01.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Oct 2014 02:01:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id gi9so466888lab.35 for ; Thu, 23 Oct 2014 02:01:26 -0700 (PDT) X-Received: by 10.152.5.38 with SMTP id p6mr3591339lap.44.1414054886387; Thu, 23 Oct 2014 02:01:26 -0700 (PDT) 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.84.229 with SMTP id c5csp220609lbz; Thu, 23 Oct 2014 02:01:25 -0700 (PDT) X-Received: by 10.180.198.210 with SMTP id je18mr11293393wic.23.1414054885546; Thu, 23 Oct 2014 02:01:25 -0700 (PDT) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com. [209.85.212.170]) by mx.google.com with ESMTPS id r8si1727092wix.42.2014.10.23.02.01.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Oct 2014 02:01:25 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.lezcano@linaro.org designates 209.85.212.170 as permitted sender) client-ip=209.85.212.170; Received: by mail-wi0-f170.google.com with SMTP id n3so2748305wiv.1 for ; Thu, 23 Oct 2014 02:01:25 -0700 (PDT) X-Received: by 10.180.20.43 with SMTP id k11mr11807592wie.28.1414054885316; Thu, 23 Oct 2014 02:01:25 -0700 (PDT) Received: from localhost.localdomain (AToulouse-656-1-959-39.w90-50.abo.wanadoo.fr. [90.50.216.39]) by mx.google.com with ESMTPSA id ga7sm1845645wic.5.2014.10.23.02.01.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Oct 2014 02:01:24 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: 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 Subject: [PATCH V2 2/5] sched: idle: Get the next timer event and pass it the cpuidle framework Date: Thu, 23 Oct 2014 11:01:18 +0200 Message-Id: <1414054881-17713-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414054881-17713-1-git-send-email-daniel.lezcano@linaro.org> References: <1414054881-17713-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.215.48 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 --- drivers/cpuidle/cpuidle.c | 11 +++++------ 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, 23 insertions(+), 20 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 372c36f..64f5800 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 @@ -155,11 +151,13 @@ 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; @@ -170,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 18f0da9..fb396d6 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 = &__get_cpu_var(ladder_devices); struct ladder_device_state *last_state; diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 96f8fb0..a17515f 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 = &__get_cpu_var(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 25ba94d..58c7522 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -75,7 +75,8 @@ void __weak arch_cpu_idle(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); @@ -108,7 +109,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: /* @@ -183,7 +184,7 @@ exit_idle: */ static void cpu_idle_loop(void) { - unsigned int latency_req; + unsigned int latency_req, next_timer_event; while (1) { /* @@ -210,6 +211,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. * @@ -227,7 +231,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(); }