Skip to contentSkip to conversation

powerpc: kvm: optimize "sc 1" as fast return

PATCH In review Liu Ping Fan 2 participants 2 messages Nov 18, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 powerpc: kvm: optimize "sc 1" as fast return

In some scene, e.g openstack CI, PR guest can trigger "sc 1" frequently, this patch optimizes the path by directly delivering BOOK3S_INTERRUPT_SYSCALL to HV guest, so powernv can return to HV guest without heavy exit, i.e, no need to swap TLB, HTAB,.. etc

---
 arch/powerpc/kvm/book3s_hv.c            |  6 ------
 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 12 +++++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/kvm/book3s_hv.c +0 -6
index 62a2b5a..73dc852 100644
@@ -628,12 +628,6 @@ static int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 		/* hcall - punt to userspace */
 		int i;
 
-		if (vcpu->arch.shregs.msr & MSR_PR) {
-			/* sc 1 from userspace - reflect to guest syscall */
-			kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_SYSCALL);
-			r = RESUME_GUEST;
-			break;
-		}
 		run->papr_hcall.nr = kvmppc_get_gpr(vcpu, 3);
 		for (i = 0; i < 9; ++i)
 			run->papr_hcall.args[i] = kvmppc_get_gpr(vcpu, 4 + i);
arch/powerpc/kvm/book3s_hv_rmhandlers.S +11 -1
index c71103b..0d1e2c2 100644
@@ -1388,7 +1388,8 @@ kvmppc_hisi:
 hcall_try_real_mode:
 	ld	r3,VCPU_GPR(R3)(r9)
 	andi.	r0,r11,MSR_PR
-	bne	guest_exit_cont
+	/* sc 1 from userspace - reflect to guest syscall */
+	bne	sc_1_fast_return
 	clrrdi	r3,r3,2
 	cmpldi	r3,hcall_real_table_end - hcall_real_table
 	bge	guest_exit_cont
@@ -1409,6 +1410,15 @@ hcall_try_real_mode:
 	ld	r11,VCPU_MSR(r4)
 	b	fast_guest_return
 
+sc_1_fast_return:
+	mtspr	SPRN_SRR0,r10
+	mtspr	SPRN_SRR1,r11
+	li	r10, BOOK3S_INTERRUPT_SYSCALL
+	li	r11, (MSR_ME << 1) | 1  /* synthesize MSR_SF | MSR_ME */
+	rotldi	r11, r11, 63
+	mr	r4,r9
+	b	fast_guest_return
+
 	/* We've attempted a real mode hcall, but it's punted it back
 	 * to userspace.  We need to restore some clobbered volatiles
 	 * before resuming the pass-it-to-qemu path */
Signature · 1 line
1.8.1.4
#1 lore raw
Quoted 16 lines · Liu Ping Fan

In some scene, e.g openstack CI, PR guest can trigger "sc 1" frequently, this patch optimizes the path by directly delivering BOOK3S_INTERRUPT_SYSCALL to HV guest, so powernv can return to HV guest without heavy exit, i.e, no need to swap TLB, HTAB,.. etc

---
arch/powerpc/kvm/book3s_hv.c | 6 ------
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 12 +++++++++++-

2 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/kvm/book3s_hv.c +0 -0
index 62a2b5a..73dc852 100644

arch/powerpc/kvm/book3s_hv.c static int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, · line 636

Quoted 9 lines
arch/powerpc/kvm/book3s_hv.c +0 -6
@@ -628,12 +628,6 @@ static int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 		/* hcall - punt to userspace */
 		int i;
 
-		if (vcpu->arch.shregs.msr & MSR_PR) {
-			/* sc 1 from userspace - reflect to guest syscall */
-			kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_SYSCALL);
-			r = RESUME_GUEST;
-			break;
-		}

Please document the fact that we never get here for

1) hypercall with MSR_PR
2) hypercall that was handled by rm code

so that when anyone reads the C file he doesn't have to dig through piles of asm code to understand what's happening.

Quoted 19 lines
arch/powerpc/kvm/book3s_hv.c +0 -0
 		run->papr_hcall.nr = kvmppc_get_gpr(vcpu, 3);
 		for (i = 0; i < 9; ++i)
 			run->papr_hcall.args[i] = kvmppc_get_gpr(vcpu, 4 + i);
arch/powerpc/kvm/book3s_hv_rmhandlers.S +0 -0
index c71103b..0d1e2c2 100644
@@ -1388,7 +1388,8 @@ kvmppc_hisi:

hcall_try_real_mode:

	ld	r3,VCPU_GPR(R3)(r9)
	andi.	r0,r11,MSR_PR
arch/powerpc/kvm/book3s_hv_rmhandlers.S +2 -1
-	bne	guest_exit_cont
+	/* sc 1 from userspace - reflect to guest syscall */
+	bne	sc_1_fast_return
	clrrdi	r3,r3,2
	cmpldi	r3,hcall_real_table_end - hcall_real_table
	bge	guest_exit_cont
arch/powerpc/kvm/book3s_hv_rmhandlers.S +0 -0
@@ -1409,6 +1410,15 @@ hcall_try_real_mode:
 	ld	r11,VCPU_MSR(r4)

arch/powerpc/kvm/book3s_hv_rmhandlers.S hcall_try_real_mode: · line 1420

Quoted 10 lines
arch/powerpc/kvm/book3s_hv_rmhandlers.S +8 -0
 	b	fast_guest_return
 
+sc_1_fast_return:
+	mtspr	SPRN_SRR0,r10
+	mtspr	SPRN_SRR1,r11
+	li	r10, BOOK3S_INTERRUPT_SYSCALL
+	li	r11, (MSR_ME << 1) | 1  /* synthesize MSR_SF | MSR_ME */
+	rotldi	r11, r11, 63
+	mr	r4,r9
+	b	fast_guest_return

While at it, please also document the input registers to fast_guest_return. As you've seen it's very easy to get them right when they're not properly documented in the header of the function.

Apart from these minor bits, the patch looks very sound and hopefully speeds up PR-in-HV by quite a bit.

Alex