xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/pseries: Account for SPURR ticks on idle CPUs

Browse Source 
On Pseries LPARs, to calculate utilization, we need to know the
[S]PURR ticks when the CPUs were busy or idle.

Via pseries_idle_prolog(), pseries_idle_epilog(), we track the idle
PURR ticks in the VPA variable "wait_state_cycles". This patch extends
the support to account for the idle SPURR ticks.

Signed-off-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/1586249263-14048-4-git-send-email-ego@linux.vnet.ibm.com
This commit is contained in:
Gautham R. Shenoy
2020-04-07 14:17:41 +05:30
committed by Michael Ellerman
parent c4019198cf
commit dc8afce5f4
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/powerpc/include/asm/idle.h
View File

@@ -5,13 +5,20 @@
#include <asm/paca.h> #include <asm/paca.h>
#ifdef CONFIG_PPC_PSERIES #ifdef CONFIG_PPC_PSERIES
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);
static inline void snapshot_purr_idle_entry(void) static 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)
{
*this_cpu_ptr(&idle_entry_spurr_snap) = mfspr(SPRN_SPURR);
}
static inline void update_idle_purr_accounting(void) static inline void update_idle_purr_accounting(void)
{ {
u64 wait_cycles; u64 wait_cycles;
@@ -22,10 +29,19 @@ 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)
{
u64 *idle_spurr_cycles_ptr = this_cpu_ptr(&idle_spurr_cycles);
u64 in_spurr = *this_cpu_ptr(&idle_entry_spurr_snap);
*idle_spurr_cycles_ptr += mfspr(SPRN_SPURR) - in_spurr;
}
static inline void pseries_idle_prolog(void) static inline void pseries_idle_prolog(void)
{ {
ppc64_runlatch_off(); ppc64_runlatch_off();
snapshot_purr_idle_entry(); snapshot_purr_idle_entry();
snapshot_spurr_idle_entry();
/* /*
* Indicate to the HV that we are idle. Now would be * Indicate to the HV that we are idle. Now would be
* a good time to find other work to dispatch. * a good time to find other work to dispatch.
@@ -36,6 +52,7 @@ static inline void pseries_idle_prolog(void)
static inline void pseries_idle_epilog(void) static inline void pseries_idle_epilog(void)
{ {
update_idle_purr_accounting(); update_idle_purr_accounting();
update_idle_spurr_accounting();
get_lppaca()->idle = 0; get_lppaca()->idle = 0;
ppc64_runlatch_on(); ppc64_runlatch_on();
} }

2
arch/powerpc/platforms/pseries/setup.c
View File

@@ -318,7 +318,9 @@ static int alloc_dispatch_log_kmem_cache(void)
} }
machine_early_initcall(pseries, alloc_dispatch_log_kmem_cache); machine_early_initcall(pseries, alloc_dispatch_log_kmem_cache);
DEFINE_PER_CPU(u64, idle_spurr_cycles);
DEFINE_PER_CPU(u64, idle_entry_purr_snap); DEFINE_PER_CPU(u64, idle_entry_purr_snap);
DEFINE_PER_CPU(u64, idle_entry_spurr_snap);
static void pseries_lpar_idle(void) static void pseries_lpar_idle(void)
{ {
/* /*