powerpc/64s: reimplement book3s idle code in C
Subsystems (2)
Nicholas Piggin
reviewerv10 cover powerpc/64s: reimplement book3s idle code in C
The KVM code is in better shape now, survives various testing I came up with, so should be ready for more review.
I won't post it again with the KVM part split out unless significant changes are required there. As explained in the comments for patch 1, the split results in some intermediate KVM issues, but the split is supposed to make KVM review easier.
Gautham I left your review tag, quite a lot of KVM changes since he reviewed it, but non-KVM patch is not much different. Let me know if I should drop it.
Thanks,
Nick
Nicholas Piggin (2):
powerpc/64s: reimplement book3s idle code in C powerpc/64s: KVM update for reimplement book3s idle code in C
arch/powerpc/include/asm/cpuidle.h | 19 +- arch/powerpc/include/asm/paca.h | 40 +- arch/powerpc/include/asm/processor.h | 9 +- arch/powerpc/include/asm/reg.h | 8 +- arch/powerpc/kernel/asm-offsets.c | 18 - arch/powerpc/kernel/exceptions-64s.S | 23 +- arch/powerpc/kernel/idle_book3s.S | 1099 +++------------------- arch/powerpc/kernel/setup-common.c | 4 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 118 ++- arch/powerpc/platforms/powernv/idle.c | 902 ++++++++++++++---- arch/powerpc/platforms/powernv/subcore.c | 2 +- arch/powerpc/xmon/xmon.c | 24 +- 12 files changed, 1009 insertions(+), 1257 deletions(-)
Signature · 1 line
2.20.1
Nicholas Piggin
reviewerPATCH v10 1/2 powerpc/64s: reimplement book3s idle code in C
Reimplement Book3S idle code in C, moving POWER7/8/9 implementation speific HV idle code to the powernv platform code.
Book3S assembly stubs are kept in common code and used only to save the stack frame and non-volatile GPRs before executing architected idle instructions, and restoring the stack and reloading GPRs then returning to C after waking from idle.
The complex logic dealing with threads and subcores, locking, SPRs, HMIs, timebase resync, etc., is all done in C which makes it more maintainable.
This is not a strict 1:1 translation to C code, there are some significant differences:
- Idle wakeup no longer uses the ->cpu_restore call to reinit SPRs, but saves and restores them itself.
- The optimisation where EC=ESL=0 idle modes did not have to save GPRs or change MSR is restored, because it's now simple to do. ESL=1 sleeps that do not lose GPRs can use this optimization too.
- KVM secondary entry and cede is now more of a call/return style rather than branchy. nap_state_lost is not required because KVM always returns via NVGPR restoring path.
- KVM secondary wakeup from offline sequence is moved entirely into the offline wakeup, which avoids a hwsync in the normal idle wakeup path.
Performance measured with context switch ping-pong on different threads or cores, is possibly improved a small amount, 1-3% depending on stop state and core vs thread test for shallow states. Deep states it's in the noise compared with other latencies.
Notes:
- I've broken the KVM code into the second patch just for review. The first patch makes KVM kind-of work with its existing design in the new idle code.
The problem is the kvm_start_guest case branches out from the low level asm, which now no longer fixes up SPRs. Guests will somewhat run with deep idle states disabled for offline.
Rather than a significant rework of the code to make old-KVM work with new-idle code that would need testing and review and then gets undone by the next patch, I have just broken it up like this for hopefully easier review of the KVM parts. Patches can be squashed together before upstream merge.
- P9 restores some of the PMU SPRs, but not others, and P8 only zeroes them. There are improvmets to be made to SPR save restore policies and documentation, but this first pass tries to keep things as they were. More work likely needs to be done here.
Left to do:
- Test actual POWER7 hardware. Will check about that tomorrow.
Since v9:
- Fix ELFv1 build error.
- Port to powerpc next.
- Test POWER8 and POWER9 online/offline
- Test POWER8 and POWER9 KVM guests with threads, combinations of MMU modes in guest and host, indep threads mode, etc.
--- arch/powerpc/include/asm/cpuidle.h | 19 +- arch/powerpc/include/asm/paca.h | 41 +- arch/powerpc/include/asm/processor.h | 9 +- arch/powerpc/include/asm/reg.h | 8 +- arch/powerpc/kernel/asm-offsets.c | 17 - arch/powerpc/kernel/exceptions-64s.S | 25 +- arch/powerpc/kernel/idle_book3s.S | 1097 +++------------------- arch/powerpc/kernel/setup-common.c | 4 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 6 +- arch/powerpc/platforms/powernv/idle.c | 887 +++++++++++++---- arch/powerpc/platforms/powernv/subcore.c | 2 +- arch/powerpc/xmon/xmon.c | 25 +- 12 files changed, 941 insertions(+), 1199 deletions(-)
arch/powerpc/include/asm/cpuidle.h +3 -16
@@ -27,10 +27,11 @@* the THREAD_WINKLE_BITS are set, which indicate which threads have not * yet woken from the winkle state. */ -#define PNV_CORE_IDLE_LOCK_BIT 0x10000000 +#define NR_PNV_CORE_IDLE_LOCK_BIT 28 +#define PNV_CORE_IDLE_LOCK_BIT (1ULL << NR_PNV_CORE_IDLE_LOCK_BIT) +#define PNV_CORE_IDLE_WINKLE_COUNT_SHIFT 16#define PNV_CORE_IDLE_WINKLE_COUNT 0x00010000 -#define PNV_CORE_IDLE_WINKLE_COUNT_ALL_BIT 0x00080000#define PNV_CORE_IDLE_WINKLE_COUNT_BITS 0x000F0000#define PNV_CORE_IDLE_THREAD_WINKLE_BITS_SHIFT 8#define PNV_CORE_IDLE_THREAD_WINKLE_BITS 0x0000FF00
@@ -68,16 +69,6 @@#define ERR_DEEP_STATE_ESL_MISMATCH -2#ifndef __ASSEMBLY__ -/* Additional SPRs that need to be saved/restored during stop */ -struct stop_sprs { -u64 pid; -u64 ldbar; -u64 fscr; -u64 hfscr; -u64 mmcr1; -u64 mmcr2; -u64 mmcra; -};#define PNV_IDLE_NAME_LEN 16 struct pnv_idle_states_t {
@@ -92,10 +83,6 @@ struct pnv_idle_states_t {extern struct pnv_idle_states_t *pnv_idle_states;extern int nr_pnv_idle_states; -extern u32 pnv_fastsleep_workaround_at_entry[]; -extern u32 pnv_fastsleep_workaround_at_exit[]; - -extern u64 pnv_first_deep_stop_state;unsigned long pnv_cpu_offline (unsigned int cpu);int validate_psscr_val_mask (u64 *psscr_val,u64 *psscr_mask,u32 flags);
arch/powerpc/include/asm/paca.h +23 -18
54 lines not on this page · raw message
arch/powerpc/include/asm/processor.h +6 -3
@@ -414,14 +414,17 @@ static inline unsigned long get_clean_sp(unsigned long sp, int is_32) }#endif +/* asm stubs */ +extern unsigned long isa300_idle_stop_noloss (unsigned long psscr_val); +extern unsigned long isa300_idle_stop_mayloss (unsigned long psscr_val); +extern unsigned long isa206_idle_insn_mayloss (unsigned long type); +extern unsigned long cpuidle_disable;enum idle_boot_override {IDLE_NO_OVERRIDE =0 ,IDLE_POWERSAVE_OFF };extern int powersave_nap;/* set if nap mode can be used in idle loop */ -extern unsigned long power7_idle_insn (unsigned long type);/* PNV_THREAD_NAP/etc*/ +extern void power7_idle_type (unsigned long type); -extern unsigned long power9_idle_stop (unsigned long psscr_val); -extern unsigned long power9_offline_stop (unsigned long psscr_val);extern void power9_idle_type (unsigned long stop_psscr_val,unsigned long stop_psscr_mask);
arch/powerpc/include/asm/reg.h +4 -4
@@ -168,6 +168,7 @@#define PSSCR_ESL 0x00200000/* Enable State Loss */ #define PSSCR_SD 0x00400000/* Status Disable */ #define PSSCR_PLS 0xf000000000000000/* Power-saving Level Status */ +#define PSSCR_PLS_SHIFT 60#define PSSCR_GUEST_VIS 0xf0000000000003ffUL/* Guest-visible PSSCR fields */ #define PSSCR_FAKE_SUSPEND 0x00000400/* Fake-suspend bit (P9 DD2.2) */ #define PSSCR_FAKE_SUSPEND_LG 10/* Fake-suspend bit position */
@@ -758,10 +759,9 @@#define SRR1_WAKERESET 0x00100000/* System reset */ #define SRR1_WAKEHDBELL 0x000c0000/* Hypervisor doorbell on P8 */ #define SRR1_WAKESTATE 0x00030000/* Powersave exit mask [46:47] */ -#define SRR1_WS_DEEPEST 0x00030000/* Some resources not maintained, -* may not be recoverable */ -#define SRR1_WS_DEEPER 0x00020000/* Some resources not maintained */ -#define SRR1_WS_DEEP 0x00010000/* All resources maintained */ +#define SRR1_WS_HVLOSS 0x00030000/* HV resources not maintained */ +#define SRR1_WS_GPRLOSS 0x00020000/* GPRs not maintained */ +#define SRR1_WS_NOLOSS 0x00010000/* All resources maintained */ #define SRR1_PROGTM 0x00200000/* TM Bad Thing */ #define SRR1_PROGFPE 0x00100000/* Floating Point Enabled */ #define SRR1_PROGILL 0x00080000/* Illegal instruction */
arch/powerpc/kernel/asm-offsets.c +0 -17
@@ -773,23 +773,6 @@ int main(void)OFFSET (VCPU_TIMING_LAST_ENTER_TBL , kvm_vcpu, arch.timing_last_enter.tv32.tbl);#endif -#ifdef CONFIG_PPC_POWERNV -OFFSET (PACA_CORE_IDLE_STATE_PTR , paca_struct, core_idle_state_ptr); -OFFSET (PACA_THREAD_IDLE_STATE , paca_struct, thread_idle_state); -OFFSET (PACA_THREAD_MASK , paca_struct, thread_mask); -OFFSET (PACA_SUBCORE_SIBLING_MASK , paca_struct, subcore_sibling_mask); -OFFSET (PACA_REQ_PSSCR , paca_struct, requested_psscr); -OFFSET (PACA_DONT_STOP , paca_struct, dont_stop); -#define STOP_SPR (x, f) OFFSET(x, paca_struct, stop_sprs.f) -STOP_SPR (STOP_PID , pid); -STOP_SPR (STOP_LDBAR , ldbar); -STOP_SPR (STOP_FSCR , fscr); -STOP_SPR (STOP_HFSCR , hfscr); -STOP_SPR (STOP_MMCR1 , mmcr1); -STOP_SPR (STOP_MMCR2 , mmcr2); -STOP_SPR (STOP_MMCRA , mmcra); -#endif -DEFINE (PPC_DBELL_SERVER ,PPC_DBELL_SERVER );DEFINE (PPC_DBELL_MSGTYPE ,PPC_DBELL_MSGTYPE );
arch/powerpc/kernel/exceptions-64s.S +16 -9
@@ -121,7 +121,7 @@ EXC_VIRT_NONE(0x4000, 0x100) mfspr r10,SPRN_SRR1 ; \ rlwinm. r10,r10,47-31,30,31 ; \ beq- 1f ; \ - cmpwi cr3,r10,2 ; \ + cmpwi cr1,r10,2 ; \ BRANCH_TO_C000(r10, system_reset_idle_common) ; \ 1: \ KVMTEST_PR(n) ; \
@@ -145,8 +145,13 @@ TRAMP_KVM(PACA_EXNMI, 0x100) #ifdef CONFIG_PPC_P7_NAP EXC_COMMON_BEGIN(system_reset_idle_common) - mfspr r12,SPRN_SRR1 - b pnv_powersave_wakeup + mfspr r3,SPRN_SRR1 +#ifndef CONFIG_KVM_BOOK3S_HV_POSSIBLE + /* this bltlr could be moved before the branch_to, and the + * branch_to could maybe go straight to idle_return */ + bltlr cr1 /* no state loss, return to idle caller */ +#endif + b idle_return_gpr_loss #endif /*
@@ -429,17 +434,19 @@ EXC_COMMON_BEGIN(machine_check_idle_common) * Then decrement MCE nesting after finishing with the stack. */ ld r3,_MSR(r1) + ld r4,_LINK(r1) lhz r11,PACA_IN_MCE(r13) subi r11,r11,1 sth r11,PACA_IN_MCE(r13) - /* Turn off the RI bit because SRR1 is used by idle wakeup code. */ - /* Recoverability could be improved by reducing the use of SRR1. */ - li r11,0 - mtmsrd r11,1 - - b pnv_powersave_wakeup_mce + mtlr r4 + rlwinm r10,r3,47-31,30,31 + cmpwi cr1,r10,2 +#ifndef CONFIG_KVM_BOOK3S_HV_POSSIBLE + bltlr cr1 /* no state loss, return to idle caller */ +#endif + b idle_return_gpr_loss #endif /* * Handle machine check early in real mode. We come here with
arch/powerpc/kernel/idle_book3s.S +156 -941
1,144 lines not on this page · raw message
arch/powerpc/kernel/setup-common.c +2 -2
@@ -401,8 +401,8 @@ void __init check_for_initrd(void)#ifdef CONFIG_SMP -int threads_per_core, threads_per_subcore, threads_shift; -cpumask_t threads_core_mask; +int threads_per_core, threads_per_subcore, threads_shift__read_mostly ; +cpumask_t threads_core_mask__read_mostly ;EXPORT_SYMBOL_GPL (threads_per_core);EXPORT_SYMBOL_GPL (threads_per_subcore);EXPORT_SYMBOL_GPL (threads_shift);
arch/powerpc/kvm/book3s_hv_rmhandlers.S +4 -2
@@ -448,8 +448,10 @@ kvm_no_guest: rlwimi r4, r3, 0, LPCR_PECE0 | LPCR_PECE1 mtspr SPRN_LPCR, r4 li r3, 0 - mfspr r12,SPRN_SRR1 - b pnv_wakeup_loss + /* set up cr3 and r3 for return */ + cmpdi cr3, r3, 0 + mfspr r3,SPRN_SRR1 + b idle_return_gpr_loss 53: HMT_LOW ld r5, HSTATE_KVM_VCORE(r13)
arch/powerpc/platforms/powernv/idle.c +714 -171
1,061 lines not on this page · raw message
arch/powerpc/platforms/powernv/subcore.c +1 -1
@@ -183,7 +183,7 @@ static void unsplit_core(void) cpu =smp_processor_id ();if (cpu_thread_in_core (cpu) !=0 ) {while (mfspr (SPRN_HID0 ) & mask) -power7_idle_insn (PNV_THREAD_NAP ); +power7_idle_type (PNV_THREAD_NAP );per_cpu (split_state, cpu).step =SYNC_STEP_UNSPLIT ;return ;
arch/powerpc/xmon/xmon.c +12 -13
@@ -2431,7 +2431,9 @@ static void dump_one_paca(int cpu)DUMP (p, irq_happened,"%#-*x" );DUMP (p, io_sync,"%#-*x" );DUMP (p, irq_work_pending,"%#-*x" ); +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE DUMP (p, nap_state_lost,"%#-*x" ); +#endif DUMP (p, sprg_vdso,"%#-*llx" );#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
@@ -2439,19 +2441,16 @@ static void dump_one_paca(int cpu)#endif #ifdef CONFIG_PPC_POWERNV -DUMP (p, core_idle_state_ptr,"%-*px" ); -DUMP (p, thread_idle_state,"%#-*x" ); -DUMP (p, thread_mask,"%#-*x" ); -DUMP (p, subcore_sibling_mask,"%#-*x" ); -DUMP (p, requested_psscr,"%#-*llx" ); -DUMP (p, stop_sprs.pid,"%#-*llx" ); -DUMP (p, stop_sprs.ldbar,"%#-*llx" ); -DUMP (p, stop_sprs.fscr,"%#-*llx" ); -DUMP (p, stop_sprs.hfscr,"%#-*llx" ); -DUMP (p, stop_sprs.mmcr1,"%#-*llx" ); -DUMP (p, stop_sprs.mmcr2,"%#-*llx" ); -DUMP (p, stop_sprs.mmcra,"%#-*llx" ); -DUMP (p, dont_stop.counter,"%#-*x" ); +DUMP (p, idle_state,"%#-*lx" ); +if (!early_cpu_has_feature (CPU_FTR_ARCH_300 )) { +DUMP (p, thread_idle_state,"%#-*x" ); +DUMP (p, subcore_sibling_mask,"%#-*x" ); + }else { +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +DUMP (p, requested_psscr,"%#-*llx" ); +DUMP (p, dont_stop.counter,"%#-*x" ); +#endif + }#endif DUMP (p, accounting.utime,"%#-*lx" );
Signature · 1 line
2.20.1
Nicholas Piggin
reviewerPATCH v10 2/2 powerpc/64s: KVM update for reimplement book3s idle code in C
In reply to Nicholas PigginThis is the KVM update to the new idle code. A few improvements:
- Idle sleepers now always return to caller rather than branch out to KVM first.
- This allows optimisations like very fast return to caller when no state has been lost.
- KVM no longer requires nap_state_lost because it controls NVGPR save/restore itself on the way in and out.
- The heavy idle wakeup KVM request check can be moved out of the normal host idle code and into the not-performance-critical offline code.
- KVM nap code now returns from where it is called, which makes the flow a bit easier to follow.
--- arch/powerpc/include/asm/paca.h | 1 - arch/powerpc/kernel/asm-offsets.c | 1 - arch/powerpc/kernel/exceptions-64s.S | 14 ++- arch/powerpc/kernel/idle_book3s.S | 22 ----- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 118 ++++++++++++++---------- arch/powerpc/platforms/powernv/idle.c | 15 +++ arch/powerpc/xmon/xmon.c | 3 - 7 files changed, 92 insertions(+), 82 deletions(-)
arch/powerpc/include/asm/paca.h +0 -1
@@ -174,7 +174,6 @@ struct paca_struct {u8 io_sync;/* writel() needs spin_unlock sync */ u8 irq_work_pending;/* IRQ_WORK interrupt while soft-disable */ #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE -u8 nap_state_lost;/* NV GPR values lost in power7_idle */ u8 pmcregs_in_use;/* pseries puts this in lppaca */ #endif u64 sprg_vdso;/* Saved user-visible sprg */
arch/powerpc/kernel/asm-offsets.c +0 -1
@@ -271,7 +271,6 @@ int main(void)OFFSET (ACCOUNT_USER_TIME , paca_struct, accounting.utime);OFFSET (ACCOUNT_SYSTEM_TIME , paca_struct, accounting.stime);OFFSET (PACA_TRAP_SAVE , paca_struct, trap_save); -OFFSET (PACA_NAPSTATELOST , paca_struct, nap_state_lost);OFFSET (PACA_SPRG_VDSO , paca_struct, sprg_vdso);#else /* CONFIG_PPC64 */ #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
arch/powerpc/kernel/exceptions-64s.S +6 -8
@@ -122,6 +122,8 @@ EXC_VIRT_NONE(0x4000, 0x100) rlwinm. r10,r10,47-31,30,31 ; \ beq- 1f ; \ cmpwi cr1,r10,2 ; \ + mfspr r3,SPRN_SRR1 ; \ + bltlr cr1 ; /* no state loss, return to idle caller */ \ BRANCH_TO_C000(r10, system_reset_idle_common) ; \ 1: \ KVMTEST_PR(n) ; \
@@ -145,12 +147,10 @@ TRAMP_KVM(PACA_EXNMI, 0x100) #ifdef CONFIG_PPC_P7_NAP EXC_COMMON_BEGIN(system_reset_idle_common) - mfspr r3,SPRN_SRR1 -#ifndef CONFIG_KVM_BOOK3S_HV_POSSIBLE - /* this bltlr could be moved before the branch_to, and the - * branch_to could maybe go straight to idle_return */ - bltlr cr1 /* no state loss, return to idle caller */ -#endif + /* + * This must be a direct branch (without linker branch stub) because + * we can not use TOC at this point as r2 may not be restored yet. + */ b idle_return_gpr_loss #endif
@@ -443,9 +443,7 @@ EXC_COMMON_BEGIN(machine_check_idle_common) mtlr r4 rlwinm r10,r3,47-31,30,31 cmpwi cr1,r10,2 -#ifndef CONFIG_KVM_BOOK3S_HV_POSSIBLE bltlr cr1 /* no state loss, return to idle caller */ -#endif b idle_return_gpr_loss #endif /*
arch/powerpc/kernel/idle_book3s.S +0 -22
@@ -19,9 +19,6 @@ #include <asm/asm-offsets.h> #include <asm/ppc-opcode.h> #include <asm/cpuidle.h> -#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE -#include <asm/kvm_book3s_asm.h> -#endif /* * Desired PSSCR in r3
@@ -93,25 +90,6 @@ _GLOBAL(isa300_idle_stop_mayloss) * a simple blr instead). */ _GLOBAL(idle_return_gpr_loss) -#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE - lbz r0,HSTATE_HWTHREAD_STATE(r13) - cmpwi r0,KVM_HWTHREAD_IN_KERNEL - beq 0f - li r0,KVM_HWTHREAD_IN_KERNEL - stb r0,HSTATE_HWTHREAD_STATE(r13) - /* Order setting hwthread_state vs. testing hwthread_req */ - sync -0: lbz r0,HSTATE_HWTHREAD_REQ(r13) - cmpwi r0,0 - beq 1f - b kvm_start_guest -1: - lbz r0,PACA_NAPSTATELOST(r13) - cmpwi r0,0 - bne 2f - bltlr cr1 -2: -#endif ld r1,PACAR1(r13) ld r4,-8*19(r1) ld r5,-8*20(r1)
arch/powerpc/kvm/book3s_hv_rmhandlers.S +71 -47
198 lines not on this page · raw message
arch/powerpc/platforms/powernv/idle.c +15 -0
@@ -505,6 +505,8 @@ static unsigned long power7_idle_insn(unsigned long type)return srr1; } +extern unsigned long idle_kvm_start_guest (unsigned long srr1); +#ifdef CONFIG_HOTPLUG_CPU static unsigned long power7_offline (void ) {
@@ -536,6 +538,14 @@ static unsigned long power7_offline(void) srr1 =power7_idle_insn (power7_offline_type);__ppc64_runlatch_on (); +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE + local_paca->kvm_hstate.hwthread_state =KVM_HWTHREAD_IN_KERNEL ; +/* Order setting hwthread_state vs. testing hwthread_req */ +smp_mb (); +if (local_paca->kvm_hstate.hwthread_req) + srr1 =idle_kvm_start_guest (srr1); +#endif +mtmsr (MSR_KERNEL );return srr1;
@@ -823,6 +833,11 @@ static unsigned long power9_offline_stop(unsigned long psscr) srr1 =power9_idle_stop (psscr, false);__ppc64_runlatch_on (); + local_paca->kvm_hstate.hwthread_state =KVM_HWTHREAD_IN_KERNEL ; +/* Order setting hwthread_state vs. testing hwthread_req */ +smp_mb (); +if (local_paca->kvm_hstate.hwthread_req) + srr1 =idle_kvm_start_guest (srr1);mtmsr (MSR_KERNEL );#endif
arch/powerpc/xmon/xmon.c +0 -3
@@ -2431,9 +2431,6 @@ static void dump_one_paca(int cpu)DUMP (p, irq_happened,"%#-*x" );DUMP (p, io_sync,"%#-*x" );DUMP (p, irq_work_pending,"%#-*x" ); -#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE -DUMP (p, nap_state_lost,"%#-*x" ); -#endif DUMP (p, sprg_vdso,"%#-*llx" );#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
Signature · 1 line
2.20.1
Re: [PATCH v10 2/2] powerpc/64s: KVM update for reimplement book3s idle code in C
Quoted 13 lines · Nicholas Piggin
This is the KVM update to the new idle code. A few improvements:
- Idle sleepers now always return to caller rather than branch out to KVM first.
- This allows optimisations like very fast return to caller when no state has been lost.
- KVM no longer requiresnap_state_lostbecause it controls NVGPR save/restore itself on the way in and out.
- The heavy idle wakeup KVM request check can be moved out of the normal host idle code and into the not-performance-critical offline code.
- KVM nap code now returns from where it is called, which makes the flow a bit easier to follow.
One question below...
Quoted 4 lines
arch/powerpc/kvm/book3s_hv_rmhandlers.S +0
-0
...
arch/powerpc/kvm/book3s_hv_rmhandlers.S END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) · line 2666
Quoted 6 lines
arch/powerpc/kvm/book3s_hv_rmhandlers.S +2
-0@@ -2656,6 +2662,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) lis r3, LPCR_PECEDP@h /* Do wake on privileged doorbell */ + /* Go back to host stack */ + ld r1, HSTATE_HOST_R1(r13)
At this point we are in kvmppc_h_cede, which we branched to from hcall_try_real_mode, which came from the guest exit path, where we have already loaded r1 from HSTATE_HOST_R1(r13). So if there is a path to get here with r1 not already set to HSTATE_HOST_R1(r13), then I missed it - please point it out to me. Otherwise this statement seems superfluous.
Paul.
Nicholas Piggin
reviewerRe: [PATCH v10 2/2] powerpc/64s: KVM update for reimplement book3s idle code in C
Paul Mackerras's on May 13, 2019 4:42 pm:
Quoted 26 lines · Nicholas Piggin
Quoted 13 lines
This is the KVM update to the new idle code. A few improvements:
- Idle sleepers now always return to caller rather than branch out to KVM first.
- This allows optimisations like very fast return to caller when no state has been lost.
- KVM no longer requiresnap_state_lostbecause it controls NVGPR save/restore itself on the way in and out.
- The heavy idle wakeup KVM request check can be moved out of the normal host idle code and into the not-performance-critical offline code.
- KVM nap code now returns from where it is called, which makes the flow a bit easier to follow.One question below...
Quoted 4 lines
arch/powerpc/kvm/book3s_hv_rmhandlers.S +0
-0...
Quoted 4 lines
arch/powerpc/kvm/book3s_hv_rmhandlers.S +0
-0@@ -2656,6 +2662,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) lis r3, LPCR_PECEDP@h /* Do wake on privileged doorbell */
Quoted 9 lines
arch/powerpc/kvm/book3s_hv_rmhandlers.S END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) · line 2666
Quoted 2 lines
arch/powerpc/kvm/book3s_hv_rmhandlers.S +2
-0+ /* Go back to host stack */ + ld r1, HSTATE_HOST_R1(r13)At this point we are in
kvmppc_h_cede, which we branched to fromhcall_try_real_mode, which came from the guest exit path, where we have already loaded r1 fromHSTATE_HOST_R1(r13). So if there is a path to get here with r1 not already set toHSTATE_HOST_R1(r13), then I missed it - please point it out to me. Otherwise this statement seems superfluous.
I'm not sure why I put that there. I think you're right it could be removed.
Thanks,
Nick