diff options
| author |   Jim Mattson <jmattson@google.com> | 2016-11-09 09:50:11 -0800 |
|---|---|---|
| committer |   Radim Krčmář <rkrcmar@redhat.com> | 2016-11-22 14:51:55 +0100 |
| commit | c7dd15b33707e99c2b66da44a2a280638b4cd14f (patch) | |
| tree | d6cc45d3e106def8da15697955e3a5cd98ccfc83 /arch/x86/kvm/lapic.c | |
| parent | kvm: x86: Add AVX512_4VNNIW and AVX512_4FMAPS support (diff) | |
| download | linux-dev-c7dd15b33707e99c2b66da44a2a280638b4cd14f.tar.xz linux-dev-c7dd15b33707e99c2b66da44a2a280638b4cd14f.zip | |
kvm: x86: CPUID.01H:EDX.APIC[bit 9] should mirror IA32_APIC_BASE[11]
From the Intel SDM, volume 3, section 10.4.3, "Enabling or Disabling the
Local APIC,"
When IA32_APIC_BASE[11] is 0, the processor is functionally equivalent
to an IA-32 processor without an on-chip APIC. The CPUID feature flag
for the APIC (see Section 10.4.2, "Presence of the Local APIC") is
also set to 0.
Signed-off-by: Jim Mattson <jmattson@google.com>
[Changed subject tag from nVMX to x86.]
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 890f218ddd7a..09edd32b8e42 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1806,14 +1806,17 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) u64 old_value = vcpu->arch.apic_base; struct kvm_lapic *apic = vcpu->arch.apic; - if (!apic) { + if (!apic) value |= MSR_IA32_APICBASE_BSP; - vcpu->arch.apic_base = value; - return; - } vcpu->arch.apic_base = value; + if ((old_value ^ value) & MSR_IA32_APICBASE_ENABLE) + kvm_update_cpuid(vcpu); + + if (!apic) + return; + /* update jump label if enable bit changes */ if ((old_value ^ value) & MSR_IA32_APICBASE_ENABLE) { if (value & MSR_IA32_APICBASE_ENABLE) { |