#define LTTNG_TRACE_KVM_MMU_H
#include "../../../../../../probes/lttng-tracepoint-event.h"
-#include <linux/ftrace_event.h>
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+#include <linux/trace_events.h>
+#else /* if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
+#include <linux/ftrace_event.h>
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
+
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm_mmu
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
#define LTTNG_KVM_MMU_PAGE_FIELDS \
+ ctf_integer(unsigned long, mmu_valid_gen, (sp)->mmu_valid_gen) \
ctf_integer(__u64, gfn, (sp)->gfn) \
ctf_integer(__u32, role, (sp)->role.word) \
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+
+#define LTTNG_KVM_MMU_PAGE_FIELDS \
+ ctf_integer(__u64, gfn, (sp)->gfn) \
+ ctf_integer(__u32, role, (sp)->role.word) \
+ ctf_integer(__u32, root_count, (sp)->root_count) \
+ ctf_integer(bool, unsync, (sp)->unsync)
+
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+
/*
* A pagetable walk has started
*/
TP_ARGS(sptep, gfn, access, gen),
TP_FIELDS(
- ctf_integer(void *, sptep, sptep)
+ ctf_integer_hex(void *, sptep, sptep)
ctf_integer(gfn_t, gfn, gfn)
ctf_integer(unsigned, access, access)
ctf_integer(unsigned int, gen, gen)
TP_ARGS(sptep, gfn, access),
TP_FIELDS(
- ctf_integer(void *, sptep, sptep)
+ ctf_integer_hex(void *, sptep, sptep)
ctf_integer(gfn_t, gfn, gfn)
ctf_integer(unsigned, access, access)
)
ctf_integer(int, vcpu_id, vcpu->vcpu_id)
ctf_integer(gva_t, gva, gva)
ctf_integer(u32, error_code, error_code)
- ctf_integer(u64 *, sptep, sptep)
+ ctf_integer_hex(u64 *, sptep, sptep)
ctf_integer(u64, old_spte, old_spte)
ctf_integer(u64, new_spte, *sptep)
ctf_integer(bool, retry, retry)