[tip:sched/idle] sched/idle: Reorganize the idle loop

From: tip-bot for Daniel Lezcano
Date: Tue Mar 11 2014 - 08:38:19 EST


Commit-ID: c8cc7d4de7a4f2fb1f8774ec2de5b49c46c42e64
Gitweb: http://git.kernel.org/tip/c8cc7d4de7a4f2fb1f8774ec2de5b49c46c42e64
Author: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
AuthorDate: Mon, 3 Mar 2014 08:48:52 +0100
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Tue, 11 Mar 2014 11:52:47 +0100

sched/idle: Reorganize the idle loop

Now that we have the main cpuidle function in idle.c, move some code from
the idle mainloop to this function for the sake of clarity.

That removes if then else indentation difficult to follow when looking at the
code. This patch does not change the current behavior.

Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Acked-by: Nicolas Pitre <nico@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: tglx@xxxxxxxxxxxxx
Cc: rjw@xxxxxxxxxxxxx
Cc: preeti@xxxxxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1393832934-11625-3-git-send-email-daniel.lezcano@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
include/linux/cpuidle.h | 2 ++
kernel/sched/idle.c | 33 +++++++++++++++------------------
2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 8d97962..b0238cb 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -180,6 +180,8 @@ static inline int cpuidle_enable_device(struct cpuidle_device *dev)
{return -ENODEV; }
static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }
static inline int cpuidle_play_dead(void) {return -ENODEV; }
+static inline struct cpuidle_driver *cpuidle_get_cpu_driver(
+ struct cpuidle_device *dev) {return NULL; }
#endif

#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index d5aaf5e..dc8a246 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -63,7 +63,6 @@ void __weak arch_cpu_idle(void)
local_irq_enable();
}

-#ifdef CONFIG_CPU_IDLE
/**
* cpuidle_idle_call - the main idle function
*
@@ -77,9 +76,14 @@ static int cpuidle_idle_call(void)
int next_state, entered_state, ret;
bool broadcast;

+ stop_critical_timings();
+ rcu_idle_enter();
+
ret = cpuidle_enabled(drv, dev);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ arch_cpu_idle();
+ goto out;
+ }

/* ask the governor for the next state */
next_state = cpuidle_select(drv, dev);
@@ -89,7 +93,7 @@ static int cpuidle_idle_call(void)
/* give the governor an opportunity to reflect on the outcome */
cpuidle_reflect(dev, next_state);
local_irq_enable();
- return 0;
+ goto out;
}

broadcast = !!(drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP);
@@ -109,15 +113,15 @@ static int cpuidle_idle_call(void)

/* give the governor an opportunity to reflect on the outcome */
cpuidle_reflect(dev, entered_state);
+out:
+ if (WARN_ON_ONCE(irqs_disabled()))
+ local_irq_enable();
+
+ rcu_idle_exit();
+ start_critical_timings();

return 0;
}
-#else
-static inline int cpuidle_idle_call(void)
-{
- return -ENODEV;
-}
-#endif

/*
* Generic idle loop implementation
@@ -150,14 +154,7 @@ static void cpu_idle_loop(void)
cpu_idle_poll();
} else {
if (!current_clr_polling_and_test()) {
- stop_critical_timings();
- rcu_idle_enter();
- if (cpuidle_idle_call())
- arch_cpu_idle();
- if (WARN_ON_ONCE(irqs_disabled()))
- local_irq_enable();
- rcu_idle_exit();
- start_critical_timings();
+ cpuidle_idle_call();
} else {
local_irq_enable();
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/