X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Farch%2Fx86%2Fkvm%2Fmmutrace.h;h=45b621d62b146ed72d13db5b5d3df4324e6595fc;hb=92e7fc0251da026f756f648fea5639cfdd746fff;hp=e20cda20560a68dd4d7587f34ee441a9240f34fb;hpb=f4c179bc0f69ca4e5de78bf73bca334c21083986;p=lttng-modules.git

diff --git a/include/instrumentation/events/arch/x86/kvm/mmutrace.h b/include/instrumentation/events/arch/x86/kvm/mmutrace.h
index e20cda20..45b621d6 100644
--- a/include/instrumentation/events/arch/x86/kvm/mmutrace.h
+++ b/include/instrumentation/events/arch/x86/kvm/mmutrace.h
@@ -5,11 +5,7 @@
 #include <lttng/tracepoint-event.h>
 #include <lttng/kernel-version.h>
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0))
 #include <linux/trace_events.h>
-#else /* if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
-#include <linux/ftrace_event.h>
-#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm_mmu
@@ -23,7 +19,7 @@
 	ctf_integer(__u32, root_count, (sp)->root_count) \
 	ctf_integer(bool, unsync, (sp)->unsync)
 
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0))
+#else
 
 #define LTTNG_KVM_MMU_PAGE_FIELDS \
 	ctf_integer(unsigned long, mmu_valid_gen, (sp)->mmu_valid_gen) \
@@ -32,17 +28,8 @@
 	ctf_integer(__u32, root_count, (sp)->root_count) \
 	ctf_integer(bool, unsync, (sp)->unsync)
 
-#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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 (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) */
+#endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,6,0))
 /*
  * A pagetable walk has started
  */
@@ -56,23 +43,6 @@ LTTNG_TRACEPOINT_EVENT(
 		ctf_integer(__u32, pferr, pferr)
 	)
 )
-#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,6,0)) */
-/*
- * A pagetable walk has started
- */
-LTTNG_TRACEPOINT_EVENT(
-	kvm_mmu_pagetable_walk,
-	TP_PROTO(u64 addr, int write_fault, int user_fault, int fetch_fault),
-	TP_ARGS(addr, write_fault, user_fault, fetch_fault),
-
-	TP_FIELDS(
-		ctf_integer_hex(__u64, addr, addr)
-		ctf_integer(__u32, pferr,
-			(!!write_fault << 1) | (!!user_fault << 2)
-			| (!!fetch_fault << 4))
-	)
-)
-#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,6,0)) */
 
 /* We just walked a paging element */
 LTTNG_TRACEPOINT_EVENT(
@@ -163,7 +133,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_prepare_zap_page,
 	TP_ARGS(sp)
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
 
 LTTNG_TRACEPOINT_EVENT_MAP(
 	mark_mmio_spte,
@@ -181,7 +152,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 	)
 )
 
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0))
+#else
 
 LTTNG_TRACEPOINT_EVENT_MAP(
 	mark_mmio_spte,
@@ -198,25 +169,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 		ctf_integer(unsigned int, gen, gen)
 	)
 )
-
-#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) */
-
-LTTNG_TRACEPOINT_EVENT_MAP(
-	mark_mmio_spte,
-
-	kvm_mmu_mark_mmio_spte,
-
-	TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
-	TP_ARGS(sptep, gfn, access),
-
-	TP_FIELDS(
-		ctf_integer_hex(void *, sptep, sptep)
-		ctf_integer(gfn_t, gfn, gfn)
-		ctf_integer(unsigned, access, access)
-	)
-)
-
-#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0)) */
+#endif
 
 LTTNG_TRACEPOINT_EVENT_MAP(
 	handle_mmio_page_fault,
@@ -253,7 +206,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 		ctf_integer(int, ret, ret)
 	)
 )
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,10,0) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT_MAP(
 	fast_page_fault,