From patchwork Mon Oct 20 16:25:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 39054 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 04048203C5 for ; Mon, 20 Oct 2014 16:26:22 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id c13sf2809425eek.5 for ; Mon, 20 Oct 2014 09:26:22 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=qNBy2JDzwsnZiFpNJV9VEwR+W9zjcTouaj8GtbSK17M=; b=XfENIZmcjCax6vOQX+wWZUsjF9ds9oYrh0/Y8OO4xmG7xUNquJUYgHmxKf/t+TRW4X dKOukEx5+OORfhHWvcb67k2cuo2pQ+eZcSiEA8P7Q3PU1gBbOxeTvd9xMdVJvNP/ggK4 hucbwilpnWT8ArSgWXgO76AxJbSENfPnGSEorczXjuco7trGZlVMZUb5D/R76p7ZK0MO J6rha6Fh63zom7XG6++/xRZk5hiRYZoLuw/s4BZrNFrcwa0wwV0bN6QDrdyLHQupuSc/ d3Rpu+CIMgVzkN5HL9Jvy7InBZKcfLzzHhbnKemfB6Qr1eUOQNiwUfMao+KqzJjTDCTP za6A== X-Gm-Message-State: ALoCoQk7CUyB+tDfEM95+FQMPcMfeFjF83619rW5nowWVS+QUMY0pjNzGoyyhOXc3n6Wv9Y7aLQD X-Received: by 10.180.36.176 with SMTP id r16mr2634123wij.7.1413822382128; Mon, 20 Oct 2014 09:26:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.42 with SMTP id k10ls439217lae.66.gmail; Mon, 20 Oct 2014 09:26:21 -0700 (PDT) X-Received: by 10.112.201.201 with SMTP id kc9mr21985307lbc.76.1413822381935; Mon, 20 Oct 2014 09:26:21 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id k3si15105045lbd.26.2014.10.20.09.26.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 20 Oct 2014 09:26:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id u10so4233313lbd.15 for ; Mon, 20 Oct 2014 09:26:21 -0700 (PDT) X-Received: by 10.112.221.197 with SMTP id qg5mr28389088lbc.32.1413822381407; Mon, 20 Oct 2014 09:26:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp339324lbz; Mon, 20 Oct 2014 09:26:20 -0700 (PDT) X-Received: by 10.66.154.10 with SMTP id vk10mr28323664pab.21.1413822379613; Mon, 20 Oct 2014 09:26:19 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rp1si8256659pbc.214.2014.10.20.09.26.18 for ; Mon, 20 Oct 2014 09:26:19 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123AbaJTQZ5 (ORCPT + 27 others); Mon, 20 Oct 2014 12:25:57 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:35262 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751816AbaJTQZw (ORCPT ); Mon, 20 Oct 2014 12:25:52 -0400 Received: by mail-wg0-f48.google.com with SMTP id k14so5874606wgh.7 for ; Mon, 20 Oct 2014 09:25:50 -0700 (PDT) X-Received: by 10.180.75.11 with SMTP id y11mr21148480wiv.11.1413822349632; Mon, 20 Oct 2014 09:25:49 -0700 (PDT) Received: from localhost.localdomain (AToulouse-656-1-960-30.w90-50.abo.wanadoo.fr. [90.50.217.30]) by mx.google.com with ESMTPSA id cs2sm10155776wib.2.2014.10.20.09.25.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Oct 2014 09:25:49 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: peterz@infradead.org, nicolas.pitre@linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org Subject: [PATCH 2/5] sched: idle: Get the next timer event and pass it the cpuidle framework Date: Mon, 20 Oct 2014 18:25:40 +0200 Message-Id: <1413822343-1972-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413822343-1972-1-git-send-email-daniel.lezcano@linaro.org> References: <1413822343-1972-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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 --- 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 | 16 ++++++++++++---- 5 files changed, 26 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..f439161 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) { /* @@ -211,6 +212,12 @@ static void cpu_idle_loop(void) latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); /* + * The next timer event in us + */ + next_timer_event = ktime_to_us( + tick_nohz_get_sleep_length()); + + /* * In poll mode we reenable interrupts and spin. * * If the latency req is zero, we don't want to @@ -227,7 +234,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(); }