From 4d9d6a2cf95000c0b562bd7ff0caed8358d8250d Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Wed, 20 Jun 2012 15:59:41 +0800
Subject: [PATCH] --- yaml --- r: 315903 b: refs/heads/master c:
 a72faf2504dfc12ff9bfb486a42f2761296666ff h: refs/heads/master i:   315901:
 c880c7a5c17e8fd33fa69d1ad73a9823609640d1   315899:
 24d31b05a15eec227bf85ded6db409b56c470b49   315895:
 4e0ddfe7fbf2d3e189539414d72b4e83aafbea26   315887:
 77beab01a46587dd199e2dcfeee5e5727aac9fc6   315871:
 d9d2e013929396e72f2acbb8c46fc4b378914491   315839:
 c948ee773ac1ec0f4295d65aa5e22aa18b89b5bf   315775:
 c209776d604d9555fe32aee6fee64df673f328bc   315647:
 8df9f2fbab2fc63d1e1ac6292e68b0d2d69fc7a5   315391:
 759ec0d58a0b327959a09290fe1a308eaff7007d v: v3

---
 [refs]                        |  2 +-
 trunk/arch/x86/kvm/mmu.c      |  2 ++
 trunk/arch/x86/kvm/mmutrace.h | 38 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5ae443a68efa..a26e8cfbc4af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7ba5b48cc8ddc015a9e0463813ca1e60bc42c59
+refs/heads/master: a72faf2504dfc12ff9bfb486a42f2761296666ff
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index 8637bffbdb4a..28c8fbcc6763 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -2776,6 +2776,8 @@ static bool fast_page_fault(struct kvm_vcpu *vcpu, gva_t gva, int level,
 	 */
 	ret = fast_pf_fix_direct_spte(vcpu, iterator.sptep, spte);
 exit:
+	trace_fast_page_fault(vcpu, gva, error_code, iterator.sptep,
+			      spte, ret);
 	walk_shadow_page_lockless_end(vcpu);
 
 	return ret;
diff --git a/trunk/arch/x86/kvm/mmutrace.h b/trunk/arch/x86/kvm/mmutrace.h
index 89fb0e81322a..c364abc8d034 100644
--- a/trunk/arch/x86/kvm/mmutrace.h
+++ b/trunk/arch/x86/kvm/mmutrace.h
@@ -243,6 +243,44 @@ TRACE_EVENT(
 	TP_printk("addr:%llx gfn %llx access %x", __entry->addr, __entry->gfn,
 		  __entry->access)
 );
+
+#define __spte_satisfied(__spte)				\
+	(__entry->retry && is_writable_pte(__entry->__spte))
+
+TRACE_EVENT(
+	fast_page_fault,
+	TP_PROTO(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,
+		 u64 *sptep, u64 old_spte, bool retry),
+	TP_ARGS(vcpu, gva, error_code, sptep, old_spte, retry),
+
+	TP_STRUCT__entry(
+		__field(int, vcpu_id)
+		__field(gva_t, gva)
+		__field(u32, error_code)
+		__field(u64 *, sptep)
+		__field(u64, old_spte)
+		__field(u64, new_spte)
+		__field(bool, retry)
+	),
+
+	TP_fast_assign(
+		__entry->vcpu_id = vcpu->vcpu_id;
+		__entry->gva = gva;
+		__entry->error_code = error_code;
+		__entry->sptep = sptep;
+		__entry->old_spte = old_spte;
+		__entry->new_spte = *sptep;
+		__entry->retry = retry;
+	),
+
+	TP_printk("vcpu %d gva %lx error_code %s sptep %p old %#llx"
+		  " new %llx spurious %d fixed %d", __entry->vcpu_id,
+		  __entry->gva, __print_flags(__entry->error_code, "|",
+		  kvm_mmu_trace_pferr_flags), __entry->sptep,
+		  __entry->old_spte, __entry->new_spte,
+		  __spte_satisfied(old_spte), __spte_satisfied(new_spte)
+	)
+);
 #endif /* _TRACE_KVMMMU_H */
 
 #undef TRACE_INCLUDE_PATH