KVM: SVM: Add irqchip_split() checks before enabling AVIC

SVM AVIC hardware accelerates guest write to APIC_EOI register
(for edge-trigger interrupt), which means it does not trap to KVM.

So, only enable SVM AVIC only in split irqchip mode.
(e.g. launching qemu w/ option '-machine kernel_irqchip=split').

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Fixes: 44a95dae1d22 ("KVM: x86: Detect and Initialize AVIC support")
[Removed pr_debug - Radim.]
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 76f559f5a3dd..0e68f0b3cbf7 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1200,7 +1200,6 @@ static void avic_init_vmcb(struct vcpu_svm *svm)
         vmcb->control.avic_physical_id = ppa & AVIC_HPA_MASK;
         vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID_COUNT;
         vmcb->control.int_ctl |= AVIC_ENABLE_MASK;
-        svm->vcpu.arch.apicv_active = true;
 }
 
 static void init_vmcb(struct vcpu_svm *svm)
@@ -1316,7 +1315,7 @@ static void init_vmcb(struct vcpu_svm *svm)
                 set_intercept(svm, INTERCEPT_PAUSE);
         }
 
-        if (avic)
+        if (kvm_vcpu_apicv_active(&svm->vcpu))
                 avic_init_vmcb(svm);
 
         /*
@@ -1604,7 +1603,7 @@ static int avic_init_vcpu(struct vcpu_svm *svm)
 {
         int ret;
 
-        if (!avic)
+        if (!kvm_vcpu_apicv_active(&svm->vcpu))
                 return 0;
 
         ret = avic_init_backing_page(&svm->vcpu);
@@ -4409,7 +4408,7 @@ static void svm_set_virtual_x2apic_mode(struct kvm_vcpu *vcpu, bool set)
 
 static bool svm_get_enable_apicv(struct kvm_vcpu *vcpu)
 {
-        return avic;
+        return avic && irqchip_split(vcpu->kvm);
 }
 
 static void svm_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr)
@@ -4426,7 +4425,7 @@ static void svm_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)
         struct vcpu_svm *svm = to_svm(vcpu);
         struct vmcb *vmcb = svm->vmcb;
 
-        if (!avic)
+        if (!kvm_vcpu_apicv_active(&svm->vcpu))
                 return;
 
         vmcb->control.int_ctl &= ~AVIC_ENABLE_MASK;