From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 9 Feb 2011 17:29:39 +0000 (+0100)
Subject: KVM: SVM: Advance instruction pointer in dr_intercept
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2c46d2aec054e61a33feac8c3992218eabdcc22a;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

KVM: SVM: Advance instruction pointer in dr_intercept

In the dr_intercept function a new cpu-feature called
decode-assists is implemented and used when available. This
code-path does not advance the guest-rip causing the guest
to dead-loop over mov-dr instructions. This is fixed by this
patch.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 54ce246a383..63fec1531e8 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2777,6 +2777,8 @@ static int dr_interception(struct vcpu_svm *svm)
 			kvm_register_write(&svm->vcpu, reg, val);
 	}
 
+	skip_emulated_instruction(&svm->vcpu);
+
 	return 1;
 }