|
@@ -6222,6 +6222,7 @@ static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx)
|
|
|
static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
|
|
|
{
|
|
|
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
|
|
+ unsigned long debugctlmsr;
|
|
|
|
|
|
if (is_guest_mode(vcpu) && !vmx->nested.nested_run_pending) {
|
|
|
struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
|
|
@@ -6261,6 +6262,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
|
|
|
vmx_set_interrupt_shadow(vcpu, 0);
|
|
|
|
|
|
atomic_switch_perf_msrs(vmx);
|
|
|
+ debugctlmsr = get_debugctlmsr();
|
|
|
|
|
|
vmx->__launched = vmx->loaded_vmcs->launched;
|
|
|
asm(
|
|
@@ -6362,6 +6364,10 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
|
|
|
#endif
|
|
|
);
|
|
|
|
|
|
+ /* MSR_IA32_DEBUGCTLMSR is zeroed on vmexit. Restore it if needed */
|
|
|
+ if (debugctlmsr)
|
|
|
+ update_debugctlmsr(debugctlmsr);
|
|
|
+
|
|
|
#ifndef CONFIG_X86_64
|
|
|
/*
|
|
|
* The sysexit path does not restore ds/es, so we must set them to
|