Commit 0ac406de authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: Add tracepoint for nested vmrun 



This patch adds a dedicated kvm tracepoint for a nested
vmrun.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent cd3ff653

arch/x86/kvm/svm.c

+6 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,12 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 
	/* nested_vmcb is our indicator if nested SVM is activated */

	svm->nested.vmcb = svm->vmcb->save.rax;



	trace_kvm_nested_vmrun(svm->vmcb->save.rip - 3, svm->nested.vmcb,

			       nested_vmcb->save.rip,

			       nested_vmcb->control.int_ctl,

			       nested_vmcb->control.event_inj,

			       nested_vmcb->control.nested_ctl);



	/* Clear internal status */

	kvm_clear_exception_queue(&svm->vcpu);

	kvm_clear_interrupt_queue(&svm->vcpu);

arch/x86/kvm/trace.h

+33 −0
Original line number Diff line number Diff line
@@ -349,6 +349,39 @@ TRACE_EVENT(kvm_apic_accept_irq, 
		  __entry->coalesced ? " (coalesced)" : "")

);



/*

 * Tracepoint for nested VMRUN

 */

TRACE_EVENT(kvm_nested_vmrun,

	    TP_PROTO(__u64 rip, __u64 vmcb, __u64 nested_rip, __u32 int_ctl,

		     __u32 event_inj, bool npt),

	    TP_ARGS(rip, vmcb, nested_rip, int_ctl, event_inj, npt),



	TP_STRUCT__entry(

		__field(	__u64,		rip		)

		__field(	__u64,		vmcb		)

		__field(	__u64,		nested_rip	)

		__field(	__u32,		int_ctl		)

		__field(	__u32,		event_inj	)

		__field(	bool,		npt		)

	),



	TP_fast_assign(

		__entry->rip		= rip;

		__entry->vmcb		= vmcb;

		__entry->nested_rip	= nested_rip;

		__entry->int_ctl	= int_ctl;

		__entry->event_inj	= event_inj;

		__entry->npt		= npt;

	),



	TP_printk("rip: 0x%016llx vmcb: 0x%016llx nrip: 0x%016llx int_ctl: 0x%08x "

		  "event_inj: 0x%08x npt: %s\n",

		__entry->rip, __entry->vmcb, __entry->nested_rip,

		__entry->int_ctl, __entry->event_inj,

		__entry->npt ? "on" : "off")

);



#endif /* _TRACE_KVM_H */



/* This part must be outside protection */

arch/x86/kvm/x86.c

+1 −0
Original line number Diff line number Diff line
@@ -4984,3 +4984,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq); 
EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_page_fault);

EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_msr);

EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_cr);

EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_nested_vmrun);