Commit dba291f2 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Alexander Graf
Browse files

kvm: powerpc: booke: Move booke related tracepoints to separate header 



Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 72c12535

arch/powerpc/kvm/booke.c

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ 


#include "timing.h"

#include "booke.h"

#include "trace.h"



#define CREATE_TRACE_POINTS

#include "trace_booke.h"



unsigned long kvmppc_booke_handlers;

arch/powerpc/kvm/e500_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <asm/kvm_ppc.h>



#include "e500.h"

#include "trace.h"

#include "trace_booke.h"

#include "timing.h"

#include "e500_mmu_host.h"

arch/powerpc/kvm/e500_mmu_host.c

+2 −1
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ 
#include <asm/kvm_ppc.h>



#include "e500.h"

#include "trace.h"

#include "timing.h"

#include "e500_mmu_host.h"



#include "trace_booke.h"



#define to_htlb1_esel(esel) (host_tlb_params[1].entries - (esel) - 1)



static struct kvmppc_e500_tlb_params host_tlb_params[E500_TLB_NUM];

arch/powerpc/kvm/trace.h

+0 −204
Original line number Diff line number Diff line
@@ -31,116 +31,6 @@ TRACE_EVENT(kvm_ppc_instr, 
		  __entry->inst, __entry->pc, __entry->emulate)

);



#ifdef CONFIG_PPC_BOOK3S

#define kvm_trace_symbol_exit \

	{0x100, "SYSTEM_RESET"}, \

	{0x200, "MACHINE_CHECK"}, \

	{0x300, "DATA_STORAGE"}, \

	{0x380, "DATA_SEGMENT"}, \

	{0x400, "INST_STORAGE"}, \

	{0x480, "INST_SEGMENT"}, \

	{0x500, "EXTERNAL"}, \

	{0x501, "EXTERNAL_LEVEL"}, \

	{0x502, "EXTERNAL_HV"}, \

	{0x600, "ALIGNMENT"}, \

	{0x700, "PROGRAM"}, \

	{0x800, "FP_UNAVAIL"}, \

	{0x900, "DECREMENTER"}, \

	{0x980, "HV_DECREMENTER"}, \

	{0xc00, "SYSCALL"}, \

	{0xd00, "TRACE"}, \

	{0xe00, "H_DATA_STORAGE"}, \

	{0xe20, "H_INST_STORAGE"}, \

	{0xe40, "H_EMUL_ASSIST"}, \

	{0xf00, "PERFMON"}, \

	{0xf20, "ALTIVEC"}, \

	{0xf40, "VSX"}

#else

#define kvm_trace_symbol_exit \

	{0, "CRITICAL"}, \

	{1, "MACHINE_CHECK"}, \

	{2, "DATA_STORAGE"}, \

	{3, "INST_STORAGE"}, \

	{4, "EXTERNAL"}, \

	{5, "ALIGNMENT"}, \

	{6, "PROGRAM"}, \

	{7, "FP_UNAVAIL"}, \

	{8, "SYSCALL"}, \

	{9, "AP_UNAVAIL"}, \

	{10, "DECREMENTER"}, \

	{11, "FIT"}, \

	{12, "WATCHDOG"}, \

	{13, "DTLB_MISS"}, \

	{14, "ITLB_MISS"}, \

	{15, "DEBUG"}, \

	{32, "SPE_UNAVAIL"}, \

	{33, "SPE_FP_DATA"}, \

	{34, "SPE_FP_ROUND"}, \

	{35, "PERFORMANCE_MONITOR"}, \

	{36, "DOORBELL"}, \

	{37, "DOORBELL_CRITICAL"}, \

	{38, "GUEST_DBELL"}, \

	{39, "GUEST_DBELL_CRIT"}, \

	{40, "HV_SYSCALL"}, \

	{41, "HV_PRIV"}

#endif



#ifndef CONFIG_KVM_BOOK3S_PR_POSSIBLE

/*

 * For pr we define this in trace_pr.h since it pr can be built as

 * a module

 */



TRACE_EVENT(kvm_exit,

	TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu),

	TP_ARGS(exit_nr, vcpu),



	TP_STRUCT__entry(

		__field(	unsigned int,	exit_nr		)

		__field(	unsigned long,	pc		)

		__field(	unsigned long,	msr		)

		__field(	unsigned long,	dar		)

		__field(	unsigned long,	last_inst	)

	),



	TP_fast_assign(

		__entry->exit_nr	= exit_nr;

		__entry->pc		= kvmppc_get_pc(vcpu);

		__entry->dar		= kvmppc_get_fault_dar(vcpu);

		__entry->msr		= vcpu->arch.shared->msr;

		__entry->last_inst	= vcpu->arch.last_inst;

	),



	TP_printk("exit=%s"

		" | pc=0x%lx"

		" | msr=0x%lx"

		" | dar=0x%lx"

		" | last_inst=0x%lx"

		,

		__print_symbolic(__entry->exit_nr, kvm_trace_symbol_exit),

		__entry->pc,

		__entry->msr,

		__entry->dar,

		__entry->last_inst

		)

);



TRACE_EVENT(kvm_unmap_hva,

	TP_PROTO(unsigned long hva),

	TP_ARGS(hva),



	TP_STRUCT__entry(

		__field(	unsigned long,	hva		)

	),



	TP_fast_assign(

		__entry->hva		= hva;

	),



	TP_printk("unmap hva 0x%lx\n", __entry->hva)

);

#endif



TRACE_EVENT(kvm_stlb_inval,

	TP_PROTO(unsigned int stlb_index),

	TP_ARGS(stlb_index),
@@ -226,100 +116,6 @@ TRACE_EVENT(kvm_check_requests, 
		__entry->cpu_nr, __entry->requests)

);



/*************************************************************************

 *                         Book3E trace points                           *

 *************************************************************************/



#ifdef CONFIG_BOOKE



TRACE_EVENT(kvm_booke206_stlb_write,

	TP_PROTO(__u32 mas0, __u32 mas8, __u32 mas1, __u64 mas2, __u64 mas7_3),

	TP_ARGS(mas0, mas8, mas1, mas2, mas7_3),



	TP_STRUCT__entry(

		__field(	__u32,	mas0		)

		__field(	__u32,	mas8		)

		__field(	__u32,	mas1		)

		__field(	__u64,	mas2		)

		__field(	__u64,	mas7_3		)

	),



	TP_fast_assign(

		__entry->mas0		= mas0;

		__entry->mas8		= mas8;

		__entry->mas1		= mas1;

		__entry->mas2		= mas2;

		__entry->mas7_3		= mas7_3;

	),



	TP_printk("mas0=%x mas8=%x mas1=%x mas2=%llx mas7_3=%llx",

		__entry->mas0, __entry->mas8, __entry->mas1,

		__entry->mas2, __entry->mas7_3)

);



TRACE_EVENT(kvm_booke206_gtlb_write,

	TP_PROTO(__u32 mas0, __u32 mas1, __u64 mas2, __u64 mas7_3),

	TP_ARGS(mas0, mas1, mas2, mas7_3),



	TP_STRUCT__entry(

		__field(	__u32,	mas0		)

		__field(	__u32,	mas1		)

		__field(	__u64,	mas2		)

		__field(	__u64,	mas7_3		)

	),



	TP_fast_assign(

		__entry->mas0		= mas0;

		__entry->mas1		= mas1;

		__entry->mas2		= mas2;

		__entry->mas7_3		= mas7_3;

	),



	TP_printk("mas0=%x mas1=%x mas2=%llx mas7_3=%llx",

		__entry->mas0, __entry->mas1,

		__entry->mas2, __entry->mas7_3)

);



TRACE_EVENT(kvm_booke206_ref_release,

	TP_PROTO(__u64 pfn, __u32 flags),

	TP_ARGS(pfn, flags),



	TP_STRUCT__entry(

		__field(	__u64,	pfn		)

		__field(	__u32,	flags		)

	),



	TP_fast_assign(

		__entry->pfn		= pfn;

		__entry->flags		= flags;

	),



	TP_printk("pfn=%llx flags=%x",

		__entry->pfn, __entry->flags)

);



TRACE_EVENT(kvm_booke_queue_irqprio,

	TP_PROTO(struct kvm_vcpu *vcpu, unsigned int priority),

	TP_ARGS(vcpu, priority),



	TP_STRUCT__entry(

		__field(	__u32,	cpu_nr		)

		__field(	__u32,	priority		)

		__field(	unsigned long,	pending		)

	),



	TP_fast_assign(

		__entry->cpu_nr		= vcpu->vcpu_id;

		__entry->priority	= priority;

		__entry->pending	= vcpu->arch.pending_exceptions;

	),



	TP_printk("vcpu=%x prio=%x pending=%lx",

		__entry->cpu_nr, __entry->priority, __entry->pending)

);



#endif



#endif /* _TRACE_KVM_H */



/* This part must be outside protection */

arch/powerpc/kvm/trace_booke.h

0 → 100644
+177 −0
Original line number Diff line number Diff line 
#if !defined(_TRACE_KVM_BOOKE_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_KVM_BOOKE_H



#include <linux/tracepoint.h>



#undef TRACE_SYSTEM

#define TRACE_SYSTEM kvm_booke

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_booke



#define kvm_trace_symbol_exit \

	{0, "CRITICAL"}, \

	{1, "MACHINE_CHECK"}, \

	{2, "DATA_STORAGE"}, \

	{3, "INST_STORAGE"}, \

	{4, "EXTERNAL"}, \

	{5, "ALIGNMENT"}, \

	{6, "PROGRAM"}, \

	{7, "FP_UNAVAIL"}, \

	{8, "SYSCALL"}, \

	{9, "AP_UNAVAIL"}, \

	{10, "DECREMENTER"}, \

	{11, "FIT"}, \

	{12, "WATCHDOG"}, \

	{13, "DTLB_MISS"}, \

	{14, "ITLB_MISS"}, \

	{15, "DEBUG"}, \

	{32, "SPE_UNAVAIL"}, \

	{33, "SPE_FP_DATA"}, \

	{34, "SPE_FP_ROUND"}, \

	{35, "PERFORMANCE_MONITOR"}, \

	{36, "DOORBELL"}, \

	{37, "DOORBELL_CRITICAL"}, \

	{38, "GUEST_DBELL"}, \

	{39, "GUEST_DBELL_CRIT"}, \

	{40, "HV_SYSCALL"}, \

	{41, "HV_PRIV"}



TRACE_EVENT(kvm_exit,

	TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu),

	TP_ARGS(exit_nr, vcpu),



	TP_STRUCT__entry(

		__field(	unsigned int,	exit_nr		)

		__field(	unsigned long,	pc		)

		__field(	unsigned long,	msr		)

		__field(	unsigned long,	dar		)

		__field(	unsigned long,	last_inst	)

	),



	TP_fast_assign(

		__entry->exit_nr	= exit_nr;

		__entry->pc		= kvmppc_get_pc(vcpu);

		__entry->dar		= kvmppc_get_fault_dar(vcpu);

		__entry->msr		= vcpu->arch.shared->msr;

		__entry->last_inst	= vcpu->arch.last_inst;

	),



	TP_printk("exit=%s"

		" | pc=0x%lx"

		" | msr=0x%lx"

		" | dar=0x%lx"

		" | last_inst=0x%lx"

		,

		__print_symbolic(__entry->exit_nr, kvm_trace_symbol_exit),

		__entry->pc,

		__entry->msr,

		__entry->dar,

		__entry->last_inst

		)

);



TRACE_EVENT(kvm_unmap_hva,

	TP_PROTO(unsigned long hva),

	TP_ARGS(hva),



	TP_STRUCT__entry(

		__field(	unsigned long,	hva		)

	),



	TP_fast_assign(

		__entry->hva		= hva;

	),



	TP_printk("unmap hva 0x%lx\n", __entry->hva)

);



TRACE_EVENT(kvm_booke206_stlb_write,

	TP_PROTO(__u32 mas0, __u32 mas8, __u32 mas1, __u64 mas2, __u64 mas7_3),

	TP_ARGS(mas0, mas8, mas1, mas2, mas7_3),



	TP_STRUCT__entry(

		__field(	__u32,	mas0		)

		__field(	__u32,	mas8		)

		__field(	__u32,	mas1		)

		__field(	__u64,	mas2		)

		__field(	__u64,	mas7_3		)

	),



	TP_fast_assign(

		__entry->mas0		= mas0;

		__entry->mas8		= mas8;

		__entry->mas1		= mas1;

		__entry->mas2		= mas2;

		__entry->mas7_3		= mas7_3;

	),



	TP_printk("mas0=%x mas8=%x mas1=%x mas2=%llx mas7_3=%llx",

		__entry->mas0, __entry->mas8, __entry->mas1,

		__entry->mas2, __entry->mas7_3)

);



TRACE_EVENT(kvm_booke206_gtlb_write,

	TP_PROTO(__u32 mas0, __u32 mas1, __u64 mas2, __u64 mas7_3),

	TP_ARGS(mas0, mas1, mas2, mas7_3),



	TP_STRUCT__entry(

		__field(	__u32,	mas0		)

		__field(	__u32,	mas1		)

		__field(	__u64,	mas2		)

		__field(	__u64,	mas7_3		)

	),



	TP_fast_assign(

		__entry->mas0		= mas0;

		__entry->mas1		= mas1;

		__entry->mas2		= mas2;

		__entry->mas7_3		= mas7_3;

	),



	TP_printk("mas0=%x mas1=%x mas2=%llx mas7_3=%llx",

		__entry->mas0, __entry->mas1,

		__entry->mas2, __entry->mas7_3)

);



TRACE_EVENT(kvm_booke206_ref_release,

	TP_PROTO(__u64 pfn, __u32 flags),

	TP_ARGS(pfn, flags),



	TP_STRUCT__entry(

		__field(	__u64,	pfn		)

		__field(	__u32,	flags		)

	),



	TP_fast_assign(

		__entry->pfn		= pfn;

		__entry->flags		= flags;

	),



	TP_printk("pfn=%llx flags=%x",

		__entry->pfn, __entry->flags)

);



TRACE_EVENT(kvm_booke_queue_irqprio,

	TP_PROTO(struct kvm_vcpu *vcpu, unsigned int priority),

	TP_ARGS(vcpu, priority),



	TP_STRUCT__entry(

		__field(	__u32,	cpu_nr		)

		__field(	__u32,	priority		)

		__field(	unsigned long,	pending		)

	),



	TP_fast_assign(

		__entry->cpu_nr		= vcpu->vcpu_id;

		__entry->priority	= priority;

		__entry->pending	= vcpu->arch.pending_exceptions;

	),



	TP_printk("vcpu=%x prio=%x pending=%lx",

		__entry->cpu_nr, __entry->priority, __entry->pending)

);



#endif



/* This part must be outside protection */

#include <trace/define_trace.h>