Commit 628ade2d authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

KVM: VMX: Fix x2APIC MSR intercept handling on !APICV platforms 



Fix an inverted flag for intercepting x2APIC MSRs and intercept writes
by default, even when APICV is enabled.

Fixes: 3eb90017 ("KVM: x86: VMX: Prevent MSR passthrough when MSR access is denied")
Co-developed-by: default avatarPeter Xu <peterx@redhat.com>
[sean: added changelog]
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20201005195532.8674-2-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6a2e0923

arch/x86/kvm/vmx/vmx.c

+3 −2
Original line number Diff line number Diff line
@@ -3787,9 +3787,10 @@ static void vmx_update_msr_bitmap_x2apic(struct kvm_vcpu *vcpu, u8 mode) 
	int msr;



	for (msr = 0x800; msr <= 0x8ff; msr++) {

		bool intercepted = !!(mode & MSR_BITMAP_MODE_X2APIC_APICV);

		bool apicv = !!(mode & MSR_BITMAP_MODE_X2APIC_APICV);



		vmx_set_intercept_for_msr(vcpu, msr, MSR_TYPE_RW, intercepted);

		vmx_set_intercept_for_msr(vcpu, msr, MSR_TYPE_R, !apicv);

		vmx_set_intercept_for_msr(vcpu, msr, MSR_TYPE_W, true);

	}



	if (mode & MSR_BITMAP_MODE_X2APIC) {