From patchwork Wed Jan 20 17:20:20 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 74099
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0KHP2Rg007244
	for <patchwork-kvm@patchwork.kernel.org>;
	Wed, 20 Jan 2010 17:25:02 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753638Ab0ATRY7 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 20 Jan 2010 12:24:59 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753514Ab0ATRY6
	(ORCPT <rfc822;kvm-outgoing>); Wed, 20 Jan 2010 12:24:58 -0500
Received: from thoth.sbs.de ([192.35.17.2]:16017 "EHLO thoth.sbs.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753548Ab0ATRY4 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 20 Jan 2010 12:24:56 -0500
Received: from mail2.siemens.de (localhost [127.0.0.1])
	by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id
	o0KHOcxw032464; Wed, 20 Jan 2010 18:24:40 +0100
Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167]
	(may be forged))
	by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id
	o0KHObXE014207; Wed, 20 Jan 2010 18:24:37 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
Subject: [PATCH 2/5] KVM: VMX: Fix emulation of DR4 and DR5
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 20 Jan 2010 18:20:20 +0100
Message-ID: <20100120172020.25118.62913.stgit@mchn012c.ww002.siemens.net>
In-Reply-To: <20100120172020.25118.349.stgit@mchn012c.ww002.siemens.net>
References: <20100120172020.25118.349.stgit@mchn012c.ww002.siemens.net>
User-Agent: StGIT/0.14.3
MIME-Version: 1.0
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org


diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 4903b41..834a8eb 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3043,6 +3043,15 @@ static int handle_cr(struct kvm_vcpu *vcpu)
 	return 0;
 }
 
+static int check_dr_alias(struct kvm_vcpu *vcpu)
+{
+	if (kvm_read_cr4_bits(vcpu, X86_CR4_DE)) {
+		kvm_queue_exception(vcpu, UD_VECTOR);
+		return -1;
+	}
+	return 0;
+}
+
 static int handle_dr(struct kvm_vcpu *vcpu)
 {
 	unsigned long exit_qualification;
@@ -3085,14 +3094,20 @@ static int handle_dr(struct kvm_vcpu *vcpu)
 		case 0 ... 3:
 			val = vcpu->arch.db[dr];
 			break;
+		case 4:
+			if (check_dr_alias(vcpu) < 0)
+				return 1;
+			/* fall through */
 		case 6:
 			val = vcpu->arch.dr6;
 			break;
-		case 7:
+		case 5:
+			if (check_dr_alias(vcpu) < 0)
+				return 1;
+			/* fall through */
+		default: /* 7 */
 			val = vcpu->arch.dr7;
 			break;
-		default:
-			val = 0;
 		}
 		kvm_register_write(vcpu, reg, val);
 	} else {
@@ -3103,12 +3118,10 @@ static int handle_dr(struct kvm_vcpu *vcpu)
 			if (!(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP))
 				vcpu->arch.eff_db[dr] = val;
 			break;
-		case 4 ... 5:
-			if (kvm_read_cr4_bits(vcpu, X86_CR4_DE)) {
-				kvm_queue_exception(vcpu, UD_VECTOR);
+		case 4:
+			if (check_dr_alias(vcpu) < 0)
 				return 1;
-			}
-			break;
+			/* fall through */
 		case 6:
 			if (val & 0xffffffff00000000ULL) {
 				kvm_inject_gp(vcpu, 0);
@@ -3116,7 +3129,11 @@ static int handle_dr(struct kvm_vcpu *vcpu)
 			}
 			vcpu->arch.dr6 = (val & DR6_VOLATILE) | DR6_FIXED_1;
 			break;
-		case 7:
+		case 5:
+			if (check_dr_alias(vcpu) < 0)
+				return 1;
+			/* fall through */
+		default: /* 7 */
 			if (val & 0xffffffff00000000ULL) {
 				kvm_inject_gp(vcpu, 0);
 				return 1;