diff options
| author | Haozhong Zhang <haozhong.zhang@intel.com> | 2015-12-14 23:13:38 +0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-03-06 17:43:28 -0500 |
| commit | 5f3c6a6c50093815eb56c97ba5cbadef36fbd889 (patch) | |
| tree | 94f80905ace57e6fbb4107732d9a1b66039f46bb | |
| parent | a3fe459977dd25575a4321a07df30edbf55aa233 (diff) | |
KVM: VMX: Fix host initiated access to guest MSR_TSC_AUX
[ Upstream commit 81b1b9ca6d5ca5f3ce91c0095402def657cf5db3 ]
The current handling of accesses to guest MSR_TSC_AUX returns error if
vcpu does not support rdtscp, though those accesses are initiated by
host. This can result in the reboot failure of some versions of
QEMU. This patch fixes this issue by passing those host initiated
accesses for further handling instead.
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | arch/x86/kvm/vmx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 21008619878d..048830f2927d 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2691,7 +2691,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) msr_info->data = vcpu->arch.ia32_xss; break; case MSR_TSC_AUX: - if (!to_vmx(vcpu)->rdtscp_enabled) + if (!to_vmx(vcpu)->rdtscp_enabled && !msr_info->host_initiated) return 1; /* Otherwise falls through */ default: @@ -2797,7 +2797,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) clear_atomic_switch_msr(vmx, MSR_IA32_XSS); break; case MSR_TSC_AUX: - if (!vmx->rdtscp_enabled) + if (!vmx->rdtscp_enabled && !msr_info->host_initiated) return 1; /* Check reserved bit, higher 32 bits should be zero */ if ((data >> 32) != 0) |