arm64: arch_timer: mark functions as __always_inline
Subsystems (2)
PATCH 2/3 arm64: arch_timer: mark functions as __always_inline
If CONFIG_FUNCTION_GRAPH_TRACER is enabled function arch_counter_get_cntvct() is marked as notrace. However, function __arch_counter_get_cntvct is marked as inline. If CONFIG_OPTIMIZE_INLINING is set that will make the two functions tracable which they shouldn't.
Rework so that functions __arch_counter_get_* are marked with __always_inline so they will be inlined even if CONFIG_OPTIMIZE_INLINING is turned on.
--- arch/arm64/include/asm/arch_timer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/include/asm/arch_timer.h +4 -4
@@ -193,7 +193,7 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) : "=r" (tmp) : "r" (_val)); \ }while (0 ) -static inline u64 __arch_counter_get_cntpct_stable(void) +static __always_inline u64 __arch_counter_get_cntpct_stable(void) {u64 cnt;
@@ -203,7 +203,7 @@ static inline u64 __arch_counter_get_cntpct_stable(void)return cnt; } -static inline u64 __arch_counter_get_cntpct (void ) +static __always_inline u64 __arch_counter_get_cntpct(void) {u64 cnt;
@@ -213,7 +213,7 @@ static inline u64 __arch_counter_get_cntpct(void)return cnt; } -static inline u64 __arch_counter_get_cntvct_stable (void ) +static __always_inline u64 __arch_counter_get_cntvct_stable(void) {u64 cnt;
@@ -223,7 +223,7 @@ static inline u64 __arch_counter_get_cntvct_stable(void)return cnt; } -static inline u64 __arch_counter_get_cntvct (void ) +static __always_inline u64 __arch_counter_get_cntvct(void) {u64 cnt;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 10 lines · Anders Roxell
If
CONFIG_FUNCTION_GRAPH_TRACERis enabled functionarch_counter_get_cntvct()is marked as notrace. However, function__arch_counter_get_cntvctis marked as inline. IfCONFIG_OPTIMIZE_INLININGis set that will make the two functions tracable which they shouldn't.Rework so that functions __arch_counter_get_* are marked with
__always_inlineso they will be inlined even ifCONFIG_OPTIMIZE_INLININGis turned on.
Quoted 5 lines
Fixes 0ea415390cd3 ("clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters")Signed-off-by Anders Roxell <[email protected]>--- arch/arm64/include/asm/arch_timer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
I can pick this up if Marc is happy with it.
Will
Marc Zyngier
Acked-byQuoted 11 lines · Will Deacon
Quoted 10 lines · Anders Roxell
If
CONFIG_FUNCTION_GRAPH_TRACERis enabled functionarch_counter_get_cntvct()is marked as notrace. However, function__arch_counter_get_cntvctis marked as inline. IfCONFIG_OPTIMIZE_INLININGis set that will make the two functions tracable which they shouldn't.Rework so that functions __arch_counter_get_* are marked with
__always_inlineso they will be inlined even ifCONFIG_OPTIMIZE_INLININGis turned on.
Quoted 7 lines
Quoted 5 lines
Fixes 0ea415390cd3 ("clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters")Signed-off-by Anders Roxell <[email protected]>--- arch/arm64/include/asm/arch_timer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)I can pick this up if Marc is happy with it.
Yup, looks good to me. Please add my
M.
Signature · 1 line
Jazz is not dead. It just smells funny...