Fix: mm_page_alloc_extfrag instrumentation for kernel 3.16.35

[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 c94f8af9f345819dd7dcc342662ed69de9a613b0..131f1ae5ee931f8d8efedeb9b060a601a9bd321c 100644 (file)
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -7,9 +7,6 @@
 #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,
 
@@ -201,9 +198,16 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain,
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)      \
-       || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0))
+       || 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,34, 3,17,0,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,
@@ -213,40 +217,22 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
                alloc_order, fallback_order,
                alloc_migratetype, fallback_migratetype),
 
-       TP_STRUCT__entry(
-               __field_hex(    struct page *,  page                    )
-               __field(        int,            alloc_order             )
-               __field(        int,            fallback_order          )
-               __field(        int,            alloc_migratetype       )
-               __field(        int,            fallback_migratetype    )
-               __field(        int,            change_ownership        )
-       ),
-
-       TP_fast_assign(
-               tp_assign(page, page)
-               tp_assign(alloc_order, alloc_order)
-               tp_assign(fallback_order, fallback_order)
-               tp_assign(alloc_migratetype, alloc_migratetype)
-               tp_assign(fallback_migratetype, fallback_migratetype)
-               tp_assign(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,
                        (alloc_migratetype == get_pageblock_migratetype(page)))
-       ),
-
-       TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
-               __entry->page,
-               page_to_pfn(__entry->page),
-               __entry->alloc_order,
-               __entry->fallback_order,
-               pageblock_order,
-               __entry->alloc_migratetype,
-               __entry->fallback_migratetype,
-               __entry->fallback_order < pageblock_order,
-               __entry->change_ownership)
+       )
 )
 
 #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30))
 
-LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
+LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
+
+       kmem_mm_page_alloc_extfrag,
 
        TP_PROTO(struct page *page,
                int alloc_order, int fallback_order,
@@ -256,34 +242,14 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
                alloc_order, fallback_order,
                alloc_migratetype, fallback_migratetype, new_migratetype),
 
-       TP_STRUCT__entry(
-               __field_hex(    struct page *,  page                    )
-               __field(        int,            alloc_order             )
-               __field(        int,            fallback_order          )
-               __field(        int,            alloc_migratetype       )
-               __field(        int,            fallback_migratetype    )
-               __field(        int,            change_ownership        )
-       ),
-
-       TP_fast_assign(
-               tp_assign(page, page)
-               tp_assign(alloc_order, alloc_order)
-               tp_assign(fallback_order, fallback_order)
-               tp_assign(alloc_migratetype, alloc_migratetype)
-               tp_assign(fallback_migratetype, fallback_migratetype)
-               tp_assign(change_ownership, (new_migratetype == alloc_migratetype))
-       ),
-
-       TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
-               __entry->page,
-               page_to_pfn(__entry->page),
-               __entry->alloc_order,
-               __entry->fallback_order,
-               pageblock_order,
-               __entry->alloc_migratetype,
-               __entry->fallback_migratetype,
-               __entry->fallback_order < pageblock_order,
-               __entry->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, (new_migratetype == alloc_migratetype))
+       )
 )
 
 #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))