KVM: x86: Rename irqchip_kernel() to irqchip_full()

Rename irqchip_kernel() to irqchip_full(), as "kernel" is very ambiguous
due to the existence of split IRQ chip support, where only some of the
"irqchip" is in emulated by the kernel/KVM.  E.g. irqchip_kernel() often
gets confused with irqchip_in_kernel().

Opportunistically hoist the definition up in irq.h so that it's
co-located with other "full" irqchip code in anticipation of wrapping it
all with a Kconfig/#ifdef.

No functional change intended.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Kai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/r/20250611213557.294358-8-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
index a86f59bbea449fbcd02bfd0d2c4b1fa9f400b04f..289cca3aec6993043316ad4dbd065f4f2c911fdc 100644 (file)
--- a/arch/x86/kvm/ioapic.h
+++ b/arch/x86/kvm/ioapic.h
@@ -103,7 +103,7 @@ do {                                                                        \
 
 static inline int ioapic_in_kernel(struct kvm *kvm)
 {
-       return irqchip_kernel(kvm);
+       return irqchip_full(kvm);
 }
 
 void kvm_rtc_eoi_tracking_restore_one(struct kvm_vcpu *vcpu);

diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index da47e2165389bc2571c267521a9ff442c1e507b0..97e1617ce24ddf76086e36a122a08870e6741b9d 100644 (file)
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
@@ -172,7 +172,7 @@ bool kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args)
 {
        bool resample = args->flags & KVM_IRQFD_FLAG_RESAMPLE;
 
-       return resample ? irqchip_kernel(kvm) : irqchip_in_kernel(kvm);
+       return resample ? irqchip_full(kvm) : irqchip_in_kernel(kvm);
 }
 
 bool kvm_arch_irqchip_in_kernel(struct kvm *kvm)

diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index aa77a6b2828c1490c9f8a862f539203ca53b6df2..4ac346102350dd6d75560eb28ce5ed5cc41442f1 100644 (file)
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -69,27 +69,27 @@ int kvm_pic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
 int kvm_vm_ioctl_get_irqchip(struct kvm *kvm, struct kvm_irqchip *chip);
 int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *chip);
 
-static inline int irqchip_split(struct kvm *kvm)
+static inline int irqchip_full(struct kvm *kvm)
 {
        int mode = kvm->arch.irqchip_mode;
 
        /* Matches smp_wmb() when setting irqchip_mode */
        smp_rmb();
-       return mode == KVM_IRQCHIP_SPLIT;
+       return mode == KVM_IRQCHIP_KERNEL;
+}
+
+static inline int pic_in_kernel(struct kvm *kvm)
+{
+       return irqchip_full(kvm);
 }
 
-static inline int irqchip_kernel(struct kvm *kvm)
+static inline int irqchip_split(struct kvm *kvm)
 {
        int mode = kvm->arch.irqchip_mode;
 
        /* Matches smp_wmb() when setting irqchip_mode */
        smp_rmb();
-       return mode == KVM_IRQCHIP_KERNEL;
-}
-
-static inline int pic_in_kernel(struct kvm *kvm)
-{
-       return irqchip_kernel(kvm);
+       return mode == KVM_IRQCHIP_SPLIT;
 }
 
 static inline int irqchip_in_kernel(struct kvm *kvm)

diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
index 28a8555ab58b18e8247287664c6d6f4bb1336cc0..bcf2f1e4a0059a7e00c62e6388f1c42e51c68e5d 100644 (file)
--- a/arch/x86/kvm/irq_comm.c
+++ b/arch/x86/kvm/irq_comm.c
@@ -200,7 +200,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
                goto unlock;
        }
        clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap);
-       if (!irqchip_kernel(kvm))
+       if (!irqchip_full(kvm))
                goto unlock;
 
        kvm_ioapic_clear_all(kvm->arch.vioapic, irq_source_id);

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 787fc22dab542093ff17325d2b1b6c54b30d9677..7d3583285847d6c1aae70b38a2bd3dcc2b0eb552 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7039,7 +7039,7 @@ set_identity_unlock:
                }
 
                r = -ENXIO;
-               if (!irqchip_kernel(kvm))
+               if (!irqchip_full(kvm))
                        goto get_irqchip_out;
                r = kvm_vm_ioctl_get_irqchip(kvm, chip);
                if (r)
@@ -7063,7 +7063,7 @@ set_identity_unlock:
                }
 
                r = -ENXIO;
-               if (!irqchip_kernel(kvm))
+               if (!irqchip_full(kvm))
                        goto set_irqchip_out;
                r = kvm_vm_ioctl_set_irqchip(kvm, chip);
        set_irqchip_out: