KVM: x86: Add a wrapper to handle common case of IRQ delivery without dest_map

Turn kvm_irq_delivery_to_apic() into a wrapper that passes NULL for the
@dest_map param, as only the ugly I/O APIC RTC hackery needs to know which
vCPUs received the IRQ.

No functional change intended.

Link: https://patch.msgid.link/20251206004311.479939-7-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index de92292eb1f5822585d10cf013d624d40faa8c4b..49bf744ca8e35037f80c585a6d9b51fc8d2fefaf 100644 (file)
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -492,7 +492,7 @@ static int synic_set_irq(struct kvm_vcpu_hv_synic *synic, u32 sint)
        irq.vector = vector;
        irq.level = 1;
 
-       ret = kvm_irq_delivery_to_apic(vcpu->kvm, vcpu->arch.apic, &irq, NULL);
+       ret = kvm_irq_delivery_to_apic(vcpu->kvm, vcpu->arch.apic, &irq);
        trace_kvm_hv_synic_set_irq(vcpu->vcpu_id, sint, irq.vector, ret);
        return ret;
 }

diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
index 955c781ba623a7fe080e40d882cb60a9e47a0c5d..4b49f972836225f5dd55a3c6833b6d9c75e8b3bb 100644 (file)
--- a/arch/x86/kvm/ioapic.c
+++ b/arch/x86/kvm/ioapic.c
@@ -485,11 +485,11 @@ static int ioapic_service(struct kvm_ioapic *ioapic, int irq, bool line_status)
                 * if rtc_irq_check_coalesced returns false).
                 */
                BUG_ON(ioapic->rtc_status.pending_eoi != 0);
-               ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe,
-                                              &ioapic->rtc_status.dest_map);
+               ret = __kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe,
+                                                &ioapic->rtc_status.dest_map);
                ioapic->rtc_status.pending_eoi = (ret < 0 ? 0 : ret);
        } else
-               ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe, NULL);
+               ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe);
 
        if (ret && irqe.trig_mode == IOAPIC_LEVEL_TRIG)
                entry->fields.remote_irr = 1;

diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index 7cc8950005b6ec15b5cbd2e2bc74776429184aeb..a52115441c079ffcfa39f90b71ccd6d908f6712a 100644 (file)
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
@@ -235,7 +235,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
 
        kvm_msi_to_lapic_irq(kvm, e, &irq);
 
-       return kvm_irq_delivery_to_apic(kvm, NULL, &irq, NULL);
+       return kvm_irq_delivery_to_apic(kvm, NULL, &irq);
 }
 
 int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,
@@ -258,7 +258,7 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,
 
                kvm_msi_to_lapic_irq(kvm, e, &irq);
 
-               if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r, NULL))
+               if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r))
                        return r;
                break;
 

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 785c0352fa0eed758cadb432204f774840ffe0b5..769facb27d3d9cd39ad355479adaf7a968d1632d 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1175,8 +1175,9 @@ static inline bool kvm_apic_map_get_dest_lapic(struct kvm *kvm,
        return true;
 }
 
-bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
-               struct kvm_lapic_irq *irq, int *r, struct dest_map *dest_map)
+static bool __kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
+                                           struct kvm_lapic_irq *irq, int *r,
+                                           struct dest_map *dest_map)
 {
        struct kvm_apic_map *map;
        unsigned long bitmap;
@@ -1212,6 +1213,13 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
        return ret;
 }
 
+
+bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
+                                  struct kvm_lapic_irq *irq, int *r)
+{
+       return __kvm_irq_delivery_to_apic_fast(kvm, src, irq, r, NULL);
+}
+
 /*
  * This routine tries to handle interrupts in posted mode, here is how
  * it deals with different cases:
@@ -1283,15 +1291,16 @@ bool kvm_intr_is_single_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq,
 }
 EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_intr_is_single_vcpu);
 
-int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
-                            struct kvm_lapic_irq *irq, struct dest_map *dest_map)
+int __kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
+                              struct kvm_lapic_irq *irq,
+                              struct dest_map *dest_map)
 {
        int r = -1;
        struct kvm_vcpu *vcpu, *lowest = NULL;
        unsigned long i, dest_vcpu_bitmap[BITS_TO_LONGS(KVM_MAX_VCPUS)];
        unsigned int dest_vcpus = 0;
 
-       if (kvm_irq_delivery_to_apic_fast(kvm, src, irq, &r, dest_map))
+       if (__kvm_irq_delivery_to_apic_fast(kvm, src, irq, &r, dest_map))
                return r;
 
        if (irq->dest_mode == APIC_DEST_PHYSICAL &&
@@ -1587,7 +1596,7 @@ void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high)
 
        trace_kvm_apic_ipi(icr_low, irq.dest_id);
 
-       kvm_irq_delivery_to_apic(apic->vcpu->kvm, apic, &irq, NULL);
+       kvm_irq_delivery_to_apic(apic->vcpu->kvm, apic, &irq);
 }
 EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_apic_send_ipi);
 
@@ -2556,7 +2565,7 @@ static int __kvm_x2apic_icr_write(struct kvm_lapic *apic, u64 data, bool fast)
                kvm_icr_to_lapic_irq(apic, (u32)data, (u32)(data >> 32), &irq);
 
                if (!kvm_irq_delivery_to_apic_fast(apic->vcpu->kvm, apic, &irq,
-                                                  &ignored, NULL))
+                                                  &ignored))
                        return -EWOULDBLOCK;
 
                trace_kvm_apic_ipi((u32)data, irq.dest_id);

diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 282b9b7da98cd191b108817249bf1ec6304e6287..901c05a5ac603f67744375d09b3cd37ce9746a7b 100644 (file)
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -117,10 +117,18 @@ int kvm_alloc_apic_access_page(struct kvm *kvm);
 void kvm_inhibit_apic_access_page(struct kvm_vcpu *vcpu);
 
 bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
-               struct kvm_lapic_irq *irq, int *r, struct dest_map *dest_map);
-int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
-                            struct kvm_lapic_irq *irq,
-                            struct dest_map *dest_map);
+                                  struct kvm_lapic_irq *irq, int *r);
+int __kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
+                              struct kvm_lapic_irq *irq,
+                              struct dest_map *dest_map);
+
+static inline int kvm_irq_delivery_to_apic(struct kvm *kvm,
+                                          struct kvm_lapic *src,
+                                          struct kvm_lapic_irq *irq)
+{
+       return __kvm_irq_delivery_to_apic(kvm, src, irq, NULL);
+}
+
 void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high);
 
 int kvm_apic_set_base(struct kvm_vcpu *vcpu, u64 value, bool host_initiated);

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a847353588a189df48cf51cbe75970e73e074634..0c1933a303ca31b4bd0810bc750a9500a216fd61 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -10245,7 +10245,7 @@ static void kvm_pv_kick_cpu_op(struct kvm *kvm, int apicid)
                .dest_id = apicid,
        };
 
-       kvm_irq_delivery_to_apic(kvm, NULL, &lapic_irq, NULL);
+       kvm_irq_delivery_to_apic(kvm, NULL, &lapic_irq);
 }
 
 bool kvm_apicv_activated(struct kvm *kvm)

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index d6b2a665b499dcdc533aa52fad6a47c5efeb77e0..28eeb1b2a16c6f5e1be8dcff3cc2d08d46233ef1 100644 (file)
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -626,7 +626,7 @@ void kvm_xen_inject_vcpu_vector(struct kvm_vcpu *v)
        irq.delivery_mode = APIC_DM_FIXED;
        irq.level = 1;
 
-       kvm_irq_delivery_to_apic(v->kvm, NULL, &irq, NULL);
+       kvm_irq_delivery_to_apic(v->kvm, NULL, &irq);
 }
 
 /*