KVM: SVM: Make an event request if INIT or SIPI is pending when GIF is set
authorSean Christopherson <seanjc@google.com>
Wed, 21 Sep 2022 00:31:55 +0000 (00:31 +0000)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 26 Sep 2022 16:37:19 +0000 (12:37 -0400)
Set KVM_REQ_EVENT if INIT or SIPI is pending when the guest enables GIF.
INIT in particular is blocked when GIF=0 and needs to be processed when
GIF is toggled to '1'.  This bug has been masked by (a) KVM calling
->check_nested_events() in the core run loop and (b) hypervisors toggling
GIF from 0=>1 only when entering guest mode (L1 entering L2).

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220921003201.1441511-7-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/svm/svm.c

index dd599afc85f57d0ad3e10ac75346dbc16bf8783b..58f0077d935799eaa5922bf9da4dde5e4a02d2b2 100644 (file)
@@ -2339,7 +2339,8 @@ void svm_set_gif(struct vcpu_svm *svm, bool value)
                enable_gif(svm);
                if (svm->vcpu.arch.smi_pending ||
                    svm->vcpu.arch.nmi_pending ||
-                   kvm_cpu_has_injectable_intr(&svm->vcpu))
+                   kvm_cpu_has_injectable_intr(&svm->vcpu) ||
+                   kvm_apic_has_pending_init_or_sipi(&svm->vcpu))
                        kvm_make_request(KVM_REQ_EVENT, &svm->vcpu);
        } else {
                disable_gif(svm);