KVM: X86: Set RTM for DB_VECTOR too for KVM_EXIT_DEBUG

xzpeter · bonzini · commit 13196638d5de · 2020-05-07T06:13:41.000-04:00
RTM should always been set even with KVM_EXIT_DEBUG on #DB.

Signed-off-by: Peter Xu &lt;peterx@redhat.com&gt;
Message-Id: &lt;20200505205000.188252-2-peterx@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
@@ -4683,7 +4683,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu)
 			kvm_queue_exception_p(vcpu, DB_VECTOR, dr6);
 			return 1;
 		}
-		kvm_run->debug.arch.dr6 = dr6 | DR6_FIXED_1;
+		kvm_run->debug.arch.dr6 = dr6 | DR6_FIXED_1 | DR6_RTM;
 		kvm_run->debug.arch.dr7 = vmcs_readl(GUEST_DR7);
 		/* fall through */
 	case BP_VECTOR:

Original file line number	Diff line number	Diff line change
`@@ -4683,7 +4683,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu)`
`4683`	`4683`	`kvm_queue_exception_p(vcpu, DB_VECTOR, dr6);`
`4684`	`4684`	`return 1;`
`4685`	`4685`	`}`
`4686`		`- kvm_run->debug.arch.dr6 = dr6 \| DR6_FIXED_1;`
	`4686`	`+ kvm_run->debug.arch.dr6 = dr6 \| DR6_FIXED_1 \| DR6_RTM;`
`4687`	`4687`	`kvm_run->debug.arch.dr7 = vmcs_readl(GUEST_DR7);`
`4688`	`4688`	`/* fall through */`
`4689`	`4689`	`case BP_VECTOR:`