iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Fixes: 3eb900173c71 ("KVM: x86: VMX: Prevent MSR passthrough when MSR access is denied")
Co-developed-by: Peter Xu <peterx@redhat.com>
[sean: added changelog]
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20201005195532.8674-2-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Xu 2020-10-05 12:55:31 -07:00 committed by Paolo Bonzini
parent 6a2e0923b2
commit 628ade2d08
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kvm/vmx/vmx.c
View File

@ -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) {