X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fcompaction.h;h=7d0c2623fba1d4949aaa12a7af20c2d360e93659;hb=d8379ec6365a925db33cae94fb6783cdbdb6a922;hp=72925c14d55d98a02f467b75d06fb5206ea67b4d;hpb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;p=lttng-modules.git

diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h
index 72925c14..7d0c2623 100644
--- a/include/instrumentation/events/compaction.h
+++ b/include/instrumentation/events/compaction.h
@@ -7,9 +7,7 @@
 
 #include <lttng/tracepoint-event.h>
 #include <linux/types.h>
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
+#include <lttng/kernel-version.h>
 
 LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
 
@@ -56,50 +54,38 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
 	TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
 )
 
-#else /* #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) */
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0))
+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
 
-LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
+	compaction_migratepages,
 
-	TP_PROTO(unsigned long nr_scanned,
-		unsigned long nr_taken),
+	TP_PROTO(struct compact_control *cc,
+		unsigned int nr_succeeded),
 
-	TP_ARGS(nr_scanned, nr_taken),
+	TP_ARGS(cc, nr_succeeded),
 
 	TP_FIELDS(
-		ctf_integer(unsigned long, nr_scanned, nr_scanned)
-		ctf_integer(unsigned long, nr_taken, nr_taken)
+		ctf_integer(unsigned long, nr_migrated, nr_succeeded)
+		ctf_integer(unsigned long, nr_failed, cc->nr_migratepages - nr_succeeded)
 	)
 )
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
-
-	mm_compaction_isolate_migratepages,
-
-	compaction_isolate_migratepages,
-
-	TP_PROTO(unsigned long nr_scanned,
-		unsigned long nr_taken),
-
-	TP_ARGS(nr_scanned, nr_taken)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
-
-	mm_compaction_isolate_freepages,
+	compaction_migratepages,
 
-	compaction_isolate_freepages,
+	TP_PROTO(unsigned long nr_all,
+		unsigned int nr_succeeded),
 
-	TP_PROTO(unsigned long nr_scanned,
-		unsigned long nr_taken),
+	TP_ARGS(nr_all, nr_succeeded),
 
-	TP_ARGS(nr_scanned, nr_taken)
+	TP_FIELDS(
+		ctf_integer(unsigned long, nr_migrated, nr_succeeded)
+		ctf_integer(unsigned long, nr_failed, nr_all - nr_succeeded)
+	)
 )
-
-#endif /* #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) */
-
-#if LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \
-	LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+#else
 LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages,
 
 	compaction_migratepages,
@@ -135,22 +121,7 @@ LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages,
 
 	TP_code_post()
 )
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
-LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
-
-	compaction_migratepages,
-
-	TP_PROTO(unsigned long nr_migrated,
-		unsigned long nr_failed),
-
-	TP_ARGS(nr_migrated, nr_failed),
-
-	TP_FIELDS(
-		ctf_integer(unsigned long, nr_migrated, nr_migrated)
-		ctf_integer(unsigned long, nr_failed, nr_failed)
-	)
-)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
+#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,16,0)) */
 
 #endif /* LTTNG_TRACE_COMPACTION_H */