Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d98e6346 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: Move KVM TRACE DEFINITIONS to common header 



Move KVM trace definitions from x86 specific kvm headers to common kvm
headers to create a cross-architecture numbering scheme for trace
events. This means the kvmtrace_format userspace tool won't need to know
which architecture produced the log file being processed.

Signed-off-by: default avatarJerone Young <jyoung5@us.ibm.com>
Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 5fdbf976

include/asm-x86/kvm.h

+0 −22
Original line number Diff line number Diff line
@@ -208,26 +208,4 @@ struct kvm_pit_channel_state { 
struct kvm_pit_state {

	struct kvm_pit_channel_state channels[3];

};



#define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)

#define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)

#define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)

#define KVM_TRC_IO_READ          (KVM_TRC_HANDLER + 0x05)

#define KVM_TRC_IO_WRITE         (KVM_TRC_HANDLER + 0x06)

#define KVM_TRC_CR_READ          (KVM_TRC_HANDLER + 0x07)

#define KVM_TRC_CR_WRITE         (KVM_TRC_HANDLER + 0x08)

#define KVM_TRC_DR_READ          (KVM_TRC_HANDLER + 0x09)

#define KVM_TRC_DR_WRITE         (KVM_TRC_HANDLER + 0x0A)

#define KVM_TRC_MSR_READ         (KVM_TRC_HANDLER + 0x0B)

#define KVM_TRC_MSR_WRITE        (KVM_TRC_HANDLER + 0x0C)

#define KVM_TRC_CPUID            (KVM_TRC_HANDLER + 0x0D)

#define KVM_TRC_INTR             (KVM_TRC_HANDLER + 0x0E)

#define KVM_TRC_NMI              (KVM_TRC_HANDLER + 0x0F)

#define KVM_TRC_VMMCALL          (KVM_TRC_HANDLER + 0x10)

#define KVM_TRC_HLT              (KVM_TRC_HANDLER + 0x11)

#define KVM_TRC_CLTS             (KVM_TRC_HANDLER + 0x12)

#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)

#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)

#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)



#endif /* ASM_X86__KVM_H */

include/asm-x86/kvm_host.h

+0 −18
Original line number Diff line number Diff line
@@ -691,24 +691,6 @@ enum { 
	TASK_SWITCH_GATE = 3,

};



#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 5, d1, d2, d3, d4, d5)

#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 4, d1, d2, d3, d4, 0)

#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 3, d1, d2, d3, 0, 0)

#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 2, d1, d2, 0, 0, 0)

#define KVMTRACE_1D(evt, vcpu, d1, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 1, d1, 0, 0, 0, 0)

#define KVMTRACE_0D(evt, vcpu, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 0, 0, 0, 0, 0, 0)



#ifdef CONFIG_64BIT

# define KVM_EX_ENTRY ".quad"

include/linux/kvm.h

+21 −0
Original line number Diff line number Diff line
@@ -440,4 +440,25 @@ struct kvm_trace_rec { 
#define KVM_GET_MP_STATE          _IOR(KVMIO,  0x98, struct kvm_mp_state)

#define KVM_SET_MP_STATE          _IOW(KVMIO,  0x99, struct kvm_mp_state)



#define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)

#define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)

#define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)

#define KVM_TRC_IO_READ          (KVM_TRC_HANDLER + 0x05)

#define KVM_TRC_IO_WRITE         (KVM_TRC_HANDLER + 0x06)

#define KVM_TRC_CR_READ          (KVM_TRC_HANDLER + 0x07)

#define KVM_TRC_CR_WRITE         (KVM_TRC_HANDLER + 0x08)

#define KVM_TRC_DR_READ          (KVM_TRC_HANDLER + 0x09)

#define KVM_TRC_DR_WRITE         (KVM_TRC_HANDLER + 0x0A)

#define KVM_TRC_MSR_READ         (KVM_TRC_HANDLER + 0x0B)

#define KVM_TRC_MSR_WRITE        (KVM_TRC_HANDLER + 0x0C)

#define KVM_TRC_CPUID            (KVM_TRC_HANDLER + 0x0D)

#define KVM_TRC_INTR             (KVM_TRC_HANDLER + 0x0E)

#define KVM_TRC_NMI              (KVM_TRC_HANDLER + 0x0F)

#define KVM_TRC_VMMCALL          (KVM_TRC_HANDLER + 0x10)

#define KVM_TRC_HLT              (KVM_TRC_HANDLER + 0x11)

#define KVM_TRC_CLTS             (KVM_TRC_HANDLER + 0x12)

#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)

#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)

#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)



#endif

include/linux/kvm_host.h

+19 −0
Original line number Diff line number Diff line
@@ -326,6 +326,25 @@ struct kvm_stats_debugfs_item { 
extern struct kvm_stats_debugfs_item debugfs_entries[];

extern struct dentry *kvm_debugfs_dir;



#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 5, d1, d2, d3, d4, d5)

#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 4, d1, d2, d3, d4, 0)

#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 3, d1, d2, d3, 0, 0)

#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 2, d1, d2, 0, 0, 0)

#define KVMTRACE_1D(evt, vcpu, d1, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 1, d1, 0, 0, 0, 0)

#define KVMTRACE_0D(evt, vcpu, name) \

	trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \

						vcpu, 0, 0, 0, 0, 0, 0)



#ifdef CONFIG_KVM_TRACE

int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg);

void kvm_trace_cleanup(void);