Skip to contentSkip to conversation

KVM: SVM: allocate AVIC data structures based on kvm_amd moduleparameter

PATCH linmiaohe 1 participant 1 message Feb 25, 2020 KVM

lore
Share & tools
lore

linmiaohe

author Reviewed-by
#0 lore raw
Quoted 22 lines · Paolo Bonzini

Even if APICv is disabled at startup, the backing page and ir_list need to be initialized in case they are needed later. The only case in which this can be skipped is for userspace irqchip, and that must be done because avic_init_backing_page dereferences vcpu->arch.apic (which is NULL for userspace irqchip).

---
arch/x86/kvm/svm.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/svm.c +2 -2
@@ -2194,8 +2194,9 @@ static void svm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)  static int avic_init_vcpu(struct vcpu_svm *svm)  {
 	int ret;
+	struct kvm_vcpu *vcpu = &svm->vcpu;
 
-	if (!kvm_vcpu_apicv_active(&svm->vcpu))
+	if (!avic || !irqchip_in_kernel(vcpu->kvm))
 		return 0;
 
 	ret = avic_init_backing_page(&svm->vcpu);
--
Quoted 2 lines

1.8.3.1