instrumentation: kmem: remove compatibility code

[lttng-modules.git] / instrumentation / events / lttng-module / kmem.h

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index b8dc524eba1ceb8c83bd344f2a05296035bf0b3b..479f0fef3fc1ede0ff1243580b315531276cf266 100644 (file)
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -1,15 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kmem
 
 #if !defined(LTTNG_TRACE_KMEM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KMEM_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/types.h>
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-#include <trace/events/gfpflags.h>
-#endif
 
 LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
 
@@ -117,12 +114,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free,
        TP_ARGS(call_site, ptr)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free,
-#else
-LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct,
-#endif
 
        TP_PROTO(struct page *page, unsigned int order),
 
@@ -130,23 +122,20 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct,
 
        TP_FIELDS(
                ctf_integer_hex(struct page *, page, page)
+               ctf_integer(unsigned long, pfn, page_to_pfn(page))
                ctf_integer(unsigned int, order, order)
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
-#else
-LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free,
-#endif
 
-       TP_PROTO(struct page *page, int cold),
+       TP_PROTO(struct page *page),
 
-       TP_ARGS(page, cold),
+       TP_ARGS(page),
 
        TP_FIELDS(
                ctf_integer_hex(struct page *, page, page)
-               ctf_integer(int, cold, cold)
+               ctf_integer(unsigned long, pfn, page_to_pfn(page))
        )
 )
 
@@ -159,6 +148,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc,
 
        TP_FIELDS(
                ctf_integer_hex(struct page *, page, page)
+               ctf_integer(unsigned long, pfn,
+                       page ? page_to_pfn(page) : -1UL)
                ctf_integer(unsigned int, order, order)
                ctf_integer(gfp_t, gfp_flags, gfp_flags)
                ctf_integer(int, migratetype, migratetype)
@@ -173,6 +164,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page,
 
        TP_FIELDS(
                ctf_integer_hex(struct page *, page, page)
+               ctf_integer(unsigned long, pfn,
+                       page ? page_to_pfn(page) : -1UL)
                ctf_integer(unsigned int, order, order)
                ctf_integer(int, migratetype, migratetype)
        )
@@ -191,19 +184,14 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain,
 
        kmem_mm_page_pcpu_drain,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
        TP_PROTO(struct page *page, unsigned int order, int migratetype),
-#else
-       TP_PROTO(struct page *page, int order, int migratetype),
-#endif
 
        TP_ARGS(page, order, migratetype)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)      \
-       || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0))
+LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
 
-LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
+       kmem_mm_page_alloc_extfrag,
 
        TP_PROTO(struct page *page,
                int alloc_order, int fallback_order,
@@ -215,6 +203,7 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
 
        TP_FIELDS(
                ctf_integer_hex(struct page *, page, page)
+               ctf_integer(unsigned long, pfn, page_to_pfn(page))
                ctf_integer(int, alloc_order, alloc_order)
                ctf_integer(int, fallback_order, fallback_order)
                ctf_integer(int, alloc_migratetype, alloc_migratetype)
@@ -224,82 +213,7 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
        )
 )
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30))
-
-LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
-
-       TP_PROTO(struct page *page,
-               int alloc_order, int fallback_order,
-               int alloc_migratetype, int fallback_migratetype, int new_migratetype),
-
-       TP_ARGS(page,
-               alloc_order, fallback_order,
-               alloc_migratetype, fallback_migratetype, new_migratetype),
-
-       TP_FIELDS(
-               ctf_integer_hex(struct page *, page, page)
-               ctf_integer(int, alloc_order, alloc_order)
-               ctf_integer(int, fallback_order, fallback_order)
-               ctf_integer(int, alloc_migratetype, alloc_migratetype)
-               ctf_integer(int, fallback_migratetype, fallback_migratetype)
-               ctf_integer(int, change_ownership, (new_migratetype == alloc_migratetype))
-       )
-)
-
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
-
-LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
-
-       kmem_mm_page_alloc_extfrag,
-
-       TP_PROTO(struct page *page,
-                       int alloc_order, int fallback_order,
-                       int alloc_migratetype, int fallback_migratetype,
-                       int change_ownership),
-
-       TP_ARGS(page,
-               alloc_order, fallback_order,
-               alloc_migratetype, fallback_migratetype,
-               change_ownership),
-
-       TP_FIELDS(
-               ctf_integer_hex(struct page *, page, page)
-               ctf_integer(int, alloc_order, alloc_order)
-               ctf_integer(int, fallback_order, fallback_order)
-               ctf_integer(int, alloc_migratetype, alloc_migratetype)
-               ctf_integer(int, fallback_migratetype, fallback_migratetype)
-               ctf_integer(int, change_ownership, change_ownership)
-       )
-)
-
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
-
-LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
-
-       kmem_mm_page_alloc_extfrag,
-
-       TP_PROTO(struct page *page,
-                       int alloc_order, int fallback_order,
-                       int alloc_migratetype, int fallback_migratetype),
-
-       TP_ARGS(page,
-               alloc_order, fallback_order,
-               alloc_migratetype, fallback_migratetype),
-
-       TP_FIELDS(
-               ctf_integer_hex(struct page *, page, page)
-               ctf_integer(int, alloc_order, alloc_order)
-               ctf_integer(int, fallback_order, fallback_order)
-               ctf_integer(int, alloc_migratetype, alloc_migratetype)
-               ctf_integer(int, fallback_migratetype, fallback_migratetype)
-       )
-)
-
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
-
-#endif
-
 #endif /* LTTNG_TRACE_KMEM_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>