ARM: arch_timer: Silence debug preempt warnings
Subsystems (3)
PATCH v2 1/1 ARM: arch_timer: Silence debug preempt warnings
Hot-plugging with CONFIG_DEBUG_PREEMPT=y on a device with arm architected timers causes a slew of "using smp_processor_id() in preemptible" warnings:
BUG: using smp_processor_id() in preemptible [00000000] code: sh/111 caller is arch_timer_cpu_notify+0x14/0xc8
This happens because sometimes the cpu notifier, arch_timer_cpu_notify(), is called in preemptible context and other times in non-preemptible context but we use this_cpu_ptr() to retrieve the clockevent in all cases. We're only going to actually use the pointer in non-preemptible context though, so push the this_cpu_ptr() access down into the cases to force the checks to occur only in non-preemptible contexts.
---
Changes since v1:
* Pushed down this_cpu_ptr and added a comment
drivers/clocksource/arm_arch_timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/clocksource/arm_arch_timer.c +6 -4
@@ -248,14 +248,16 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk)static int __cpuinit arch_timer_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) { -struct clock_event_device *evt =this_cpu_ptr (arch_timer_evt); - +/* +* Grab cpu pointer in each case to avoid spurious +* preemptible warnings +*/ switch (action & ~CPU_TASKS_FROZEN ) {case CPU_STARTING : -arch_timer_setup (evt); +arch_timer_setup (this_cpu_ptr (arch_timer_evt));break ;case CPU_DYING : -arch_timer_stop (evt); +arch_timer_stop (this_cpu_ptr (arch_timer_evt));break ; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 42 lines · Stephen Boyd
Hot-plugging with
CONFIG_DEBUG_PREEMPT=yon a device with arm architected timers causes a slew of "usingsmp_processor_id()in preemptible" warnings:BUG: using smp_processor_id() in preemptible [00000000] code: sh/111 caller is arch_timer_cpu_notify+0x14/0xc8This happens because sometimes the cpu notifier,
arch_timer_cpu_notify(), is called in preemptible context and other times in non-preemptible context but we usethis_cpu_ptr()to retrieve the clockevent in all cases. We're only going to actually use the pointer in non-preemptible context though, so push thethis_cpu_ptr()access down into the cases to force the checks to occur only in non-preemptible contexts.Cc Mark Rutland <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Changes since v1:
* Pushed downthis_cpu_ptrand added a commentdrivers/clocksource/arm_arch_timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/clocksource/arm_arch_timer.c +4
-2@@ -248,14 +248,16 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk)static int __cpuinit arch_timer_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) { -struct clock_event_device *evt =this_cpu_ptr (arch_timer_evt); - +/* +* Grab cpu pointer in each case to avoid spurious +* preemptible warnings +*/
drivers/clocksource/arm_arch_timer.c static void __cpuinit arch_timer_stop(struct · line 263
Quoted 10 lines
drivers/clocksource/arm_arch_timer.c +2
-2switch (action & ~CPU_TASKS_FROZEN ) {case CPU_STARTING : -arch_timer_setup (evt); +arch_timer_setup (this_cpu_ptr (arch_timer_evt));break ;case CPU_DYING : -arch_timer_stop (evt); +arch_timer_stop (this_cpu_ptr (arch_timer_evt));break ; }
Looks good to me.
Cheers,
M.
Signature · 1 line
Fast, cheap, reliable. Pick two.
Quoted 56 lines · Marc Zyngier
Quoted 42 lines · Stephen Boyd
Hot-plugging with
CONFIG_DEBUG_PREEMPT=yon a device with arm architected timers causes a slew of "usingsmp_processor_id()in preemptible" warnings:BUG: using smp_processor_id() in preemptible [00000000] code: sh/111 caller is arch_timer_cpu_notify+0x14/0xc8This happens because sometimes the cpu notifier,
arch_timer_cpu_notify(), is called in preemptible context and other times in non-preemptible context but we usethis_cpu_ptr()to retrieve the clockevent in all cases. We're only going to actually use the pointer in non-preemptible context though, so push thethis_cpu_ptr()access down into the cases to force the checks to occur only in non-preemptible contexts.Cc Mark Rutland <[email protected]>Cc Marc Zyngier <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Changes since v1:
* Pushed downthis_cpu_ptrand added a commentdrivers/clocksource/arm_arch_timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/clocksource/arm_arch_timer.c +4
-2@@ -248,14 +248,16 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk)static int __cpuinit arch_timer_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) { -struct clock_event_device *evt =this_cpu_ptr (arch_timer_evt); - +/* +* Grab cpu pointer in each case to avoid spurious +* preemptible warnings +*/ drivers/clocksource/arm_arch_timer.c static void __cpuinit arch_timer_stop(struct · line 263
Quoted 10 lines
drivers/clocksource/arm_arch_timer.c +2
-2switch (action & ~CPU_TASKS_FROZEN ) {case CPU_STARTING : -arch_timer_setup (evt); +arch_timer_setup (this_cpu_ptr (arch_timer_evt));break ;case CPU_DYING : -arch_timer_stop (evt); +arch_timer_stop (this_cpu_ptr (arch_timer_evt));break ; }Looks good to me.
Quoted 2 lines
Acked-by Marc Zyngier <[email protected]>
Thanks Marc.
Thomas/John, can you pick this up for 3.10?
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation