Patch "cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE" has been added to the 4.6-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE
to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cpuidle-do-not-access-cpuidle_devices-when-config_cpu_idle.patch
and it can be found in the queue-4.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
9bd616e3dbedfc103f158197c8ad93678849b1edMon Sep 17 00:00:00 2001
From: Catalin Marinas <[email protected]>
Date: Wed, 1 Jun 2016 18:52:16 +0100
Subject: cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE
From: Catalin Marinas <[email protected]>
commit 9bd616e3dbedfc103f158197c8ad93678849b1ed upstream.
The cpuidle_devices per-CPU variable is only defined when CPU_IDLE is enabled. Commit c8cc7d4de7a4 ("sched/idle: Reorganize the idle loop") removed the #ifdef CONFIG_CPU_IDLE around cpuidle_idle_call() with the compiler optimising away __this_cpu_read(cpuidle_devices). However, with CONFIG_UBSAN && !CONFIG_CPU_IDLE, this optimisation no longer happens and the kernel fails to link since cpuidle_devices is not defined.
This patch introduces an accessor function for the current CPU cpuidle device (returning NULL when !CONFIG_CPU_IDLE) and uses it in cpuidle_idle_call().
--- include/linux/cpuidle.h | 3 +++ kernel/sched/idle.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
include/linux/cpuidle.h +3 -0
@@ -152,6 +152,8 @@ extern void cpuidle_disable_device(strucextern int cpuidle_play_dead (void );extern struct cpuidle_driver *cpuidle_get_cpu_driver (struct cpuidle_device *dev); +static inline struct cpuidle_device *cpuidle_get_device (void ) +{return __this_cpu_read (cpuidle_devices); }#else static inline void disable_cpuidle (void ) { } static inline bool cpuidle_not_available(struct cpuidle_driver *drv,
@@ -187,6 +189,7 @@ static inline void cpuidle_disable_devicstatic inline int cpuidle_play_dead (void ) {return -ENODEV ; }static inline struct cpuidle_driver *cpuidle_get_cpu_driver (struct cpuidle_device *dev) {return NULL ; } +static inline struct cpuidle_device *cpuidle_get_device (void ) {return NULL ; }#endif #if defined(CONFIG_CPU_IDLE ) && defined(CONFIG_SUSPEND )
kernel/sched/idle.c +1 -1
@@ -127,7 +127,7 @@ static int call_cpuidle(struct cpuidle_d*/ static void cpuidle_idle_call (void ) { -struct cpuidle_device *dev =__this_cpu_read (cpuidle_devices); +struct cpuidle_device *dev =cpuidle_get_device ();struct cpuidle_driver *drv =cpuidle_get_cpu_driver (dev);int next_state, entered_state;
Patches currently in stable-queue which might be from [email protected] are
queue-4.6/cpuidle-do-not-access-cpuidle_devices-when-config_cpu_idle.patch