clocksource/arm_arch_timer: mark arch_counter_get_* as notrace
Subsystems (2)
PATCH 1/3 clocksource/arm_arch_timer: mark arch_counter_get_* as notrace
When CONFIG_FUNCTION_GRAPH_TRACER is enabled we end up in this circular call trace since function arch_counter_get_cntvct() isn't marked with no trace:
[ 17.914934] Call trace: [ 17.915211] ftrace_return_to_handler+0x194/0x288 [ 17.915551] return_to_handler+0x1c/0x38 [ 17.915855] trace_clock_local+0x38/0x88 [ 17.916159] function_graph_enter+0xf0/0x258 [ 17.916465] prepare_ftrace_return+0x60/0x90 [ 17.916772] ftrace_graph_caller+0x1c/0x24 [ 17.917093] arch_counter_get_cntvct+0x10/0x30 [ 17.917417] sched_clock+0x70/0x218 [ 17.917723] trace_clock_local+0x38/0x88 [ 17.918026] function_graph_enter+0xf0/0x258 [ 17.918332] prepare_ftrace_return+0x60/0x90 [ 17.918649] ftrace_graph_caller+0x1c/0x24 [ 17.918963] arch_counter_get_cntvct+0x10/0x30 [ 17.919286] sched_clock+0x70/0x218
Rework so that function arch_counter_get_cntvct() is marked with notrace.
--- drivers/clocksource/arm_arch_timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clocksource/arm_arch_timer.c +5 -5
@@ -149,22 +149,22 @@ u32 arch_timer_reg_read(int access, enum arch_timer_reg reg,return val; } -static u64 arch_counter_get_cntpct_stable (void ) +static u64 notrace arch_counter_get_cntpct_stable(void) {return __arch_counter_get_cntpct_stable (); } -static u64 arch_counter_get_cntpct (void ) +static u64 notrace arch_counter_get_cntpct(void) {return __arch_counter_get_cntpct (); } -static u64 arch_counter_get_cntvct_stable (void ) +static u64 notrace arch_counter_get_cntvct_stable(void) {return __arch_counter_get_cntvct_stable (); } -static u64 arch_counter_get_cntvct (void ) +static u64 notrace arch_counter_get_cntvct(void) {return __arch_counter_get_cntvct (); }
@@ -947,7 +947,7 @@ bool arch_timer_evtstrm_available(void)return cpumask_test_cpu (raw_smp_processor_id (), &evtstrm_available); } -static u64 arch_counter_get_cntvct_mem (void ) +static u64 notrace arch_counter_get_cntvct_mem(void) {u32 vct_lo, vct_hi, tmp_hi;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Anders,
Quoted 20 lines · Anders Roxell
When
CONFIG_FUNCTION_GRAPH_TRACERis enabled we end up in this circular call trace since functionarch_counter_get_cntvct()isn't marked with no trace:[ 17.914934] Call trace: [ 17.915211] ftrace_return_to_handler+0x194/0x288 [ 17.915551] return_to_handler+0x1c/0x38 [ 17.915855] trace_clock_local+0x38/0x88 [ 17.916159] function_graph_enter+0xf0/0x258 [ 17.916465] prepare_ftrace_return+0x60/0x90 [ 17.916772] ftrace_graph_caller+0x1c/0x24 [ 17.917093] arch_counter_get_cntvct+0x10/0x30 [ 17.917417] sched_clock+0x70/0x218 [ 17.917723] trace_clock_local+0x38/0x88 [ 17.918026] function_graph_enter+0xf0/0x258 [ 17.918332] prepare_ftrace_return+0x60/0x90 [ 17.918649] ftrace_graph_caller+0x1c/0x24 [ 17.918963] arch_counter_get_cntvct+0x10/0x30 [ 17.919286] sched_clock+0x70/0x218
Quoted 4 lines
Rework so that function
arch_counter_get_cntvct()is marked with notrace.Fixes 0ea415390cd3 ("clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters")Signed-off-by Anders Roxell <[email protected]>
This has already been queued by Daniel, I believe [1].
[1] https://lore.kernel.org/lkml/[email protected]/
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Hi Anders,
thanks for your patch. As mentioned by Mark I already applied this fix from Julien Thierry.
-- Daniel
Quoted 32 lines · Marc Zyngier
Hi Anders,
Quoted 20 lines · Anders Roxell
When
CONFIG_FUNCTION_GRAPH_TRACERis enabled we end up in this circular call trace since functionarch_counter_get_cntvct()isn't marked with no trace:[ 17.914934] Call trace: [ 17.915211] ftrace_return_to_handler+0x194/0x288 [ 17.915551] return_to_handler+0x1c/0x38 [ 17.915855] trace_clock_local+0x38/0x88 [ 17.916159] function_graph_enter+0xf0/0x258 [ 17.916465] prepare_ftrace_return+0x60/0x90 [ 17.916772] ftrace_graph_caller+0x1c/0x24 [ 17.917093] arch_counter_get_cntvct+0x10/0x30 [ 17.917417] sched_clock+0x70/0x218 [ 17.917723] trace_clock_local+0x38/0x88 [ 17.918026] function_graph_enter+0xf0/0x258 [ 17.918332] prepare_ftrace_return+0x60/0x90 [ 17.918649] ftrace_graph_caller+0x1c/0x24 [ 17.918963] arch_counter_get_cntvct+0x10/0x30 [ 17.919286] sched_clock+0x70/0x218Quoted 4 lines
Rework so that function
arch_counter_get_cntvct()is marked with notrace.Fixes 0ea415390cd3 ("clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters")Signed-off-by Anders Roxell <[email protected]>This has already been queued by Daniel, I believe [1].
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