Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e66d2ae7 authored by Jan Kiszka's avatar Jan Kiszka Committed by Marcelo Tosatti
Browse files

KVM: x86: Fix APIC map calculation after re-enabling 



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 1e08ec4a.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent f41bfc94

arch/x86/kvm/lapic.c

+4 −4
Original line number Diff line number Diff line
@@ -1350,6 +1350,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)
@@ -1359,10 +1363,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);