Commit 6346046c authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: PPC: BookE: Add some more trace points 



Without trace points, debugging what exactly is going on inside guest
code can be very tricky. Add a few more trace points at places that
hopefully tell us more when things go wrong.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 862d31f7

arch/powerpc/kvm/booke.c

+3 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ void kvmppc_set_msr(struct kvm_vcpu *vcpu, u32 new_msr) 
static void kvmppc_booke_queue_irqprio(struct kvm_vcpu *vcpu,

                                       unsigned int priority)

{

	trace_kvm_booke_queue_irqprio(vcpu, priority);

	set_bit(priority, &vcpu->arch.pending_exceptions);

}
@@ -457,6 +458,8 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) 
static void kvmppc_check_requests(struct kvm_vcpu *vcpu)

{

	if (vcpu->requests) {

		trace_kvm_check_requests(vcpu);



		if (kvm_check_request(KVM_REQ_PENDING_TIMER, vcpu))

			update_timer_ints(vcpu);

#if defined(CONFIG_KVM_E500V2) || defined(CONFIG_KVM_E500MC)

arch/powerpc/kvm/e500_tlb.c

+3 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ static inline void kvmppc_e500_ref_setup(struct tlbe_ref *ref, 
static inline void kvmppc_e500_ref_release(struct tlbe_ref *ref)

{

	if (ref->flags & E500_TLB_VALID) {

		trace_kvm_booke206_ref_release(ref->pfn, ref->flags);

		ref->flags = 0;

	}

}
@@ -1075,6 +1076,8 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 eaddr, gpa_t gpaddr, 


int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)

{

	trace_kvm_unmap_hva(hva);



	/*

	 * Flush all shadow tlb entries everywhere. This is slow, but

	 * we are 100% sure that we catch the to be unmapped page

arch/powerpc/kvm/trace.h

+71 −0
Original line number Diff line number Diff line
@@ -82,6 +82,21 @@ TRACE_EVENT(kvm_exit, 
		)

);



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_stlb_inval,

	TP_PROTO(unsigned int stlb_index),

	TP_ARGS(stlb_index),
@@ -149,6 +164,24 @@ TRACE_EVENT(kvm_gtlb_write, 
		__entry->word1, __entry->word2)

);



TRACE_EVENT(kvm_check_requests,

	TP_PROTO(struct kvm_vcpu *vcpu),

	TP_ARGS(vcpu),



	TP_STRUCT__entry(

		__field(	__u32,	cpu_nr		)

		__field(	__u32,	requests	)

	),



	TP_fast_assign(

		__entry->cpu_nr		= vcpu->vcpu_id;

		__entry->requests	= vcpu->requests;

	),



	TP_printk("vcpu=%x requests=%x",

		__entry->cpu_nr, __entry->requests)

);





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

 *                         Book3S trace points                           *
@@ -418,6 +451,44 @@ TRACE_EVENT(kvm_booke206_gtlb_write, 
		__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 */