Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81b1b9ca authored by Haozhong Zhang's avatar Haozhong Zhang Committed by Paolo Bonzini
Browse files

KVM: VMX: Fix host initiated access to guest MSR_TSC_AUX 



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: default avatarHaozhong Zhang <haozhong.zhang@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e307beca

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -2803,7 +2803,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 (!guest_cpuid_has_rdtscp(vcpu))

		if (!guest_cpuid_has_rdtscp(vcpu) && !msr_info->host_initiated)

			return 1;

		/* Otherwise falls through */

	default:
@@ -2909,7 +2909,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 (!guest_cpuid_has_rdtscp(vcpu))

		if (!guest_cpuid_has_rdtscp(vcpu) && !msr_info->host_initiated)

			return 1;

		/* Check reserved bit, higher 32 bits should be zero */

		if ((data >> 32) != 0)