KVM: Move x86-only tracepoints to x86's trace.h

Move the I/O APIC tracepoints and trace_kvm_msi_set_irq() to x86, as
__KVM_HAVE_IOAPIC is just code for "x86", and trace_kvm_msi_set_irq()
isn't unique to I/O APIC emulation.

Opportunistically clean up the absurdly messy #includes in ioapic.c.

No functional change intended.

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

diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
index 65626da1407fa2026244cbda9cc1801bdc5154ba..fa7481814bc6c827baed8f44c196680b8af282bb 100644 (file)
--- a/arch/x86/kvm/ioapic.c
+++ b/arch/x86/kvm/ioapic.c
@@ -41,11 +41,11 @@
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/current.h>
-#include <trace/events/kvm.h>
 
 #include "ioapic.h"
 #include "lapic.h"
 #include "irq.h"
+#include "trace.h"
 
 static int ioapic_service(struct kvm_ioapic *vioapic, int irq,
                bool line_status);

diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
index 138c675dc24b76ac6fe7a6ebd1b52dd4b8c609d2..13d84c25e5035a069bee28498972b6897b36caf1 100644 (file)
--- a/arch/x86/kvm/irq_comm.c
+++ b/arch/x86/kvm/irq_comm.c
@@ -15,15 +15,11 @@
 #include <linux/export.h>
 #include <linux/rculist.h>
 
-#include <trace/events/kvm.h>
-
-#include "irq.h"
-
+#include "hyperv.h"
 #include "ioapic.h"
-
+#include "irq.h"
 #include "lapic.h"
-
-#include "hyperv.h"
+#include "trace.h"
 #include "x86.h"
 #include "xen.h"
 

diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index ba736cbb0587cd2d7417065e35f37d7ffd5fbfb1..4ef17990574d054a7253e62672760e69f9f7ab36 100644 (file)
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -260,6 +260,84 @@ TRACE_EVENT(kvm_cpuid,
                  __entry->used_max_basic ? ", used max basic" : "")
 );
 
+#define kvm_deliver_mode               \
+       {0x0, "Fixed"},                 \
+       {0x1, "LowPrio"},               \
+       {0x2, "SMI"},                   \
+       {0x3, "Res3"},                  \
+       {0x4, "NMI"},                   \
+       {0x5, "INIT"},                  \
+       {0x6, "SIPI"},                  \
+       {0x7, "ExtINT"}
+
+TRACE_EVENT(kvm_ioapic_set_irq,
+           TP_PROTO(__u64 e, int pin, bool coalesced),
+           TP_ARGS(e, pin, coalesced),
+
+       TP_STRUCT__entry(
+               __field(        __u64,          e               )
+               __field(        int,            pin             )
+               __field(        bool,           coalesced       )
+       ),
+
+       TP_fast_assign(
+               __entry->e              = e;
+               __entry->pin            = pin;
+               __entry->coalesced      = coalesced;
+       ),
+
+       TP_printk("pin %u dst %x vec %u (%s|%s|%s%s)%s",
+                 __entry->pin, (u8)(__entry->e >> 56), (u8)__entry->e,
+                 __print_symbolic((__entry->e >> 8 & 0x7), kvm_deliver_mode),
+                 (__entry->e & (1<<11)) ? "logical" : "physical",
+                 (__entry->e & (1<<15)) ? "level" : "edge",
+                 (__entry->e & (1<<16)) ? "|masked" : "",
+                 __entry->coalesced ? " (coalesced)" : "")
+);
+
+TRACE_EVENT(kvm_ioapic_delayed_eoi_inj,
+           TP_PROTO(__u64 e),
+           TP_ARGS(e),
+
+       TP_STRUCT__entry(
+               __field(        __u64,          e               )
+       ),
+
+       TP_fast_assign(
+               __entry->e              = e;
+       ),
+
+       TP_printk("dst %x vec %u (%s|%s|%s%s)",
+                 (u8)(__entry->e >> 56), (u8)__entry->e,
+                 __print_symbolic((__entry->e >> 8 & 0x7), kvm_deliver_mode),
+                 (__entry->e & (1<<11)) ? "logical" : "physical",
+                 (__entry->e & (1<<15)) ? "level" : "edge",
+                 (__entry->e & (1<<16)) ? "|masked" : "")
+);
+
+TRACE_EVENT(kvm_msi_set_irq,
+           TP_PROTO(__u64 address, __u64 data),
+           TP_ARGS(address, data),
+
+       TP_STRUCT__entry(
+               __field(        __u64,          address         )
+               __field(        __u64,          data            )
+       ),
+
+       TP_fast_assign(
+               __entry->address        = address;
+               __entry->data           = data;
+       ),
+
+       TP_printk("dst %llx vec %u (%s|%s|%s%s)",
+                 (u8)(__entry->address >> 12) | ((__entry->address >> 32) & 0xffffff00),
+                 (u8)__entry->data,
+                 __print_symbolic((__entry->data >> 8 & 0x7), kvm_deliver_mode),
+                 (__entry->address & (1<<2)) ? "logical" : "physical",
+                 (__entry->data & (1<<15)) ? "level" : "edge",
+                 (__entry->address & (1<<3)) ? "|rh" : "")
+);
+
 #define AREG(x) { APIC_##x, "APIC_" #x }
 
 #define kvm_trace_symbol_apic                                              \

diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index fc7d0f8ff078828c726b4c0d8c66f7cbf82f0e80..96e581900c8e38ebcd354fc067ccac8e6800c819 100644 (file)
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -85,83 +85,6 @@ TRACE_EVENT(kvm_set_irq,
 #endif /* defined(CONFIG_HAVE_KVM_IRQCHIP) */
 
 #if defined(__KVM_HAVE_IOAPIC)
-#define kvm_deliver_mode               \
-       {0x0, "Fixed"},                 \
-       {0x1, "LowPrio"},               \
-       {0x2, "SMI"},                   \
-       {0x3, "Res3"},                  \
-       {0x4, "NMI"},                   \
-       {0x5, "INIT"},                  \
-       {0x6, "SIPI"},                  \
-       {0x7, "ExtINT"}
-
-TRACE_EVENT(kvm_ioapic_set_irq,
-           TP_PROTO(__u64 e, int pin, bool coalesced),
-           TP_ARGS(e, pin, coalesced),
-
-       TP_STRUCT__entry(
-               __field(        __u64,          e               )
-               __field(        int,            pin             )
-               __field(        bool,           coalesced       )
-       ),
-
-       TP_fast_assign(
-               __entry->e              = e;
-               __entry->pin            = pin;
-               __entry->coalesced      = coalesced;
-       ),
-
-       TP_printk("pin %u dst %x vec %u (%s|%s|%s%s)%s",
-                 __entry->pin, (u8)(__entry->e >> 56), (u8)__entry->e,
-                 __print_symbolic((__entry->e >> 8 & 0x7), kvm_deliver_mode),
-                 (__entry->e & (1<<11)) ? "logical" : "physical",
-                 (__entry->e & (1<<15)) ? "level" : "edge",
-                 (__entry->e & (1<<16)) ? "|masked" : "",
-                 __entry->coalesced ? " (coalesced)" : "")
-);
-
-TRACE_EVENT(kvm_ioapic_delayed_eoi_inj,
-           TP_PROTO(__u64 e),
-           TP_ARGS(e),
-
-       TP_STRUCT__entry(
-               __field(        __u64,          e               )
-       ),
-
-       TP_fast_assign(
-               __entry->e              = e;
-       ),
-
-       TP_printk("dst %x vec %u (%s|%s|%s%s)",
-                 (u8)(__entry->e >> 56), (u8)__entry->e,
-                 __print_symbolic((__entry->e >> 8 & 0x7), kvm_deliver_mode),
-                 (__entry->e & (1<<11)) ? "logical" : "physical",
-                 (__entry->e & (1<<15)) ? "level" : "edge",
-                 (__entry->e & (1<<16)) ? "|masked" : "")
-);
-
-TRACE_EVENT(kvm_msi_set_irq,
-           TP_PROTO(__u64 address, __u64 data),
-           TP_ARGS(address, data),
-
-       TP_STRUCT__entry(
-               __field(        __u64,          address         )
-               __field(        __u64,          data            )
-       ),
-
-       TP_fast_assign(
-               __entry->address        = address;
-               __entry->data           = data;
-       ),
-
-       TP_printk("dst %llx vec %u (%s|%s|%s%s)",
-                 (u8)(__entry->address >> 12) | ((__entry->address >> 32) & 0xffffff00),
-                 (u8)__entry->data,
-                 __print_symbolic((__entry->data >> 8 & 0x7), kvm_deliver_mode),
-                 (__entry->address & (1<<2)) ? "logical" : "physical",
-                 (__entry->data & (1<<15)) ? "level" : "edge",
-                 (__entry->address & (1<<3)) ? "|rh" : "")
-);
 
 #define kvm_irqchips                                           \
        {KVM_IRQCHIP_PIC_MASTER,        "PIC master"},          \