From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: [patch 3/3] KVM: x86: add tracepoint to wait_lapic_expire
Date: Mon, 15 Dec 2014 17:06:08 -0500
Message-ID: <20141215220917.035037123@redhat.com>
References: <20141215220605.806000829@redhat.com>
Cc: Luiz Capitulino <lcapitulino@redhat.com>,
	Rik van Riel <riel@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Radim Krcmar <rkrcmar@redhat.com>,
	Marcelo Tosatti <mtosatti@redhat.com>
To: kvm@vger.kernel.org
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:45418 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750882AbaLOWKz (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 15 Dec 2014 17:10:55 -0500
Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBFMAt1A009352
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL)
	for <kvm@vger.kernel.org>; Mon, 15 Dec 2014 17:10:55 -0500
Content-Disposition: inline; filename=lapic-wait-tracepoint
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Add tracepoint to wait_lapic_expire.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: kvm/arch/x86/kvm/lapic.c
===================================================================
--- kvm.orig/arch/x86/kvm/lapic.c
+++ kvm/arch/x86/kvm/lapic.c
@@ -1121,6 +1121,7 @@ void wait_lapic_expire(struct kvm_vcpu *
 {
 	struct kvm_lapic *apic = vcpu->arch.apic;
 	u64 guest_tsc, tsc_deadline;
+	unsigned int total_delay = 0;
 
 	if (!kvm_vcpu_has_lapic(vcpu))
 		return;
@@ -1138,9 +1139,13 @@ void wait_lapic_expire(struct kvm_vcpu *
 	while (guest_tsc < tsc_deadline) {
 		int delay = min(tsc_deadline - guest_tsc, 1000ULL);
 
+		total_delay += delay;
+
 		__delay(delay);
 		guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu, native_read_tsc());
 	}
+
+	trace_kvm_wait_lapic_expire(vcpu->vcpu_id, total_delay);
 }
 
 static void start_apic_timer(struct kvm_lapic *apic)
Index: kvm/arch/x86/kvm/trace.h
===================================================================
--- kvm.orig/arch/x86/kvm/trace.h
+++ kvm/arch/x86/kvm/trace.h
@@ -914,6 +914,25 @@ TRACE_EVENT(kvm_pvclock_update,
 		  __entry->flags)
 );
 
+TRACE_EVENT(kvm_wait_lapic_expire,
+	TP_PROTO(unsigned int vcpu_id, unsigned int total_delay),
+	TP_ARGS(vcpu_id, total_delay),
+
+	TP_STRUCT__entry(
+		__field(	unsigned int,	vcpu_id			)
+		__field(	unsigned int,	total_delay		)
+	),
+
+	TP_fast_assign(
+		__entry->vcpu_id	   = vcpu_id;
+		__entry->total_delay	   = total_delay;
+	),
+
+	TP_printk("vcpu %u: total_delay %u",
+		  __entry->vcpu_id,
+		  __entry->total_delay)
+);
+
 #endif /* _TRACE_KVM_H */
 
 #undef TRACE_INCLUDE_PATH