[4/5,v2] KVM: PPC: BOOKE: Clear guest dbsr in userspace exit KVM_EXIT_DEBUG

Commit Message

Bharat Bhushan Aug. 4, 2014, 8:02 a.m. UTC

Dbsr is not visible to userspace and we do not think any need to
expose this to userspace because:
  Userspace cannot inject debug interrupt to guest (as this
  does not know guest ability to handle debug interrupt), so
  userspace will always clear DBSR.
  Now if userspace has to always clear DBSR in KVM_EXIT_DEBUG
  handling then clearing dbsr in kernel looks simple as this
  avoid doing SET_SREGS/set_one_reg() to clear DBSR

Signed-off-by: Bharat Bhushan <[e-mail]>
---
v1->v2
 - New patch (separated from guest debug emulation
 - Added description

 arch/powerpc/kvm/booke.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Patch

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 322da7d..5c2e26a 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -735,6 +735,17 @@  static int kvmppc_handle_debug(struct kvm_run *run, struct kvm_vcpu *vcpu)
 	struct debug_reg *dbg_reg = &(vcpu->arch.shadow_dbg_reg);
 	u32 dbsr = vcpu->arch.dbsr;
 
+	/* Clear guest dbsr (vcpu->arch.dbsr).
+	 * dbsr is not visible to userspace and we do not think any
+	 * need to expose this to userspace because:
+	 * Userspace cannot inject debug interrupt to guest (as this does
+	 * not know guest ability to handle debug interrupt), so userspace
+	 * will always clear DBSR.
+	 * Now if userspace has to always clear DBSR in KVM_EXIT_DEBUG
+	 * handling then clearing here looks simple as this
+	 * avoid doing SET_SREGS/set_one_reg() to clear DBSR
+	 */
+	vcpu->arch.dbsr = 0;
 	run->debug.arch.status = 0;
 	run->debug.arch.address = vcpu->arch.pc;