KVM: X86: Fix MSR range of APIC registers in X2APIC mode
PATCH 1/1 KVM: X86: Fix MSR range of APIC registers in X2APIC mode
Only MSR address range 0x800 through 0x8ff is architecturally reserved and dedicated for accessing APIC registers in x2APIC mode.
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -2856,7 +2856,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return kvm_mtrr_set_msr (vcpu, msr, data);case MSR_IA32_APICBASE :return kvm_set_apic_base (vcpu, msr_info); - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_write (vcpu, msr, data);case MSR_IA32_TSCDEADLINE :kvm_set_lapic_tscdeadline_msr (vcpu, data);
@@ -3196,7 +3196,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case MSR_IA32_APICBASE : msr_info->data =kvm_get_apic_base (vcpu);break ; - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_read (vcpu, msr_info->index, &msr_info->data);case MSR_IA32_TSCDEADLINE : msr_info->data =kvm_get_lapic_tscdeadline_msr (vcpu);
Signature · 1 line
2.18.2
Quoted 6 lines · Xiaoyao Li
Only MSR address range
0x800through0x8ffis architecturally reserved and dedicated for accessing APIC registers in x2APIC mode.Fixes 0105d1a52640 ("KVM: x2apic interface to lapic")Signed-off-by Xiaoyao Li <[email protected]>---
And perhaps more importantly, there are real MSRs that are overlapped, e.g. MSR_IA32_TME_ACTIVATE. This probably warrants a Cc to stable; as you found out the hard way, this breaks ignore_msrs.
Jim Mattson
Reviewed-byQuoted 9 lines · Sean Christopherson
Quoted 6 lines · Xiaoyao Li
Only MSR address range
0x800through0x8ffis architecturally reserved and dedicated for accessing APIC registers in x2APIC mode.Fixes 0105d1a52640 ("KVM: x2apic interface to lapic")Signed-off-by Xiaoyao Li <[email protected]>---
Quoted 5 lines
And perhaps more importantly, there are real MSRs that are overlapped, e.g.
MSR_IA32_TME_ACTIVATE. This probably warrants a Cc to stable; as you found out the hard way, this breaksignore_msrs.Reviewed-by Sean Christopherson <[email protected]>
Excellent find!
Quoted 24 lines · Xiaoyao Li
Only MSR address range
0x800through0x8ffis architecturally reserved and dedicated for accessing APIC registers in x2APIC mode.Fixes 0105d1a52640 ("KVM: x2apic interface to lapic")Signed-off-by Xiaoyao Li <[email protected]>--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/kvm/x86.c +1
-1@@ -2856,7 +2856,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return kvm_mtrr_set_msr (vcpu, msr, data);case MSR_IA32_APICBASE :return kvm_set_apic_base (vcpu, msr_info); - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_write (vcpu, msr, data);case MSR_IA32_TSCDEADLINE :kvm_set_lapic_tscdeadline_msr (vcpu, data);
arch/x86/kvm/x86.c int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) · line 3202
Quoted 8 lines
arch/x86/kvm/x86.c +1
-1@@ -3196,7 +3196,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case MSR_IA32_APICBASE : msr_info->data =kvm_get_apic_base (vcpu);break ; - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_read (vcpu, msr_info->index, &msr_info->data);case MSR_IA32_TSCDEADLINE : msr_info->data =kvm_get_lapic_tscdeadline_msr (vcpu);
Queued, thanks (with Cc to stable).
Paolo