Commit 503bc494 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Set BSP bit in reset BSP vCPU's APIC base by default 



Set the BSP bit appropriately during local APIC "reset" instead of
relying on vendor code to clean up at a later point.  This is a step
towards consolidating the local APIC, VMX, and SVM xAPIC initialization
code.

Reviewed-by: default avatarReiji Watanabe <reijiw@google.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210713163324.627647-16-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 01913c57

arch/x86/kvm/lapic.c

+5 −2
Original line number Diff line number Diff line
@@ -2321,6 +2321,7 @@ EXPORT_SYMBOL_GPL(kvm_apic_update_apicv); 
void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event)

{

	struct kvm_lapic *apic = vcpu->arch.apic;

	u64 msr_val;

	int i;



	if (!apic)
@@ -2330,8 +2331,10 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
	hrtimer_cancel(&apic->lapic_timer.timer);



	if (!init_event) {

		kvm_lapic_set_base(vcpu, APIC_DEFAULT_PHYS_BASE |

		                         MSR_IA32_APICBASE_ENABLE);

		msr_val = APIC_DEFAULT_PHYS_BASE | MSR_IA32_APICBASE_ENABLE;

		if (kvm_vcpu_is_reset_bsp(vcpu))

			msr_val |= MSR_IA32_APICBASE_BSP;

		kvm_lapic_set_base(vcpu, msr_val);

		kvm_apic_set_xapic_id(apic, vcpu->vcpu_id);

	}

	kvm_apic_set_version(apic->vcpu);