idle/cpuidle: Split cpuidle_idle_call main function into smaller functions
Subsystems (2)
PATCH v3 1/5 idle/cpuidle: Split cpuidle_idle_call main function into smaller functions
In order to allow better integration between the cpuidle framework and the scheduler, reducing the distance between these two sub-components will facilitate this integration by moving part of the cpuidle code in the idle task file and, because idle.c is in the sched directory, we have access to the scheduler's private structures.
This patch splits the cpuidle_idle_call main entry function into 3 calls to a newly added API:
1. select the idle state
2. enter the idle state
3. reflect the idle state
The cpuidle_idle_call calls these three functions to implement the main idle entry function.
---
ChangeLog:
V3:
* moved broadcast timer outside of cpuidle_enter() as suggested by Preeti U Murthy.
https://lkml.org/lkml/2014/2/24/601
V2:
* splitted cpuidle_select error check into 'cpuidle_enabled' function
--- drivers/cpuidle/cpuidle.c | 97 ++++++++++++++++++++++++++++++++++++---------- include/linux/cpuidle.h | 19 +++++++++ 2 files changed, 95 insertions(+), 21 deletions(-)
drivers/cpuidle/cpuidle.c +76 -21
@@ -65,6 +65,26 @@ int cpuidle_play_dead(void) }/** +* cpuidle_enabled - check if the cpuidle framework is ready +* @dev: cpuidle device for this cpu +* @drv: cpuidle driver for this cpu +* +* Return 0 on success, otherwise: +* -NODEV : the cpuidle framework is not available +* -EBUSY : the cpuidle framework is not initialized +*/ +int cpuidle_enabled (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +if (off || !initialized) +return -ENODEV ; + +if (!drv || !dev || !dev->enabled) +return -EBUSY ; + +return 0 ; +} + +/** * cpuidle_enter_state - enter the state and update stats * @dev: cpuidle device for this cpu * @drv: cpuidle driver for this cpu
@@ -108,6 +128,51 @@ int cpuidle_enter_state(struct cpuidle_d }/** +* cpuidle_select - ask the cpuidle framework to choose an idle state +* +* @drv: the cpuidle driver +* @dev: the cpuidle device +* +* Returns the index of the idle state. +*/ +int cpuidle_select (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +return cpuidle_curr_governor->select (drv, dev); +} + +/** +* cpuidle_enter - enter into the specified idle state +* +* @drv: the cpuidle driver tied with the cpu +* @dev: the cpuidle device +* @index: the index in the idle state table +* +* Returns the index in the idle state, < 0 in case of error. +* The error code depends on the backend driver +*/ +int cpuidle_enter (struct cpuidle_driver *drv,struct cpuidle_device *dev, +int index) +{ +if (cpuidle_state_is_coupled (dev, drv, index)) +return cpuidle_enter_state_coupled (dev, drv, index); +return cpuidle_enter_state (dev, drv, index); +} + +/** +* cpuidle_reflect - tell the underlying governor what was the state +* we were in +* +* @dev : the cpuidle device +* @index: the index in the idle state table +* +*/ +void cpuidle_reflect (struct cpuidle_device *dev,int index) +{ +if (cpuidle_curr_governor->reflect) + cpuidle_curr_governor->reflect (dev, index); +} + +/** * cpuidle_idle_call - the main idle loop * * NOTE: no locks or semaphores should be used here
@@ -116,42 +181,33 @@ int cpuidle_enter_state(struct cpuidle_dint cpuidle_idle_call (void ) {struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices); -struct cpuidle_driver *drv; -int next_state, entered_state; +struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev); +int next_state, entered_state, ret;bool broadcast; -if (off || !initialized) -return -ENODEV ; - -/* check if the device is ready */ -if (!dev || !dev->enabled) -return -EBUSY ; - - drv =cpuidle_get_cpu_driver (dev); + ret =cpuidle_enabled (drv, dev); +if (ret <0 ) +return ret;/* ask the governor for the next state */ - next_state = cpuidle_curr_governor->select (drv, dev); + next_state =cpuidle_select (drv, dev); +if (need_resched ()) { dev->last_residency =0 ;/* give the governor an opportunity to reflect on the outcome */ -if (cpuidle_curr_governor->reflect) - cpuidle_curr_governor->reflect (dev, next_state); +cpuidle_reflect (dev, next_state);local_irq_enable ();return 0 ; }trace_cpu_idle_rcuidle (next_state, dev->cpu); - broadcast = !!(drv->states[next_state].flags &CPUIDLE_FLAG_TIMER_STOP ); + broadcast = !!(drv->states[index].flags &CPUIDLE_FLAG_TIMER_STOP );if (broadcast)clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu); -if (cpuidle_state_is_coupled (dev, drv, next_state)) - entered_state =cpuidle_enter_state_coupled (dev, drv, - next_state); -else - entered_state =cpuidle_enter_state (dev, drv, next_state); + entered_state =cpuidle_enter (drv, dev, next_state);if (broadcast)clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu);
@@ -159,8 +215,7 @@ int cpuidle_idle_call(void)trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu);/* give the governor an opportunity to reflect on the outcome */ -if (cpuidle_curr_governor->reflect) - cpuidle_curr_governor->reflect (dev, entered_state); +cpuidle_reflect (dev, entered_state);return 0 ; }
include/linux/cpuidle.h +19 -0
@@ -119,6 +119,15 @@ struct cpuidle_driver {#ifdef CONFIG_CPU_IDLE extern void disable_cpuidle (void ); + +extern int cpuidle_enabled (struct cpuidle_driver *drv, +struct cpuidle_device *dev); +extern int cpuidle_select (struct cpuidle_driver *drv, +struct cpuidle_device *dev); +extern int cpuidle_enter (struct cpuidle_driver *drv, +struct cpuidle_device *dev,int index); +extern void cpuidle_reflect (struct cpuidle_device *dev,int index); +extern int cpuidle_idle_call (void );extern int cpuidle_register_driver (struct cpuidle_driver *drv);extern struct cpuidle_driver *cpuidle_get_driver (void );
@@ -141,6 +150,16 @@ extern int cpuidle_play_dead(void);extern struct cpuidle_driver *cpuidle_get_cpu_driver (struct cpuidle_device *dev);#else static inline void disable_cpuidle (void ) { } +static inline int cpuidle_enabled (struct cpuidle_driver *drv, +struct cpuidle_device *dev) +{return -ENODEV ; } +static inline int cpuidle_select (struct cpuidle_driver *drv, +struct cpuidle_device *dev) +{return -ENODEV ; } +static inline int cpuidle_enter (struct cpuidle_driver *drv, +struct cpuidle_device *dev,int index) +{return -ENODEV ; } +static inline void cpuidle_reflect (struct cpuidle_device *dev,int index) { }static inline int cpuidle_idle_call (void ) {return -ENODEV ; }static inline int cpuidle_register_driver (struct cpuidle_driver *drv) {return -ENODEV ; }
PATCH v3 2/5 cpuidle/idle: Move the cpuidle_idle_call function to idle.c
The cpuidle_idle_call does nothing more than calling the three individuals function and is no longer used by any arch specific code but only in the cpuidle framework code.
We can move this function into the idle task code to ensure better proximity to the scheduler code.
--- drivers/cpuidle/cpuidle.c | 48 ---------------------------------------- include/linux/cpuidle.h | 2 - kernel/sched/idle.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 50 deletions(-)
drivers/cpuidle/cpuidle.c +0 -48
@@ -173,54 +173,6 @@ void cpuidle_reflect(struct cpuidle_devi }/** -* cpuidle_idle_call - the main idle loop -* -* NOTE: no locks or semaphores should be used here -* return non-zero on failure -*/ -int cpuidle_idle_call (void ) -{ -struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices); -struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev); -int next_state, entered_state, ret; -bool broadcast; - - ret =cpuidle_enabled (drv, dev); -if (ret <0 ) -return ret; - -/* ask the governor for the next state */ - next_state =cpuidle_select (drv, dev); - -if (need_resched ()) { - dev->last_residency =0 ; -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, next_state); -local_irq_enable (); -return 0 ; - } - -trace_cpu_idle_rcuidle (next_state, dev->cpu); - - broadcast = !!(drv->states[index].flags &CPUIDLE_FLAG_TIMER_STOP ); - -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu); - - entered_state =cpuidle_enter (drv, dev, next_state); - -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); - -trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu); - -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, entered_state); - -return 0 ; -} - -/** * cpuidle_install_idle_handler - installs the cpuidle idle loop handler */ void cpuidle_install_idle_handler (void )
include/linux/cpuidle.h +0 -2
@@ -128,7 +128,6 @@ extern int cpuidle_enter(struct cpuidle_ struct cpuidle_device *dev, int index);extern void cpuidle_reflect (struct cpuidle_device *dev,int index); -extern int cpuidle_idle_call (void );extern int cpuidle_register_driver (struct cpuidle_driver *drv);extern struct cpuidle_driver *cpuidle_get_driver (void );extern struct cpuidle_driver *cpuidle_driver_ref (void );
@@ -160,7 +159,6 @@ static inline int cpuidle_enter(struct c struct cpuidle_device *dev, int index) {return -ENODEV ; }static inline void cpuidle_reflect (struct cpuidle_device *dev,int index) { } -static inline int cpuidle_idle_call (void ) {return -ENODEV ; }static inline int cpuidle_register_driver (struct cpuidle_driver *drv) {return -ENODEV ; }static inline struct cpuidle_driver *cpuidle_get_driver (void ) {return NULL ; }
kernel/sched/idle.c +55 -0
61 lines not on this page · raw message
PATCH v3 3/5 idle: Reorganize the idle loop
In reply to Daniel LezcanoNow 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.
---
Changelog:
V2:
* fixed type in patch's description
--- include/linux/cpuidle.h | 2 ++ kernel/sched/idle.c | 33 +++++++++++++++------------------ 2 files changed, 17 insertions(+), 18 deletions(-)
include/linux/cpuidle.h +2 -0
@@ -180,6 +180,8 @@ static inline int cpuidle_enable_device( {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
kernel/sched/idle.c +15 -18
@@ -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; }trace_cpu_idle_rcuidle (next_state, dev->cpu);
@@ -108,15 +112,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
@@ -149,14 +153,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 (); }
PATCH v3 4/5 idle: Move idle conditions in cpuidle_idle main function
In reply to Daniel LezcanoThis patch moves the condition before entering idle into the cpuidle main function located in idle.c. That simplify the idle mainloop functions and increase the readibility of the conditions to enter truly idle.
This patch is code reorganization and does not change the behavior of the function.
---
V3:
* reorganized cpuidle_idle_call function as Suggested by Peter Zijlstra
https://lkml.org/lkml/2014/2/24/492
--- kernel/sched/idle.c | 85 ++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 39 deletions(-)
kernel/sched/idle.c +46 -39
@@ -73,46 +73,58 @@ static int cpuidle_idle_call(void) {struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices);struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev); -int next_state, entered_state, ret; +int next_state, entered_state;bool broadcast; -stop_critical_timings (); -rcu_idle_enter (); - - ret =cpuidle_enabled (drv, dev); -if (ret <0 ) { -arch_cpu_idle (); - goto out; - } - -/* ask the governor for the next state */ - next_state =cpuidle_select (drv, dev); - -if (need_resched ()) { - dev->last_residency =0 ; -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, next_state); +if (current_clr_polling_and_test ()) {local_irq_enable (); - goto out; +__current_set_polling (); +return 0 ; } -trace_cpu_idle_rcuidle (next_state, dev->cpu); +stop_critical_timings (); +rcu_idle_enter (); - broadcast = !!(drv->states[next_state].flags &CPUIDLE_FLAG_TIMER_STOP ); +if (cpuidle_enabled (drv, dev) ==0 ) { -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu); +/* ask the governor for the next state */ + next_state =cpuidle_select (drv, dev); - entered_state =cpuidle_enter (drv, dev, next_state); +if (current_clr_polling_and_test ()) { + dev->last_residency =0 ; + entered_state = next_state; +local_irq_enable (); + }else { +trace_cpu_idle_rcuidle (next_state, dev->cpu); + + broadcast = !!(drv->states[next_state].flags & +CPUIDLE_FLAG_TIMER_STOP ); + +if (broadcast) +clockevents_notify ( +CLOCK_EVT_NOTIFY_BROADCAST_ENTER , + &dev->cpu); + + entered_state =cpuidle_enter (drv, dev, next_state); + +if (broadcast) +clockevents_notify ( +CLOCK_EVT_NOTIFY_BROADCAST_EXIT , + &dev->cpu); -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); +trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu); + } -trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu); +/* give the governor an opportunity to reflect on the outcome */ +cpuidle_reflect (dev, next_state); + }else { +if (current_clr_polling_and_test ()) +local_irq_enable (); +else +arch_cpu_idle (); + } +__current_set_polling (); -/* 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 ();
@@ -139,7 +151,7 @@ static void cpu_idle_loop(void)local_irq_disable ();arch_cpu_idle_enter (); - +/* * In poll mode we reenable interrupts and spin. *
@@ -149,16 +161,11 @@ static void cpu_idle_loop(void)* know that the IPI is going to arrive right * away */ -if (cpu_idle_force_poll ||tick_check_broadcast_expired ()) { +if (cpu_idle_force_poll ||tick_check_broadcast_expired ())cpu_idle_poll (); - }else { -if (!current_clr_polling_and_test ()) { -cpuidle_idle_call (); - }else { -local_irq_enable (); - } -__current_set_polling (); - } +else +cpuidle_idle_call (); +arch_cpu_idle_exit ();/* * We need to test and propagate the TIF_NEED_RESCHED
PATCH v3 5/5 idle: Add more comments to the code
In reply to Daniel LezcanoThe idle main function is a complex and a critical function. Added more comments to the code.
---
Changelog:
V2:
* fixed typo in comment
--- kernel/sched/idle.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-)
kernel/sched/idle.c +41 -2
@@ -76,20 +76,48 @@ static int cpuidle_idle_call(void)int next_state, entered_state;bool broadcast; +/* +* Check if the idle task must be rescheduled. If it is the +* case, exit the function after re-enabling the local irq and +* set again the polling flag +*/ if (current_clr_polling_and_test ()) {local_irq_enable ();__current_set_polling ();return 0 ; } +/* +* During the idle period, stop measuring the disabled irqs +* critical sections latencies +*/ stop_critical_timings (); + +/* +* Tell the RCU framework we are entering an idle section, +* so no more rcu read side critical sections and one more +* step to the grace period +*/ rcu_idle_enter (); +/* +* Check if the cpuidle framework is ready, otherwise fallback +* to the default arch specific idle method +*/ if (cpuidle_enabled (drv, dev) ==0 ) { -/* ask the governor for the next state */ +/* +* Ask the governor to choose an idle state it thinks +* it is convenient to go to. There is *always* a +* convenient idle state +*/ next_state =cpuidle_select (drv, dev); +/* +* The idle task must be scheduled, it is pointless to +* go to idle, just update no idle residency and get +* out of this function +*/ if (current_clr_polling_and_test ()) { dev->last_residency =0 ; entered_state = next_state;
@@ -104,7 +132,13 @@ static int cpuidle_idle_call(void)clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu); - +/* +* Enter the idle state previously returned by +* the governor decision. This function will +* block until an interrupt occurs and will +* take care of re-enabling the local +* interrupts +*/ entered_state =cpuidle_enter (drv, dev, next_state);if (broadcast)
@@ -164,6 +198,11 @@ static void cpu_idle_loop(void)if (cpu_idle_force_poll ||tick_check_broadcast_expired ())cpu_idle_poll ();else +/* +* It is up to the underlying +* functions to enable the local +* interrupts again +*/ cpuidle_idle_call ();arch_cpu_idle_exit ();
Quoted 99 lines · Daniel Lezcano
In order to allow better integration between the cpuidle framework and the scheduler, reducing the distance between these two sub-components will facilitate this integration by moving part of the cpuidle code in the idle task file and, because
idle.cis in the sched directory, we have access to the scheduler's private structures.This patch splits the
cpuidle_idle_callmain entry function into 3 calls to a newly added API:
1. select the idle state
2. enter the idle state
3. reflect the idle stateThe
cpuidle_idle_callcalls these three functions to implement the main idle entry function.Signed-off-by Daniel Lezcano <[email protected]>Acked-by Nicolas Pitre <[email protected]>---
ChangeLog:
V3:
* moved broadcast timer outside ofcpuidle_enter()as suggested by Preeti U Murthy.
https://lkml.org/lkml/2014/2/24/601
V2:
* splittedcpuidle_selecterror check into 'cpuidle_enabled' function--- drivers/cpuidle/cpuidle.c | 97 ++++++++++++++++++++++++++++++++++++---------- include/linux/cpuidle.h | 19 +++++++++ 2 files changed, 95 insertions(+), 21 deletions(-)Index:
cpuidle-next/drivers/cpuidle/cpuidle.c
===================================================================drivers/cpuidle/cpuidle.c +51
-0@@ -65,6 +65,26 @@ int cpuidle_play_dead(void) }/** +* cpuidle_enabled - check if the cpuidle framework is ready +* @dev: cpuidle device for this cpu +* @drv: cpuidle driver for this cpu +* +* Return 0 on success, otherwise: +* -NODEV : the cpuidle framework is not available +* -EBUSY : the cpuidle framework is not initialized +*/ +int cpuidle_enabled (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +if (off || !initialized) +return -ENODEV ; + +if (!drv || !dev || !dev->enabled) +return -EBUSY ; + +return 0 ; +} + +/** * cpuidle_enter_state - enter the state and update stats * @dev: cpuidle device for this cpu * @drv: cpuidle driver for this cpu @@ -108,6 +128,51 @@ int cpuidle_enter_state(struct cpuidle_d }/** +* cpuidle_select - ask the cpuidle framework to choose an idle state +* +* @drv: the cpuidle driver +* @dev: the cpuidle device +* +* Returns the index of the idle state. +*/ +int cpuidle_select (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +return cpuidle_curr_governor->select (drv, dev); +} + +/** +* cpuidle_enter - enter into the specified idle state +* +* @drv: the cpuidle driver tied with the cpu +* @dev: the cpuidle device +* @index: the index in the idle state table +* +* Returns the index in the idle state, < 0 in case of error. +* The error code depends on the backend driver +*/ +int cpuidle_enter (struct cpuidle_driver *drv,struct cpuidle_device *dev, +int index) +{ +if (cpuidle_state_is_coupled (dev, drv, index)) +return cpuidle_enter_state_coupled (dev, drv, index); +return cpuidle_enter_state (dev, drv, index); +} + +/**
<snip>
drivers/cpuidle/cpuidle.c int cpuidle_enter_state(struct cpuidle_d · line 210
Quoted 7 lines
drivers/cpuidle/cpuidle.c +1
-5-if (cpuidle_state_is_coupled (dev, drv, next_state)) - entered_state =cpuidle_enter_state_coupled (dev, drv, - next_state); -else - entered_state =cpuidle_enter_state (dev, drv, next_state); + entered_state =cpuidle_enter (drv, dev, next_state);
Wouldn't you need to check for return value on cpuidle_enter()?
Regards
Preeti U Murthy
Peter Zijlstra
maintainerDaniel; can you rebase these patches on top of tip/master.
Ingo is going to create tip/sched/idle := tip/sched/core + tip/timer/core and then we can stick these patches in there.
Quoted 3 lines · Peter Zijlstra
Daniel; can you rebase these patches on top of tip/master.
Yes, sure. No problem.
Quoted 2 lines
Ingo is going to create tip/sched/idle := tip/sched/core + tip/timer/core and then we can stick these patches in there.
Perfect !
Thanks
-- Daniel
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH v4 1/5 idle/cpuidle: Split cpuidle_idle_call main function into smaller functions
In reply to Peter ZijlstraIn order to allow better integration between the cpuidle framework and the scheduler, reducing the distance between these two sub-components will facilitate this integration by moving part of the cpuidle code in the idle task file and, because idle.c is in the sched directory, we have access to the scheduler's private structures.
This patch splits the cpuidle_idle_call main entry function into 3 calls to a newly added API:
1. select the idle state
2. enter the idle state
3. reflect the idle state
The cpuidle_idle_call calls these three functions to implement the main idle entry function.
---
ChangeLog:
V4:
* rebased on top of tip/master
V3:
* moved broadcast timer outside of cpuidle_enter() as suggested by Preeti U Murthy : https://lkml.org/lkml/2014/2/24/601
V2:
* splitted cpuidle_select error check into 'cpuidle_enabled' function
--- drivers/cpuidle/cpuidle.c | 96 +++++++++++++++++++++++++++++++++++----------- include/linux/cpuidle.h | 19 +++++++++ 2 files changed, 94 insertions(+), 21 deletions(-)
drivers/cpuidle/cpuidle.c +75 -21
@@ -65,6 +65,26 @@ int cpuidle_play_dead(void) }/** +* cpuidle_enabled - check if the cpuidle framework is ready +* @dev: cpuidle device for this cpu +* @drv: cpuidle driver for this cpu +* +* Return 0 on success, otherwise: +* -NODEV : the cpuidle framework is not available +* -EBUSY : the cpuidle framework is not initialized +*/ +int cpuidle_enabled (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +if (off || !initialized) +return -ENODEV ; + +if (!drv || !dev || !dev->enabled) +return -EBUSY ; + +return 0 ; +} + +/** * cpuidle_enter_state - enter the state and update stats * @dev: cpuidle device for this cpu * @drv: cpuidle driver for this cpu
@@ -108,6 +128,51 @@ int cpuidle_enter_state(struct cpuidle_d }/** +* cpuidle_select - ask the cpuidle framework to choose an idle state +* +* @drv: the cpuidle driver +* @dev: the cpuidle device +* +* Returns the index of the idle state. +*/ +int cpuidle_select (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +return cpuidle_curr_governor->select (drv, dev); +} + +/** +* cpuidle_enter - enter into the specified idle state +* +* @drv: the cpuidle driver tied with the cpu +* @dev: the cpuidle device +* @index: the index in the idle state table +* +* Returns the index in the idle state, < 0 in case of error. +* The error code depends on the backend driver +*/ +int cpuidle_enter (struct cpuidle_driver *drv,struct cpuidle_device *dev, +int index) +{ +if (cpuidle_state_is_coupled (dev, drv, index)) +return cpuidle_enter_state_coupled (dev, drv, index); +return cpuidle_enter_state (dev, drv, index); +} + +/** +* cpuidle_reflect - tell the underlying governor what was the state +* we were in +* +* @dev : the cpuidle device +* @index: the index in the idle state table +* +*/ +void cpuidle_reflect (struct cpuidle_device *dev,int index) +{ +if (cpuidle_curr_governor->reflect) + cpuidle_curr_governor->reflect (dev, index); +} + +/** * cpuidle_idle_call - the main idle loop * * NOTE: no locks or semaphores should be used here
@@ -116,26 +181,21 @@ int cpuidle_enter_state(struct cpuidle_dint cpuidle_idle_call (void ) {struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices); -struct cpuidle_driver *drv; -int next_state, entered_state; +struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev); +int next_state, entered_state, ret;bool broadcast; -if (off || !initialized) -return -ENODEV ; - -/* check if the device is ready */ -if (!dev || !dev->enabled) -return -EBUSY ; - - drv =cpuidle_get_cpu_driver (dev); + ret =cpuidle_enabled (drv, dev); +if (ret <0 ) +return ret;/* ask the governor for the next state */ - next_state = cpuidle_curr_governor->select (drv, dev); + next_state =cpuidle_select (drv, dev); +if (need_resched ()) { dev->last_residency =0 ;/* give the governor an opportunity to reflect on the outcome */ -if (cpuidle_curr_governor->reflect) - cpuidle_curr_governor->reflect (dev, next_state); +cpuidle_reflect (dev, next_state);local_irq_enable ();return 0 ; }
@@ -146,14 +206,9 @@ int cpuidle_idle_call(void) clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))return -EBUSY ; -trace_cpu_idle_rcuidle (next_state, dev->cpu); -if (cpuidle_state_is_coupled (dev, drv, next_state)) - entered_state =cpuidle_enter_state_coupled (dev, drv, - next_state); -else - entered_state =cpuidle_enter_state (dev, drv, next_state); + entered_state =cpuidle_enter (drv, dev, next_state);trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu);
@@ -161,8 +216,7 @@ int cpuidle_idle_call(void)clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu);/* give the governor an opportunity to reflect on the outcome */ -if (cpuidle_curr_governor->reflect) - cpuidle_curr_governor->reflect (dev, entered_state); +cpuidle_reflect (dev, entered_state);return 0 ; }
include/linux/cpuidle.h +19 -0
@@ -119,6 +119,15 @@ struct cpuidle_driver {#ifdef CONFIG_CPU_IDLE extern void disable_cpuidle (void ); + +extern int cpuidle_enabled (struct cpuidle_driver *drv, +struct cpuidle_device *dev); +extern int cpuidle_select (struct cpuidle_driver *drv, +struct cpuidle_device *dev); +extern int cpuidle_enter (struct cpuidle_driver *drv, +struct cpuidle_device *dev,int index); +extern void cpuidle_reflect (struct cpuidle_device *dev,int index); +extern int cpuidle_idle_call (void );extern int cpuidle_register_driver (struct cpuidle_driver *drv);extern struct cpuidle_driver *cpuidle_get_driver (void );
@@ -141,6 +150,16 @@ extern int cpuidle_play_dead(void);extern struct cpuidle_driver *cpuidle_get_cpu_driver (struct cpuidle_device *dev);#else static inline void disable_cpuidle (void ) { } +static inline int cpuidle_enabled (struct cpuidle_driver *drv, +struct cpuidle_device *dev) +{return -ENODEV ; } +static inline int cpuidle_select (struct cpuidle_driver *drv, +struct cpuidle_device *dev) +{return -ENODEV ; } +static inline int cpuidle_enter (struct cpuidle_driver *drv, +struct cpuidle_device *dev,int index) +{return -ENODEV ; } +static inline void cpuidle_reflect (struct cpuidle_device *dev,int index) { }static inline int cpuidle_idle_call (void ) {return -ENODEV ; }static inline int cpuidle_register_driver (struct cpuidle_driver *drv) {return -ENODEV ; }
PATCH v4 2/5 cpuidle/idle: Move the cpuidle_idle_call function to idle.c
The cpuidle_idle_call does nothing more than calling the three individuals function and is no longer used by any arch specific code but only in the cpuidle framework code.
We can move this function into the idle task code to ensure better proximity to the scheduler code.
---
Changelog:
V4:
* rebased on the top of tip/master
--- drivers/cpuidle/cpuidle.c | 49 ---------------------------------------- include/linux/cpuidle.h | 2 - kernel/sched/idle.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 51 deletions(-)
drivers/cpuidle/cpuidle.c +0 -49
@@ -173,55 +173,6 @@ void cpuidle_reflect(struct cpuidle_devi }/** -* cpuidle_idle_call - the main idle loop -* -* NOTE: no locks or semaphores should be used here -* return non-zero on failure -*/ -int cpuidle_idle_call (void ) -{ -struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices); -struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev); -int next_state, entered_state, ret; -bool broadcast; - - ret =cpuidle_enabled (drv, dev); -if (ret <0 ) -return ret; - -/* ask the governor for the next state */ - next_state =cpuidle_select (drv, dev); - -if (need_resched ()) { - dev->last_residency =0 ; -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, next_state); -local_irq_enable (); -return 0 ; - } - - broadcast = !!(drv->states[next_state].flags &CPUIDLE_FLAG_TIMER_STOP ); - -if (broadcast && -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu)) -return -EBUSY ; - -trace_cpu_idle_rcuidle (next_state, dev->cpu); - - entered_state =cpuidle_enter (drv, dev, next_state); - -trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu); - -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); - -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, entered_state); - -return 0 ; -} - -/** * cpuidle_install_idle_handler - installs the cpuidle idle loop handler */ void cpuidle_install_idle_handler (void )
include/linux/cpuidle.h +0 -2
@@ -128,7 +128,6 @@ extern int cpuidle_enter(struct cpuidle_ struct cpuidle_device *dev, int index);extern void cpuidle_reflect (struct cpuidle_device *dev,int index); -extern int cpuidle_idle_call (void );extern int cpuidle_register_driver (struct cpuidle_driver *drv);extern struct cpuidle_driver *cpuidle_get_driver (void );extern struct cpuidle_driver *cpuidle_driver_ref (void );
@@ -160,7 +159,6 @@ static inline int cpuidle_enter(struct c struct cpuidle_device *dev, int index) {return -ENODEV ; }static inline void cpuidle_reflect (struct cpuidle_device *dev,int index) { } -static inline int cpuidle_idle_call (void ) {return -ENODEV ; }static inline int cpuidle_register_driver (struct cpuidle_driver *drv) {return -ENODEV ; }static inline struct cpuidle_driver *cpuidle_get_driver (void ) {return NULL ; }
kernel/sched/idle.c +56 -0
62 lines not on this page · raw message
tip-bot for Daniel Lezcano
merge bot[tip:sched/idle] cpuidle/idle: Move the cpuidle_idle_call function to idle.c
cpuidle/idle: Move the cpuidle_idle_call function to idle.c
Commit-ID: 30cdd69e2a266505ca8229c944d361ff350a6959 Gitweb: http://git.kernel.org/tip/30cdd69e2a266505ca8229c944d361ff350a6959 Author: Daniel Lezcano <[email protected]> AuthorDate: Mon, 3 Mar 2014 08:48:51 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Mar 2014 11:52:45 +0100
cpuidle/idle: Move the cpuidle_idle_call function to idle.c
The cpuidle_idle_call does nothing more than calling the three individuals function and is no longer used by any arch specific code but only in the cpuidle framework code.
We can move this function into the idle task code to ensure better proximity to the scheduler code.
--- drivers/cpuidle/cpuidle.c | 49 ----------------------------------------- include/linux/cpuidle.h | 2 -- kernel/sched/idle.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 51 deletions(-)
drivers/cpuidle/cpuidle.c +0 -49
@@ -173,55 +173,6 @@ void cpuidle_reflect(struct cpuidle_device *dev, int index) }/** -* cpuidle_idle_call - the main idle loop -* -* NOTE: no locks or semaphores should be used here -* return non-zero on failure -*/ -int cpuidle_idle_call (void ) -{ -struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices); -struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev); -int next_state, entered_state, ret; -bool broadcast; - - ret =cpuidle_enabled (drv, dev); -if (ret <0 ) -return ret; - -/* ask the governor for the next state */ - next_state =cpuidle_select (drv, dev); - -if (need_resched ()) { - dev->last_residency =0 ; -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, next_state); -local_irq_enable (); -return 0 ; - } - - broadcast = !!(drv->states[next_state].flags &CPUIDLE_FLAG_TIMER_STOP ); - -if (broadcast && -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu)) -return -EBUSY ; - -trace_cpu_idle_rcuidle (next_state, dev->cpu); - - entered_state =cpuidle_enter (drv, dev, next_state); - -trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu); - -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); - -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, entered_state); - -return 0 ; -} - -/** * cpuidle_install_idle_handler - installs the cpuidle idle loop handler */ void cpuidle_install_idle_handler (void )
include/linux/cpuidle.h +0 -2
@@ -128,7 +128,6 @@ extern int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev, int index);extern void cpuidle_reflect (struct cpuidle_device *dev,int index); -extern int cpuidle_idle_call (void );extern int cpuidle_register_driver (struct cpuidle_driver *drv);extern struct cpuidle_driver *cpuidle_get_driver (void );extern struct cpuidle_driver *cpuidle_driver_ref (void );
@@ -160,7 +159,6 @@ static inline int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev, int index) {return -ENODEV ; }static inline void cpuidle_reflect (struct cpuidle_device *dev,int index) { } -static inline int cpuidle_idle_call (void ) {return -ENODEV ; }static inline int cpuidle_register_driver (struct cpuidle_driver *drv) {return -ENODEV ; }static inline struct cpuidle_driver *cpuidle_get_driver (void ) {return NULL ; }
kernel/sched/idle.c +56 -0
62 lines not on this page · raw message
PATCH v4 3/5 idle: Reorganize the idle loop
In reply to Daniel LezcanoNow 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.
---
Changelog:
V4:
* no changes
V3:
* no changes
V2:
* fixed type in patch's description
--- include/linux/cpuidle.h | 2 ++ kernel/sched/idle.c | 33 +++++++++++++++------------------ 2 files changed, 17 insertions(+), 18 deletions(-)
include/linux/cpuidle.h +2 -0
@@ -180,6 +180,8 @@ static inline int cpuidle_enable_device( {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
kernel/sched/idle.c +15 -18
@@ -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 (); }
tip-bot for Daniel Lezcano
merge bot[tip:sched/idle] sched/idle: Reorganize the idle loop
sched/idle: Reorganize the idle loop
Commit-ID: c8cc7d4de7a4f2fb1f8774ec2de5b49c46c42e64 Gitweb: http://git.kernel.org/tip/c8cc7d4de7a4f2fb1f8774ec2de5b49c46c42e64 Author: Daniel Lezcano <[email protected]> AuthorDate: Mon, 3 Mar 2014 08:48:52 +0100 Committer: Ingo Molnar <[email protected]> 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.
--- include/linux/cpuidle.h | 2 ++ kernel/sched/idle.c | 33 +++++++++++++++------------------ 2 files changed, 17 insertions(+), 18 deletions(-)
include/linux/cpuidle.h +2 -0
@@ -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
kernel/sched/idle.c +15 -18
@@ -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 (); }
PATCH v4 4/5 idle: Move idle conditions in cpuidle_idle main function
In reply to Daniel LezcanoThis patch moves the condition before entering idle into the cpuidle main function located in idle.c. That simplify the idle mainloop functions and increase the readibility of the conditions to enter truly idle.
This patch is code reorganization and does not change the behavior of the function.
---
V4:
* took into account clockevents_notify(ENTER) could fail
* removed an extra current_clr_polling_and_test added in V3
V3:
* reorganized cpuidle_idle_call function as Suggested by Peter Zijlstra
https://lkml.org/lkml/2014/2/24/492
--- kernel/sched/idle.c | 84 +++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 37 deletions(-)
kernel/sched/idle.c +47 -37
@@ -76,44 +76,59 @@ static int cpuidle_idle_call(void)int next_state, entered_state, ret;bool broadcast; +if (current_clr_polling_and_test ()) { +local_irq_enable (); +__current_set_polling (); +return 0 ; + } +stop_critical_timings ();rcu_idle_enter (); ret =cpuidle_enabled (drv, dev); -if (ret <0 ) { -arch_cpu_idle (); - goto out; - } -/* ask the governor for the next state */ - next_state =cpuidle_select (drv, dev); +if (!ret) { +/* ask the governor for the next state */ + next_state =cpuidle_select (drv, dev); + +if (current_clr_polling_and_test ()) { + dev->last_residency =0 ; + entered_state = next_state; +local_irq_enable (); + }else { + broadcast = !!(drv->states[next_state].flags & +CPUIDLE_FLAG_TIMER_STOP ); + +if (broadcast) + ret =clockevents_notify ( +CLOCK_EVT_NOTIFY_BROADCAST_ENTER , + &dev->cpu); + +if (!ret) { +trace_cpu_idle_rcuidle (next_state, dev->cpu); + + entered_state =cpuidle_enter (drv, dev, + next_state); + +trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , + dev->cpu); + +if (broadcast) +clockevents_notify ( +CLOCK_EVT_NOTIFY_BROADCAST_EXIT , + &dev->cpu); -if (need_resched ()) { - dev->last_residency =0 ; -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, next_state); -local_irq_enable (); - goto out; +/* give the governor an opportunity to reflect on the outcome */ +cpuidle_reflect (dev, entered_state); + } + } } - broadcast = !!(drv->states[next_state].flags &CPUIDLE_FLAG_TIMER_STOP ); - -if (broadcast && -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu)) -return -EBUSY ; - -trace_cpu_idle_rcuidle (next_state, dev->cpu); - - entered_state =cpuidle_enter (drv, dev, next_state); - -trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu); +if (ret) +arch_cpu_idle (); -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); +__current_set_polling (); -/* 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 ();
@@ -150,16 +165,11 @@ static void cpu_idle_loop(void)* know that the IPI is going to arrive right * away */ -if (cpu_idle_force_poll ||tick_check_broadcast_expired ()) { +if (cpu_idle_force_poll ||tick_check_broadcast_expired ())cpu_idle_poll (); - }else { -if (!current_clr_polling_and_test ()) { -cpuidle_idle_call (); - }else { -local_irq_enable (); - } -__current_set_polling (); - } +else +cpuidle_idle_call (); +arch_cpu_idle_exit (); }
tip-bot for Daniel Lezcano
merge bot[tip:sched/idle] sched/idle: Move idle conditions in cpuidle_idle main function
sched/idle: Move idle conditions in cpuidle_idle main function
Commit-ID: 8ca3c6424f4988fc19ed1067b121fbaf2e884d77 Gitweb: http://git.kernel.org/tip/8ca3c6424f4988fc19ed1067b121fbaf2e884d77 Author: Daniel Lezcano <[email protected]> AuthorDate: Mon, 3 Mar 2014 08:48:53 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Mar 2014 11:52:48 +0100
sched/idle: Move idle conditions in cpuidle_idle main function
This patch moves the condition before entering idle into the cpuidle main function located in idle.c. That simplify the idle mainloop functions and increase the readibility of the conditions to enter truly idle.
This patch is code reorganization and does not change the behavior of the function.
--- kernel/sched/idle.c | 78 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 34 deletions(-)
kernel/sched/idle.c +44 -34
@@ -76,44 +76,59 @@ static int cpuidle_idle_call(void)int next_state, entered_state, ret;bool broadcast; +if (current_clr_polling_and_test ()) { +local_irq_enable (); +__current_set_polling (); +return 0 ; + } +stop_critical_timings ();rcu_idle_enter (); ret =cpuidle_enabled (drv, dev); -if (ret <0 ) { -arch_cpu_idle (); - goto out; - } -/* ask the governor for the next state */ - next_state =cpuidle_select (drv, dev); +if (!ret) { +/* ask the governor for the next state */ + next_state =cpuidle_select (drv, dev); -if (need_resched ()) { - dev->last_residency =0 ; -/* give the governor an opportunity to reflect on the outcome */ -cpuidle_reflect (dev, next_state); -local_irq_enable (); - goto out; - } +if (current_clr_polling_and_test ()) { + dev->last_residency =0 ; + entered_state = next_state; +local_irq_enable (); + }else { + broadcast = !!(drv->states[next_state].flags & +CPUIDLE_FLAG_TIMER_STOP ); + +if (broadcast) + ret =clockevents_notify ( +CLOCK_EVT_NOTIFY_BROADCAST_ENTER , + &dev->cpu); - broadcast = !!(drv->states[next_state].flags &CPUIDLE_FLAG_TIMER_STOP ); +if (!ret) { +trace_cpu_idle_rcuidle (next_state, dev->cpu); -if (broadcast && -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu)) -return -EBUSY ; + entered_state =cpuidle_enter (drv, dev, + next_state); -trace_cpu_idle_rcuidle (next_state, dev->cpu); +trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , + dev->cpu); - entered_state =cpuidle_enter (drv, dev, next_state); +if (broadcast) +clockevents_notify ( +CLOCK_EVT_NOTIFY_BROADCAST_EXIT , + &dev->cpu); -trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu); +/* give the governor an opportunity to reflect on the outcome */ +cpuidle_reflect (dev, entered_state); + } + } + } + +if (ret) +arch_cpu_idle (); -if (broadcast) -clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); +__current_set_polling (); -/* 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 ();
@@ -150,16 +165,11 @@ static void cpu_idle_loop(void)* know that the IPI is going to arrive right * away */ -if (cpu_idle_force_poll ||tick_check_broadcast_expired ()) { +if (cpu_idle_force_poll ||tick_check_broadcast_expired ())cpu_idle_poll (); - }else { -if (!current_clr_polling_and_test ()) { -cpuidle_idle_call (); - }else { -local_irq_enable (); - } -__current_set_polling (); - } +else +cpuidle_idle_call (); +arch_cpu_idle_exit (); }
PATCH v4 5/5 idle: Add more comments to the code
In reply to Daniel LezcanoThe idle main function is a complex and a critical function. Added more comments to the code.
---
Changelog:
V4:
* updated comments with new code
V3:
* no changes
V2:
* fixed typo in comment
--- kernel/sched/idle.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)
kernel/sched/idle.c +57 -2
@@ -76,21 +76,49 @@ static int cpuidle_idle_call(void)int next_state, entered_state, ret;bool broadcast; +/* +* Check if the idle task must be rescheduled. If it is the +* case, exit the function after re-enabling the local irq and +* set again the polling flag +*/ if (current_clr_polling_and_test ()) {local_irq_enable ();__current_set_polling ();return 0 ; } +/* +* During the idle period, stop measuring the disabled irqs +* critical sections latencies +*/ stop_critical_timings (); + +/* +* Tell the RCU framework we are entering an idle section, +* so no more rcu read side critical sections and one more +* step to the grace period +*/ rcu_idle_enter (); +/* +* Check if the cpuidle framework is ready, otherwise fallback +* to the default arch specific idle method +*/ ret =cpuidle_enabled (drv, dev);if (!ret) { -/* ask the governor for the next state */ +/* +* Ask the governor to choose an idle state it thinks +* it is convenient to go to. There is *always* a +* convenient idle state +*/ next_state =cpuidle_select (drv, dev); +/* +* The idle task must be scheduled, it is pointless to +* go to idle, just update no idle residency and get +* out of this function +*/ if (current_clr_polling_and_test ()) { dev->last_residency =0 ; entered_state = next_state;
@@ -100,6 +128,14 @@ static int cpuidle_idle_call(void) CPUIDLE_FLAG_TIMER_STOP);if (broadcast) +/* +* Tell the time framework to switch +* to a broadcast timer because our +* local timer will be shutdown. If a +* local timer is used from another +* cpu as a broadcast timer, this call +* may fail if it is not available +*/ ret =clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu);
@@ -107,6 +143,14 @@ static int cpuidle_idle_call(void)if (!ret) {trace_cpu_idle_rcuidle (next_state, dev->cpu); +/* +* Enter the idle state previously +* returned by the governor +* decision. This function will block +* until an interrupt occurs and will +* take care of re-enabling the local +* interrupts +*/ entered_state =cpuidle_enter (drv, dev, next_state);
@@ -118,17 +162,28 @@ static int cpuidle_idle_call(void)CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); -/* give the governor an opportunity to reflect on the outcome */ +/* +* Give the governor an opportunity to reflect on the +* outcome +*/ cpuidle_reflect (dev, entered_state); } } } +/* +* We can't use the cpuidle framework, let's use the default +* idle routine +*/ if (ret)arch_cpu_idle ();__current_set_polling (); +/* +* It is up to the idle functions to enable back the local +* interrupt +*/ if (WARN_ON_ONCE (irqs_disabled ()))local_irq_enable ();
tip-bot for Daniel Lezcano
merge bot[tip:sched/idle] sched/idle: Add more comments to the code
sched/idle: Add more comments to the code
Commit-ID: a1d028bd6d2b7789d15eddfd07c5bea2aaf36040 Gitweb: http://git.kernel.org/tip/a1d028bd6d2b7789d15eddfd07c5bea2aaf36040 Author: Daniel Lezcano <[email protected]> AuthorDate: Mon, 3 Mar 2014 08:48:54 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Mar 2014 11:52:49 +0100
sched/idle: Add more comments to the code
The idle main function is a complex and a critical function. Added more comments to the code.
--- kernel/sched/idle.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)
kernel/sched/idle.c +57 -2
@@ -76,21 +76,49 @@ static int cpuidle_idle_call(void)int next_state, entered_state, ret;bool broadcast; +/* +* Check if the idle task must be rescheduled. If it is the +* case, exit the function after re-enabling the local irq and +* set again the polling flag +*/ if (current_clr_polling_and_test ()) {local_irq_enable ();__current_set_polling ();return 0 ; } +/* +* During the idle period, stop measuring the disabled irqs +* critical sections latencies +*/ stop_critical_timings (); + +/* +* Tell the RCU framework we are entering an idle section, +* so no more rcu read side critical sections and one more +* step to the grace period +*/ rcu_idle_enter (); +/* +* Check if the cpuidle framework is ready, otherwise fallback +* to the default arch specific idle method +*/ ret =cpuidle_enabled (drv, dev);if (!ret) { -/* ask the governor for the next state */ +/* +* Ask the governor to choose an idle state it thinks +* it is convenient to go to. There is *always* a +* convenient idle state +*/ next_state =cpuidle_select (drv, dev); +/* +* The idle task must be scheduled, it is pointless to +* go to idle, just update no idle residency and get +* out of this function +*/ if (current_clr_polling_and_test ()) { dev->last_residency =0 ; entered_state = next_state;
@@ -100,6 +128,14 @@ static int cpuidle_idle_call(void) CPUIDLE_FLAG_TIMER_STOP);if (broadcast) +/* +* Tell the time framework to switch +* to a broadcast timer because our +* local timer will be shutdown. If a +* local timer is used from another +* cpu as a broadcast timer, this call +* may fail if it is not available +*/ ret =clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_ENTER , &dev->cpu);
@@ -107,6 +143,14 @@ static int cpuidle_idle_call(void)if (!ret) {trace_cpu_idle_rcuidle (next_state, dev->cpu); +/* +* Enter the idle state previously +* returned by the governor +* decision. This function will block +* until an interrupt occurs and will +* take care of re-enabling the local +* interrupts +*/ entered_state =cpuidle_enter (drv, dev, next_state);
@@ -118,17 +162,28 @@ static int cpuidle_idle_call(void)CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu); -/* give the governor an opportunity to reflect on the outcome */ +/* +* Give the governor an opportunity to reflect on the +* outcome +*/ cpuidle_reflect (dev, entered_state); } } } +/* +* We can't use the cpuidle framework, let's use the default +* idle routine +*/ if (ret)arch_cpu_idle ();__current_set_polling (); +/* +* It is up to the idle functions to enable back the local +* interrupt +*/ if (WARN_ON_ONCE (irqs_disabled ()))local_irq_enable ();
tip-bot for Daniel Lezcano
merge botidle/cpuidle: Split cpuidle_idle_call main function into smaller functions
Commit-ID: 907e30f1bb4a9656d351aa705c1e5931da908701 Gitweb: http://git.kernel.org/tip/907e30f1bb4a9656d351aa705c1e5931da908701 Author: Daniel Lezcano <[email protected]> AuthorDate: Mon, 3 Mar 2014 08:48:50 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Mar 2014 11:52:45 +0100
idle/cpuidle: Split cpuidle_idle_call main function into smaller functions
In order to allow better integration between the cpuidle framework and the scheduler, reducing the distance between these two sub-components will facilitate this integration by moving part of the cpuidle code in the idle task file and, because idle.c is in the sched directory, we have access to the scheduler's private structures.
This patch splits the cpuidle_idle_call main entry function into 3 calls to a newly added API:
1. select the idle state
2. enter the idle state
3. reflect the idle state
The cpuidle_idle_call calls these three functions to implement the main idle entry function.
--- drivers/cpuidle/cpuidle.c | 96 ++++++++++++++++++++++++++++++++++++----------- include/linux/cpuidle.h | 19 ++++++++++ 2 files changed, 94 insertions(+), 21 deletions(-)
drivers/cpuidle/cpuidle.c +75 -21
@@ -65,6 +65,26 @@ int cpuidle_play_dead(void) }/** +* cpuidle_enabled - check if the cpuidle framework is ready +* @dev: cpuidle device for this cpu +* @drv: cpuidle driver for this cpu +* +* Return 0 on success, otherwise: +* -NODEV : the cpuidle framework is not available +* -EBUSY : the cpuidle framework is not initialized +*/ +int cpuidle_enabled (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +if (off || !initialized) +return -ENODEV ; + +if (!drv || !dev || !dev->enabled) +return -EBUSY ; + +return 0 ; +} + +/** * cpuidle_enter_state - enter the state and update stats * @dev: cpuidle device for this cpu * @drv: cpuidle driver for this cpu
@@ -108,6 +128,51 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, }/** +* cpuidle_select - ask the cpuidle framework to choose an idle state +* +* @drv: the cpuidle driver +* @dev: the cpuidle device +* +* Returns the index of the idle state. +*/ +int cpuidle_select (struct cpuidle_driver *drv,struct cpuidle_device *dev) +{ +return cpuidle_curr_governor->select (drv, dev); +} + +/** +* cpuidle_enter - enter into the specified idle state +* +* @drv: the cpuidle driver tied with the cpu +* @dev: the cpuidle device +* @index: the index in the idle state table +* +* Returns the index in the idle state, < 0 in case of error. +* The error code depends on the backend driver +*/ +int cpuidle_enter (struct cpuidle_driver *drv,struct cpuidle_device *dev, +int index) +{ +if (cpuidle_state_is_coupled (dev, drv, index)) +return cpuidle_enter_state_coupled (dev, drv, index); +return cpuidle_enter_state (dev, drv, index); +} + +/** +* cpuidle_reflect - tell the underlying governor what was the state +* we were in +* +* @dev : the cpuidle device +* @index: the index in the idle state table +* +*/ +void cpuidle_reflect (struct cpuidle_device *dev,int index) +{ +if (cpuidle_curr_governor->reflect) + cpuidle_curr_governor->reflect (dev, index); +} + +/** * cpuidle_idle_call - the main idle loop * * NOTE: no locks or semaphores should be used here
@@ -116,26 +181,21 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,int cpuidle_idle_call (void ) {struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices); -struct cpuidle_driver *drv; -int next_state, entered_state; +struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev); +int next_state, entered_state, ret;bool broadcast; -if (off || !initialized) -return -ENODEV ; - -/* check if the device is ready */ -if (!dev || !dev->enabled) -return -EBUSY ; - - drv =cpuidle_get_cpu_driver (dev); + ret =cpuidle_enabled (drv, dev); +if (ret <0 ) +return ret;/* ask the governor for the next state */ - next_state = cpuidle_curr_governor->select (drv, dev); + next_state =cpuidle_select (drv, dev); +if (need_resched ()) { dev->last_residency =0 ;/* give the governor an opportunity to reflect on the outcome */ -if (cpuidle_curr_governor->reflect) - cpuidle_curr_governor->reflect (dev, next_state); +cpuidle_reflect (dev, next_state);local_irq_enable ();return 0 ; }
@@ -146,14 +206,9 @@ int cpuidle_idle_call(void) clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))return -EBUSY ; -trace_cpu_idle_rcuidle (next_state, dev->cpu); -if (cpuidle_state_is_coupled (dev, drv, next_state)) - entered_state =cpuidle_enter_state_coupled (dev, drv, - next_state); -else - entered_state =cpuidle_enter_state (dev, drv, next_state); + entered_state =cpuidle_enter (drv, dev, next_state);trace_cpu_idle_rcuidle (PWR_EVENT_EXIT , dev->cpu);
@@ -161,8 +216,7 @@ int cpuidle_idle_call(void)clockevents_notify (CLOCK_EVT_NOTIFY_BROADCAST_EXIT , &dev->cpu);/* give the governor an opportunity to reflect on the outcome */ -if (cpuidle_curr_governor->reflect) - cpuidle_curr_governor->reflect (dev, entered_state); +cpuidle_reflect (dev, entered_state);return 0 ; }
include/linux/cpuidle.h +19 -0
@@ -119,6 +119,15 @@ struct cpuidle_driver {#ifdef CONFIG_CPU_IDLE extern void disable_cpuidle (void ); + +extern int cpuidle_enabled (struct cpuidle_driver *drv, +struct cpuidle_device *dev); +extern int cpuidle_select (struct cpuidle_driver *drv, +struct cpuidle_device *dev); +extern int cpuidle_enter (struct cpuidle_driver *drv, +struct cpuidle_device *dev,int index); +extern void cpuidle_reflect (struct cpuidle_device *dev,int index); +extern int cpuidle_idle_call (void );extern int cpuidle_register_driver (struct cpuidle_driver *drv);extern struct cpuidle_driver *cpuidle_get_driver (void );
@@ -141,6 +150,16 @@ extern int cpuidle_play_dead(void);extern struct cpuidle_driver *cpuidle_get_cpu_driver (struct cpuidle_device *dev);#else static inline void disable_cpuidle (void ) { } +static inline int cpuidle_enabled (struct cpuidle_driver *drv, +struct cpuidle_device *dev) +{return -ENODEV ; } +static inline int cpuidle_select (struct cpuidle_driver *drv, +struct cpuidle_device *dev) +{return -ENODEV ; } +static inline int cpuidle_enter (struct cpuidle_driver *drv, +struct cpuidle_device *dev,int index) +{return -ENODEV ; } +static inline void cpuidle_reflect (struct cpuidle_device *dev,int index) { }static inline int cpuidle_idle_call (void ) {return -ENODEV ; }static inline int cpuidle_register_driver (struct cpuidle_driver *drv) {return -ENODEV ; }