From c726cda2c0787737be3805d833b7ea54ce6ca096 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 2 Aug 2010 12:51:07 +0200
Subject: [PATCH] --- yaml --- r: 215823 b: refs/heads/master c:
 4c4eea7769d0099ea09f9bdb7aed1cc61d57c9d6 h: refs/heads/master i:   215821:
 afb1a6a4bb20b37ea304bcc358c11f366105b86b   215819:
 e2e04f4f66db34d8692fd66cf73b6dcc8f636e40   215815:
 8cde2fdfdb65219740ccbe1d96b15c7b69f0dc6d   215807:
 499f63008a1eb2315bb21135f371b6266ef4f0b8 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/powerpc/kvm/book3s_mmu_hpte.c |  3 +++
 trunk/arch/powerpc/kvm/trace.h           | 29 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b5f127f41da..934c50ad8436 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82fdee7bce546c3ce38dcf0db6096eea73dbe7bd
+refs/heads/master: 4c4eea7769d0099ea09f9bdb7aed1cc61d57c9d6
diff --git a/trunk/arch/powerpc/kvm/book3s_mmu_hpte.c b/trunk/arch/powerpc/kvm/book3s_mmu_hpte.c
index 02c64ab99c97..ac94bd992564 100644
--- a/trunk/arch/powerpc/kvm/book3s_mmu_hpte.c
+++ b/trunk/arch/powerpc/kvm/book3s_mmu_hpte.c
@@ -21,6 +21,7 @@
 #include <linux/kvm_host.h>
 #include <linux/hash.h>
 #include <linux/slab.h>
+#include "trace.h"
 
 #include <asm/kvm_ppc.h>
 #include <asm/kvm_book3s.h>
@@ -66,6 +67,8 @@ void kvmppc_mmu_hpte_cache_map(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
 {
 	u64 index;
 
+	trace_kvm_book3s_mmu_map(pte);
+
 	spin_lock(&vcpu->arch.mmu_lock);
 
 	/* Add to ePTE list */
diff --git a/trunk/arch/powerpc/kvm/trace.h b/trunk/arch/powerpc/kvm/trace.h
index 8ed6f1c7c86e..68a84442d799 100644
--- a/trunk/arch/powerpc/kvm/trace.h
+++ b/trunk/arch/powerpc/kvm/trace.h
@@ -181,6 +181,35 @@ TRACE_EVENT(kvm_book3s_64_mmu_map,
 
 #endif /* CONFIG_PPC_BOOK3S_64 */
 
+TRACE_EVENT(kvm_book3s_mmu_map,
+	TP_PROTO(struct hpte_cache *pte),
+	TP_ARGS(pte),
+
+	TP_STRUCT__entry(
+		__field(	u64,		host_va		)
+		__field(	u64,		pfn		)
+		__field(	ulong,		eaddr		)
+		__field(	u64,		vpage		)
+		__field(	ulong,		raddr		)
+		__field(	int,		flags		)
+	),
+
+	TP_fast_assign(
+		__entry->host_va	= pte->host_va;
+		__entry->pfn		= pte->pfn;
+		__entry->eaddr		= pte->pte.eaddr;
+		__entry->vpage		= pte->pte.vpage;
+		__entry->raddr		= pte->pte.raddr;
+		__entry->flags		= (pte->pte.may_read ? 0x4 : 0) |
+					  (pte->pte.may_write ? 0x2 : 0) |
+					  (pte->pte.may_execute ? 0x1 : 0);
+	),
+
+	TP_printk("Map: hva=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]",
+		  __entry->host_va, __entry->pfn, __entry->eaddr,
+		  __entry->vpage, __entry->raddr, __entry->flags)
+);
+
 #endif /* CONFIG_PPC_BOOK3S */
 
 #endif /* _TRACE_KVM_H */