1 files changed, 35 insertions, 49 deletions

diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index 3e4a5c6ca2a9..42f07b1bfbc9 100644
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -6,14 +6,12 @@
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvmmmu
-#define TRACE_INCLUDE_PATH .
-#define TRACE_INCLUDE_FILE mmutrace
 
 #define KVM_MMU_PAGE_FIELDS \
         __field(__u64, gfn) \
         __field(__u32, role) \
         __field(__u32, root_count) \
-        __field(__u32, unsync)
+        __field(bool, unsync)
 
 #define KVM_MMU_PAGE_ASSIGN(sp)                      \
         __entry->gfn = sp->gfn;                      \
@@ -30,14 +28,14 @@
                                                                         \
         role.word = __entry->role;                                      \
                                                                         \
-        trace_seq_printf(p, "sp gfn %llx %u/%u q%u%s %s%s %spge"        \
+        trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s"               \
                          " %snxe root %u %s%c",                         \
-                         __entry->gfn, role.level, role.glevels,        \
+                         __entry->gfn, role.level,                      \
+                         role.cr4_pae ? " pae" : "",                    \
                          role.quadrant,                                 \
                          role.direct ? " direct" : "",                  \
                          access_str[role.access],                       \
                          role.invalid ? " invalid" : "",                \
-                         role.cr4_pge ? "" : "!",                       \
                          role.nxe ? "" : "!",                           \
                          __entry->root_count,                           \
                          __entry->unsync ? "unsync" : "sync", 0);       \
@@ -94,15 +92,15 @@ TRACE_EVENT(
         TP_printk("pte %llx level %u", __entry->pte, __entry->level)
 );
 
-/* We set a pte accessed bit */
-TRACE_EVENT(
-        kvm_mmu_set_accessed_bit,
+DECLARE_EVENT_CLASS(kvm_mmu_set_bit_class,
+
         TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
+
         TP_ARGS(table_gfn, index, size),
 
         TP_STRUCT__entry(
                 __field(__u64, gpa)
-                ),
+        ),
 
         TP_fast_assign(
                 __entry->gpa = ((u64)table_gfn << PAGE_SHIFT)
@@ -112,22 +110,20 @@ TRACE_EVENT(
         TP_printk("gpa %llx", __entry->gpa)
 );
 
-/* We set a pte dirty bit */
-TRACE_EVENT(
-        kvm_mmu_set_dirty_bit,
+/* We set a pte accessed bit */
+DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_accessed_bit,
+
         TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
-        TP_ARGS(table_gfn, index, size),
 
-        TP_STRUCT__entry(
-                __field(__u64, gpa)
-                ),
+        TP_ARGS(table_gfn, index, size)
+);
 
-        TP_fast_assign(
-                __entry->gpa = ((u64)table_gfn << PAGE_SHIFT)
-                                + index * size;
-                ),
+/* We set a pte dirty bit */
+DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_dirty_bit,
 
-        TP_printk("gpa %llx", __entry->gpa)
+        TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
+
+        TP_ARGS(table_gfn, index, size)
 );
 
 TRACE_EVENT(
@@ -166,55 +162,45 @@ TRACE_EVENT(
                   __entry->created ? "new" : "existing")
 );
 
-TRACE_EVENT(
-        kvm_mmu_sync_page,
+DECLARE_EVENT_CLASS(kvm_mmu_page_class,
+
         TP_PROTO(struct kvm_mmu_page *sp),
         TP_ARGS(sp),
 
         TP_STRUCT__entry(
                 KVM_MMU_PAGE_FIELDS
-                ),
+        ),
 
         TP_fast_assign(
                 KVM_MMU_PAGE_ASSIGN(sp)
-                ),
+        ),
 
         TP_printk("%s", KVM_MMU_PAGE_PRINTK())
 );
 
-TRACE_EVENT(
-        kvm_mmu_unsync_page,
+DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_sync_page,
         TP_PROTO(struct kvm_mmu_page *sp),
-        TP_ARGS(sp),
-
-        TP_STRUCT__entry(
-                KVM_MMU_PAGE_FIELDS
-                ),
 
-        TP_fast_assign(
-                KVM_MMU_PAGE_ASSIGN(sp)
-                ),
-
-        TP_printk("%s", KVM_MMU_PAGE_PRINTK())
+        TP_ARGS(sp)
 );
 
-TRACE_EVENT(
-        kvm_mmu_zap_page,
+DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_unsync_page,
         TP_PROTO(struct kvm_mmu_page *sp),
-        TP_ARGS(sp),
 
-        TP_STRUCT__entry(
-                KVM_MMU_PAGE_FIELDS
-                ),
+        TP_ARGS(sp)
+);
 
-        TP_fast_assign(
-                KVM_MMU_PAGE_ASSIGN(sp)
-                ),
+DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_zap_page,
+        TP_PROTO(struct kvm_mmu_page *sp),
 
-        TP_printk("%s", KVM_MMU_PAGE_PRINTK())
+        TP_ARGS(sp)
 );
-
 #endif /* _TRACE_KVMMMU_H */
 
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE mmutrace
+
 /* This part must be outside protection */
 #include <trace/define_trace.h>