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

Commit bed1ed98 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Move EXIT_DEBUG partially to tracepoints 



We have a debug printk on every exit that is usually #ifdef'ed out. Using
tracepoints makes a lot more sense here though, as they can be dynamically
enabled.

This patch converts the most commonly used debug printks of EXIT_DEBUG to
tracepoints.

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

arch/powerpc/kvm/book3s.c

+4 −22
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/kvm_host.h>

#include <linux/err.h>

#include <linux/slab.h>

#include "trace.h"



#include <asm/reg.h>

#include <asm/cputable.h>
@@ -35,7 +36,6 @@ 
#define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU



/* #define EXIT_DEBUG */

/* #define EXIT_DEBUG_SIMPLE */

/* #define DEBUG_EXT */



static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr,
@@ -105,14 +105,6 @@ void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu) 
	kvmppc_giveup_ext(vcpu, MSR_VSX);

}



#if defined(EXIT_DEBUG)

static u32 kvmppc_get_dec(struct kvm_vcpu *vcpu)

{

	u64 jd = mftb() - vcpu->arch.dec_jiffies;

	return vcpu->arch.dec - jd;

}

#endif



static void kvmppc_recalc_shadow_msr(struct kvm_vcpu *vcpu)

{

	ulong smsr = vcpu->arch.shared->msr;
@@ -850,16 +842,8 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 


	run->exit_reason = KVM_EXIT_UNKNOWN;

	run->ready_for_interrupt_injection = 1;

#ifdef EXIT_DEBUG

	printk(KERN_EMERG "exit_nr=0x%x | pc=0x%lx | dar=0x%lx | dec=0x%x | msr=0x%lx\n",

		exit_nr, kvmppc_get_pc(vcpu), kvmppc_get_fault_dar(vcpu),

		kvmppc_get_dec(vcpu), to_svcpu(vcpu)->shadow_srr1);

#elif defined (EXIT_DEBUG_SIMPLE)

	if ((exit_nr != 0x900) && (exit_nr != 0x500))

		printk(KERN_EMERG "exit_nr=0x%x | pc=0x%lx | dar=0x%lx | msr=0x%lx\n",

			exit_nr, kvmppc_get_pc(vcpu), kvmppc_get_fault_dar(vcpu),

			vcpu->arch.shared->msr);

#endif



	trace_kvm_book3s_exit(exit_nr, vcpu);

	kvm_resched(vcpu);

	switch (exit_nr) {

	case BOOK3S_INTERRUPT_INST_STORAGE:
@@ -1091,9 +1075,7 @@ program_interrupt: 
		}

	}



#ifdef EXIT_DEBUG

	printk(KERN_EMERG "KVM exit: vcpu=0x%p pc=0x%lx r=0x%x\n", vcpu, kvmppc_get_pc(vcpu), r);

#endif

	trace_kvm_book3s_reenter(r, vcpu);



	return r;

}

arch/powerpc/kvm/trace.h

+51 −0
Original line number Diff line number Diff line
@@ -98,6 +98,57 @@ TRACE_EVENT(kvm_gtlb_write, 
		__entry->word1, __entry->word2)

);





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

 *                         Book3S trace points                           *

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



#ifdef CONFIG_PPC_BOOK3S



TRACE_EVENT(kvm_book3s_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,	srr1		)

	),



	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->srr1		= to_svcpu(vcpu)->shadow_srr1;

	),



	TP_printk("exit=0x%x | pc=0x%lx | msr=0x%lx | dar=0x%lx | srr1=0x%lx",

		  __entry->exit_nr, __entry->pc, __entry->msr, __entry->dar,

		  __entry->srr1)

);



TRACE_EVENT(kvm_book3s_reenter,

	TP_PROTO(int r, struct kvm_vcpu *vcpu),

	TP_ARGS(r, vcpu),



	TP_STRUCT__entry(

		__field(	unsigned int,	r		)

		__field(	unsigned long,	pc		)

	),



	TP_fast_assign(

		__entry->r		= r;

		__entry->pc		= kvmppc_get_pc(vcpu);

	),



	TP_printk("reentry r=%d | pc=0x%lx", __entry->r, __entry->pc)

);



#endif /* CONFIG_PPC_BOOK3S */



#endif /* _TRACE_KVM_H */



/* This part must be outside protection */