1 files changed, 62 insertions, 14 deletions

diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index b8f6172f4174..9d2e0ffcb190 100644
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -7,16 +7,18 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvmmmu
 
-#define KVM_MMU_PAGE_FIELDS \
-        __field(__u64, gfn) \
-        __field(__u32, role) \
-        __field(__u32, root_count) \
+#define KVM_MMU_PAGE_FIELDS                     \
+        __field(unsigned long, mmu_valid_gen)   \
+        __field(__u64, gfn)                     \
+        __field(__u32, role)                    \
+        __field(__u32, root_count)              \
         __field(bool, unsync)
 
-#define KVM_MMU_PAGE_ASSIGN(sp)                      \
-        __entry->gfn = sp->gfn;                      \
-        __entry->role = sp->role.word;               \
-        __entry->root_count = sp->root_count;        \
+#define KVM_MMU_PAGE_ASSIGN(sp)                         \
+        __entry->mmu_valid_gen = sp->mmu_valid_gen;     \
+        __entry->gfn = sp->gfn;                         \
+        __entry->role = sp->role.word;                  \
+        __entry->root_count = sp->root_count;           \
         __entry->unsync = sp->unsync;
 
 #define KVM_MMU_PAGE_PRINTK() ({                                        \
@@ -28,8 +30,8 @@
                                                                         \
         role.word = __entry->role;                                      \
                                                                         \
-        trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s"               \
-                         " %snxe root %u %s%c",                         \
+        trace_seq_printf(p, "sp gen %lx gfn %llx %u%s q%u%s %s%s"       \
+                         " %snxe root %u %s%c", __entry->mmu_valid_gen, \
                          __entry->gfn, role.level,                      \
                          role.cr4_pae ? " pae" : "",                    \
                          role.quadrant,                                 \
@@ -197,23 +199,25 @@ DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_prepare_zap_page,
 
 TRACE_EVENT(
         mark_mmio_spte,
-        TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
-        TP_ARGS(sptep, gfn, access),
+        TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access, unsigned int gen),
+        TP_ARGS(sptep, gfn, access, gen),
 
         TP_STRUCT__entry(
                 __field(void *, sptep)
                 __field(gfn_t, gfn)
                 __field(unsigned, access)
+                __field(unsigned int, gen)
         ),
 
         TP_fast_assign(
                 __entry->sptep = sptep;
                 __entry->gfn = gfn;
                 __entry->access = access;
+                __entry->gen = gen;
         ),
 
-        TP_printk("sptep:%p gfn %llx access %x", __entry->sptep, __entry->gfn,
-                  __entry->access)
+        TP_printk("sptep:%p gfn %llx access %x gen %x", __entry->sptep,
+                  __entry->gfn, __entry->access, __entry->gen)
 );
 
 TRACE_EVENT(
@@ -274,6 +278,50 @@ TRACE_EVENT(
                   __spte_satisfied(old_spte), __spte_satisfied(new_spte)
         )
 );
+
+TRACE_EVENT(
+        kvm_mmu_invalidate_zap_all_pages,
+        TP_PROTO(struct kvm *kvm),
+        TP_ARGS(kvm),
+
+        TP_STRUCT__entry(
+                __field(unsigned long, mmu_valid_gen)
+                __field(unsigned int, mmu_used_pages)
+        ),
+
+        TP_fast_assign(
+                __entry->mmu_valid_gen = kvm->arch.mmu_valid_gen;
+                __entry->mmu_used_pages = kvm->arch.n_used_mmu_pages;
+        ),
+
+        TP_printk("kvm-mmu-valid-gen %lx used_pages %x",
+                  __entry->mmu_valid_gen, __entry->mmu_used_pages
+        )
+);
+
+
+TRACE_EVENT(
+        check_mmio_spte,
+        TP_PROTO(u64 spte, unsigned int kvm_gen, unsigned int spte_gen),
+        TP_ARGS(spte, kvm_gen, spte_gen),
+
+        TP_STRUCT__entry(
+                __field(unsigned int, kvm_gen)
+                __field(unsigned int, spte_gen)
+                __field(u64, spte)
+        ),
+
+        TP_fast_assign(
+                __entry->kvm_gen = kvm_gen;
+                __entry->spte_gen = spte_gen;
+                __entry->spte = spte;
+        ),
+
+        TP_printk("spte %llx kvm_gen %x spte-gen %x valid %d", __entry->spte,
+                  __entry->kvm_gen, __entry->spte_gen,
+                  __entry->kvm_gen == __entry->spte_gen
+        )
+);
 #endif /* _TRACE_KVMMMU_H */
 
 #undef TRACE_INCLUDE_PATH