Commit 18b5e717 authored by Michael Ellerman's avatar Michael Ellerman

powerpc/pseries: Always inline functions called from cpuidle

Code in the idle path is not allowed to be instrumented because RCU is
disabled, see commit 0e985e9d ("cpuidle: Add comments about
noinstr/__cpuidle usage").

Force inlining of the inline functions called from cpuidle, to ensure
they are not emitted out-of-line and then available for tracing.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230406144535.3786008-4-mpe@ellerman.id.au
parent 88990745
...@@ -9,17 +9,17 @@ DECLARE_PER_CPU(u64, idle_spurr_cycles); ...@@ -9,17 +9,17 @@ DECLARE_PER_CPU(u64, idle_spurr_cycles);
DECLARE_PER_CPU(u64, idle_entry_purr_snap); DECLARE_PER_CPU(u64, idle_entry_purr_snap);
DECLARE_PER_CPU(u64, idle_entry_spurr_snap); DECLARE_PER_CPU(u64, idle_entry_spurr_snap);
static inline void snapshot_purr_idle_entry(void) static __always_inline void snapshot_purr_idle_entry(void)
{ {
*this_cpu_ptr(&idle_entry_purr_snap) = mfspr(SPRN_PURR); *this_cpu_ptr(&idle_entry_purr_snap) = mfspr(SPRN_PURR);
} }
static inline void snapshot_spurr_idle_entry(void) static __always_inline void snapshot_spurr_idle_entry(void)
{ {
*this_cpu_ptr(&idle_entry_spurr_snap) = mfspr(SPRN_SPURR); *this_cpu_ptr(&idle_entry_spurr_snap) = mfspr(SPRN_SPURR);
} }
static inline void update_idle_purr_accounting(void) static __always_inline void update_idle_purr_accounting(void)
{ {
u64 wait_cycles; u64 wait_cycles;
u64 in_purr = *this_cpu_ptr(&idle_entry_purr_snap); u64 in_purr = *this_cpu_ptr(&idle_entry_purr_snap);
...@@ -29,7 +29,7 @@ static inline void update_idle_purr_accounting(void) ...@@ -29,7 +29,7 @@ static inline void update_idle_purr_accounting(void)
get_lppaca()->wait_state_cycles = cpu_to_be64(wait_cycles); get_lppaca()->wait_state_cycles = cpu_to_be64(wait_cycles);
} }
static inline void update_idle_spurr_accounting(void) static __always_inline void update_idle_spurr_accounting(void)
{ {
u64 *idle_spurr_cycles_ptr = this_cpu_ptr(&idle_spurr_cycles); u64 *idle_spurr_cycles_ptr = this_cpu_ptr(&idle_spurr_cycles);
u64 in_spurr = *this_cpu_ptr(&idle_entry_spurr_snap); u64 in_spurr = *this_cpu_ptr(&idle_entry_spurr_snap);
...@@ -37,7 +37,7 @@ static inline void update_idle_spurr_accounting(void) ...@@ -37,7 +37,7 @@ static inline void update_idle_spurr_accounting(void)
*idle_spurr_cycles_ptr += mfspr(SPRN_SPURR) - in_spurr; *idle_spurr_cycles_ptr += mfspr(SPRN_SPURR) - in_spurr;
} }
static inline void pseries_idle_prolog(void) static __always_inline void pseries_idle_prolog(void)
{ {
ppc64_runlatch_off(); ppc64_runlatch_off();
snapshot_purr_idle_entry(); snapshot_purr_idle_entry();
...@@ -49,7 +49,7 @@ static inline void pseries_idle_prolog(void) ...@@ -49,7 +49,7 @@ static inline void pseries_idle_prolog(void)
get_lppaca()->idle = 1; get_lppaca()->idle = 1;
} }
static inline void pseries_idle_epilog(void) static __always_inline void pseries_idle_epilog(void)
{ {
update_idle_purr_accounting(); update_idle_purr_accounting();
update_idle_spurr_accounting(); update_idle_spurr_accounting();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment