fix: Adjust ranges for RHEL 8.6 kernels

[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 85c116bce64dab5272e8734daf06c35e73bf8efc..5a2bfdb63d78f765c29b8e77f2f22a2879519466 100644 (file)
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -1,15 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #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
+#include <lttng-kernel-version.h>
 
 LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
 
@@ -89,6 +87,35 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node,
        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node)
 )
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,372,0,0, 4,19,0,0,0,0))
+LTTNG_TRACEPOINT_EVENT_MAP(kfree,
+
+       kmem_kfree,
+
+       TP_PROTO(unsigned long call_site, const void *ptr),
+
+       TP_ARGS(call_site, ptr),
+
+       TP_FIELDS(
+               ctf_integer_hex(unsigned long, call_site, call_site)
+               ctf_integer_hex(const void *, ptr, ptr)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(kmem_cache_free,
+
+       TP_PROTO(unsigned long call_site, const void *ptr, const char *name),
+
+       TP_ARGS(call_site, ptr, name),
+
+       TP_FIELDS(
+               ctf_integer_hex(unsigned long, call_site, call_site)
+               ctf_integer_hex(const void *, ptr, ptr)
+               ctf_string(name, name)
+       )
+)
+#else
 LTTNG_TRACEPOINT_EVENT_CLASS(kmem_free,
 
        TP_PROTO(unsigned long call_site, const void *ptr),
@@ -116,9 +143,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free,
 
        TP_ARGS(call_site, ptr)
 )
+#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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,
@@ -130,15 +157,38 @@ 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))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0))
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
+
+       TP_PROTO(struct page *page),
+
+       TP_ARGS(page),
+
+       TP_FIELDS(
+               ctf_integer_hex(struct page *, page, page)
+               ctf_integer(unsigned long, pfn, page_to_pfn(page))
+       )
+)
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,3,0))
+LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
+
+       TP_PROTO(struct page *page, int cold),
+
+       TP_ARGS(page, cold),
+
+       TP_FIELDS(
+               ctf_integer_hex(struct page *, page, page)
+               ctf_integer(unsigned long, pfn, page_to_pfn(page))
+               ctf_integer(int, cold, cold)
+       )
+)
 #else
 LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free,
-#endif
 
        TP_PROTO(struct page *page, int cold),
 
@@ -146,9 +196,11 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free,
 
        TP_FIELDS(
                ctf_integer_hex(struct page *, page, page)
+               ctf_integer(unsigned long, pfn, page_to_pfn(page))
                ctf_integer(int, cold, cold)
        )
 )
+#endif
 
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc,
 
@@ -159,6 +211,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 +227,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,20 +247,18 @@ 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)      \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2)  \
        || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0)          \
+       || LTTNG_KERNEL_RANGE(3,16,35, 3,17,0)          \
+       || LTTNG_KERNEL_RANGE(3,18,10, 3,19,0)          \
        || LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0)        \
        || LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0)      \
-       || LTTNG_UBUNTU_KERNEL_RANGE(3,16,7,38, 3,17,0,0))
+       || LTTNG_UBUNTU_KERNEL_RANGE(3,16,7,34, 3,17,0,0))
 
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
 
@@ -220,6 +274,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(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)
@@ -229,7 +284,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
        )
 )
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,30))
 
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
 
@@ -245,6 +300,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(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)
@@ -253,7 +309,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
        )
 )
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0))
 
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
 
@@ -271,6 +327,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(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)
@@ -279,7 +336,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
        )
 )
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
+#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0)) */
 
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
 
@@ -295,6 +352,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(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)
@@ -302,11 +360,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
        )
 )
 
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
-
-#endif
+#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0)) */
 
 #endif /* LTTNG_TRACE_KMEM_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>