Fix: mmutrace warnings about redefined macros
[lttng-modules.git] / instrumentation / events / lttng-module / arch / x86 / kvm / mmutrace.h
index 56ddbabf3cb9bb09adbee7a388960b16b766f1f9..bbfce67884794fc29c172a349ff03caf80dade22 100644 (file)
@@ -1,12 +1,34 @@
-#if !defined(_TRACE_KVMMMU_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_KVMMMU_H
+#if !defined(LTTNG_TRACE_KVMMMU_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_KVMMMU_H
 
-#include <linux/tracepoint.h>
+#include "../../../../../../probes/lttng-tracepoint-event.h"
 #include <linux/ftrace_event.h>
+#include <linux/version.h>
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvmmmu
 
+#undef KVM_MMU_PAGE_FIELDS
+#undef KVM_MMU_PAGE_ASSIGN
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+#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)                             \
+       tp_assign(mmu_valid_gen, sp->mmu_valid_gen)  \
+       tp_assign(gfn, sp->gfn)                      \
+       tp_assign(role, sp->role.word)               \
+       tp_assign(root_count, sp->root_count)        \
+       tp_assign(unsync, sp->unsync)
+
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+
 #define KVM_MMU_PAGE_FIELDS \
        __field(__u64, gfn) \
        __field(__u32, role) \
        tp_assign(root_count, sp->root_count)        \
        tp_assign(unsync, sp->unsync)
 
-#define KVM_MMU_PAGE_PRINTK() ({                                       \
-       const char *ret = p->buffer + p->len;                           \
-       static const char *access_str[] = {                             \
-               "---", "--x", "w--", "w-x", "-u-", "-ux", "wu-", "wux"  \
-       };                                                              \
-       union kvm_mmu_page_role role;                                   \
-                                                                       \
-       role.word = __entry->role;                                      \
-                                                                       \
-       trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s"               \
-                        " %snxe root %u %s%c",                         \
-                        __entry->gfn, role.level,                      \
-                        role.cr4_pae ? " pae" : "",                    \
-                        role.quadrant,                                 \
-                        role.direct ? " direct" : "",                  \
-                        access_str[role.access],                       \
-                        role.invalid ? " invalid" : "",                \
-                        role.nxe ? "" : "!",                           \
-                        __entry->root_count,                           \
-                        __entry->unsync ? "unsync" : "sync", 0);       \
-       ret;                                                            \
-               })
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
 
 #define kvm_mmu_trace_pferr_flags       \
        { PFERR_PRESENT_MASK, "P" },    \
@@ -52,7 +53,7 @@
 /*
  * A pagetable walk has started
  */
-TRACE_EVENT(
+LTTNG_TRACEPOINT_EVENT(
        kvm_mmu_pagetable_walk,
        TP_PROTO(u64 addr, u32 pferr),
        TP_ARGS(addr, pferr),
@@ -73,7 +74,7 @@ TRACE_EVENT(
 
 
 /* We just walked a paging element */
-TRACE_EVENT(
+LTTNG_TRACEPOINT_EVENT(
        kvm_mmu_paging_element,
        TP_PROTO(u64 pte, int level),
        TP_ARGS(pte, level),
@@ -91,7 +92,7 @@ TRACE_EVENT(
        TP_printk("pte %llx level %u", __entry->pte, __entry->level)
 )
 
-DECLARE_EVENT_CLASS(kvm_mmu_set_bit_class,
+LTTNG_TRACEPOINT_EVENT_CLASS(kvm_mmu_set_bit_class,
 
        TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
 
@@ -110,7 +111,7 @@ DECLARE_EVENT_CLASS(kvm_mmu_set_bit_class,
 )
 
 /* We set a pte accessed bit */
-DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_accessed_bit,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_set_bit_class, kvm_mmu_set_accessed_bit,
 
        TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
 
@@ -118,14 +119,14 @@ DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_accessed_bit,
 )
 
 /* We set a pte dirty bit */
-DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_dirty_bit,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_set_bit_class, kvm_mmu_set_dirty_bit,
 
        TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
 
        TP_ARGS(table_gfn, index, size)
 )
 
-TRACE_EVENT(
+LTTNG_TRACEPOINT_EVENT(
        kvm_mmu_walker_error,
        TP_PROTO(u32 pferr),
        TP_ARGS(pferr),
@@ -142,7 +143,7 @@ TRACE_EVENT(
                  __print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags))
 )
 
-TRACE_EVENT(
+LTTNG_TRACEPOINT_EVENT(
        kvm_mmu_get_page,
        TP_PROTO(struct kvm_mmu_page *sp, bool created),
        TP_ARGS(sp, created),
@@ -157,11 +158,10 @@ TRACE_EVENT(
                tp_assign(created, created)
                ),
 
-       TP_printk("%s %s", KVM_MMU_PAGE_PRINTK(),
-                 __entry->created ? "new" : "existing")
+       TP_printk()
 )
 
-DECLARE_EVENT_CLASS(kvm_mmu_page_class,
+LTTNG_TRACEPOINT_EVENT_CLASS(kvm_mmu_page_class,
 
        TP_PROTO(struct kvm_mmu_page *sp),
        TP_ARGS(sp),
@@ -174,28 +174,55 @@ DECLARE_EVENT_CLASS(kvm_mmu_page_class,
                KVM_MMU_PAGE_ASSIGN(sp)
        ),
 
-       TP_printk("%s", KVM_MMU_PAGE_PRINTK())
+       TP_printk()
 )
 
-DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_sync_page,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_sync_page,
        TP_PROTO(struct kvm_mmu_page *sp),
 
        TP_ARGS(sp)
 )
 
-DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_unsync_page,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_unsync_page,
        TP_PROTO(struct kvm_mmu_page *sp),
 
        TP_ARGS(sp)
 )
 
-DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_prepare_zap_page,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_prepare_zap_page,
        TP_PROTO(struct kvm_mmu_page *sp),
 
        TP_ARGS(sp)
 )
 
-TRACE_EVENT(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT(
+       mark_mmio_spte,
+       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(
+               tp_assign(sptep, sptep)
+               tp_assign(gfn, gfn)
+               tp_assign(access, access)
+               tp_assign(gen, gen)
+       ),
+
+       TP_printk("sptep:%p gfn %llx access %x", __entry->sptep, __entry->gfn,
+                 __entry->access)
+)
+
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+
+LTTNG_TRACEPOINT_EVENT(
        mark_mmio_spte,
        TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
        TP_ARGS(sptep, gfn, access),
@@ -216,7 +243,9 @@ TRACE_EVENT(
                  __entry->access)
 )
 
-TRACE_EVENT(
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+
+LTTNG_TRACEPOINT_EVENT(
        handle_mmio_page_fault,
        TP_PROTO(u64 addr, gfn_t gfn, unsigned access),
        TP_ARGS(addr, gfn, access),
@@ -240,7 +269,7 @@ TRACE_EVENT(
 #define __spte_satisfied(__spte)                               \
        (__entry->retry && is_writable_pte(__entry->__spte))
 
-TRACE_EVENT(
+LTTNG_TRACEPOINT_EVENT(
        fast_page_fault,
        TP_PROTO(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,
                 u64 *sptep, u64 old_spte, bool retry),
@@ -274,7 +303,7 @@ TRACE_EVENT(
                  __spte_satisfied(old_spte), __spte_satisfied(new_spte)
        )
 )
-#endif /* _TRACE_KVMMMU_H */
+#endif /* LTTNG_TRACE_KVMMMU_H */
 
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm
This page took 0.027417 seconds and 4 git commands to generate.