KVM: x86: Rename kvm_apic_has_events() to make it INIT/SIPI specific

Rename kvm_apic_has_events() to kvm_apic_has_pending_init_or_sipi() so
that it's more obvious that "events" really just means "INIT or SIPI".

Opportunistically clean up a weirdly worded comment that referenced
kvm_apic_has_events() instead of kvm_apic_accept_events().

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220921003201.1441511-5-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index c3ce6b0b1ea3d2cc060ba6e86a5c02458be04fe0..a5ac4a5a517920ed8dff0ba1f14cde110606832d 100644 (file)
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -224,7 +224,7 @@ static inline bool kvm_vcpu_apicv_active(struct kvm_vcpu *vcpu)
        return lapic_in_kernel(vcpu) && vcpu->arch.apic->apicv_active;
 }
 
-static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)
+static inline bool kvm_apic_has_pending_init_or_sipi(struct kvm_vcpu *vcpu)
 {
        return lapic_in_kernel(vcpu) && vcpu->arch.apic->pending_events;
 }

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index bc8f8cd637b92898748538d65d4337c45ee9b305..057246c30bb53b5d5bc832837a3b99a9b998a43e 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -11922,8 +11922,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
                struct fpstate *fpstate = vcpu->arch.guest_fpu.fpstate;
 
                /*
-                * To avoid have the INIT path from kvm_apic_has_events() that be
-                * called with loaded FPU and does not let userspace fix the state.
+                * All paths that lead to INIT are required to load the guest's
+                * FPU state (because most paths are buried in KVM_RUN).
                 */
                if (init_event)
                        kvm_put_guest_fpu(vcpu);
@@ -12767,7 +12767,7 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)
        if (!list_empty_careful(&vcpu->async_pf.done))
                return true;
 
-       if (kvm_apic_has_events(vcpu))
+       if (kvm_apic_has_pending_init_or_sipi(vcpu))
                return true;
 
        if (vcpu->arch.pv.pv_unhalted)