lkml.org 
[lkml]   [2014]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 096/208] KVM: x86: Fix APIC map calculation after re-enabling
    Date
    3.11.10.3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jan Kiszka <jan.kiszka@siemens.com>

    commit e66d2ae7c67bd9ac982a3d1890564de7f7eabf4b upstream.

    Update arch.apic_base before triggering recalculate_apic_map. Otherwise
    the recalculation will work against the previous state of the APIC and
    will fail to build the correct map when an APIC is hardware-enabled
    again.

    This fixes a regression of 1e08ec4a13.

    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/x86/kvm/lapic.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
    index 81d7b23..dedd7c2 100644
    --- a/arch/x86/kvm/lapic.c
    +++ b/arch/x86/kvm/lapic.c
    @@ -1364,6 +1364,10 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
    return;
    }

    + if (!kvm_vcpu_is_bsp(apic->vcpu))
    + value &= ~MSR_IA32_APICBASE_BSP;
    + vcpu->arch.apic_base = value;
    +
    /* update jump label if enable bit changes */
    if ((vcpu->arch.apic_base ^ value) & MSR_IA32_APICBASE_ENABLE) {
    if (value & MSR_IA32_APICBASE_ENABLE)
    @@ -1373,10 +1377,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
    recalculate_apic_map(vcpu->kvm);
    }

    - if (!kvm_vcpu_is_bsp(apic->vcpu))
    - value &= ~MSR_IA32_APICBASE_BSP;
    -
    - vcpu->arch.apic_base = value;
    if ((old_value ^ value) & X2APIC_ENABLE) {
    if (value & X2APIC_ENABLE) {
    u32 id = kvm_apic_id(apic);
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-01-13 17:41    [W:4.122 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site