Commit 2c938850 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

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: default avatarKai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/r/20250611213557.294358-14-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent cd9140ad

arch/x86/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/kvm/irq_comm.c

+3 −7
Original line number Diff line number Diff line
@@ -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"

arch/x86/kvm/trace.h

+78 −0
Original line number Diff line number Diff line
@@ -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						    \

include/trace/events/kvm.h

+0 −77
Original line number Diff line number Diff line
@@ -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"},		\