Commit 73143035 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: SVM: AVIC: drop unsupported AVIC base relocation code 



APIC base relocation is not supported anyway and won't work
correctly so just drop the code that handles it and keep AVIC
MMIO bar at the default APIC base.

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20210810205251.424103-17-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent df7e4827

arch/x86/kvm/svm/avic.c

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ void avic_init_vmcb(struct vcpu_svm *svm) 
	vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK;

	vmcb->control.avic_physical_id = ppa & AVIC_HPA_MASK;

	vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID_COUNT;

	vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE & VMCB_AVIC_APIC_BAR_MASK;



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

		vmcb->control.int_ctl |= AVIC_ENABLE_MASK;

	else

arch/x86/kvm/svm/svm.c

+0 −7
Original line number Diff line number Diff line
@@ -1314,9 +1314,6 @@ static void svm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) 
	svm->virt_spec_ctrl = 0;



	init_vmcb(vcpu);



	if (kvm_vcpu_apicv_active(vcpu) && !init_event)

		avic_update_vapic_bar(svm, APIC_DEFAULT_PHYS_BASE);

}



void svm_switch_vmcb(struct vcpu_svm *svm, struct kvm_vmcb_info *target_vmcb)
@@ -2967,10 +2964,6 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) 
		svm->msr_decfg = data;

		break;

	}

	case MSR_IA32_APICBASE:

		if (kvm_vcpu_apicv_active(vcpu))

			avic_update_vapic_bar(to_svm(vcpu), data);

		fallthrough;

	default:

		return kvm_set_msr_common(vcpu, msr);

	}

arch/x86/kvm/svm/svm.h

+0 −6
Original line number Diff line number Diff line
@@ -503,12 +503,6 @@ extern struct kvm_x86_nested_ops svm_nested_ops; 


#define VMCB_AVIC_APIC_BAR_MASK		0xFFFFFFFFFF000ULL



static inline void avic_update_vapic_bar(struct vcpu_svm *svm, u64 data)

{

	svm->vmcb->control.avic_vapic_bar = data & VMCB_AVIC_APIC_BAR_MASK;

	vmcb_mark_dirty(svm->vmcb, VMCB_AVIC);

}



static inline bool avic_vcpu_is_running(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);