Commit 43057957 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: SVM: Drop pointless masking of default APIC base when setting V_APIC_BAR 



Drop VMCB_AVIC_APIC_BAR_MASK, it's just a regurgitation of the maximum
theoretical 4KiB-aligned physical address, i.e. is not novel in any way,
and its only usage is to mask the default APIC base, which is 4KiB aligned
and (obviously) a legal physical address.

No functional change intended.

Tested-by: default avatarSairaj Kodilkar <sarunkod@amd.com>
Reviewed-by: default avatarNaveen N Rao (AMD) <naveen@kernel.org>
Link: https://lore.kernel.org/r/20250611224604.313496-10-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent a0ca34bb

arch/x86/include/asm/svm.h

+0 −2
Original line number Diff line number Diff line
@@ -260,8 +260,6 @@ struct __attribute__ ((__packed__)) vmcb_control_area { 


#define AVIC_DOORBELL_PHYSICAL_ID_MASK			GENMASK_ULL(11, 0)



#define VMCB_AVIC_APIC_BAR_MASK				0xFFFFFFFFFF000ULL



#define AVIC_UNACCEL_ACCESS_WRITE_MASK		1

#define AVIC_UNACCEL_ACCESS_OFFSET_MASK		0xFF0

#define AVIC_UNACCEL_ACCESS_VECTOR_MASK		0xFFFFFFFF

arch/x86/kvm/svm/avic.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ void avic_init_vmcb(struct vcpu_svm *svm, struct vmcb *vmcb) 
	vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK;

	vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK;

	vmcb->control.avic_physical_id = ppa & AVIC_HPA_MASK;

	vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE & VMCB_AVIC_APIC_BAR_MASK;

	vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE;



	if (kvm_apicv_activated(svm->vcpu.kvm))

		avic_activate_vmcb(svm);