X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkmem.h;h=c3fa25a3a7e32de9079bd11272839f62249c849f;hb=d11b568681f87c2df6ecb0516d3f16d153f24bd2;hp=85c116bce64dab5272e8734daf06c35e73bf8efc;hpb=f8996f1b59b1709c19a2e65cf5a5b43cce661c8f;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index 85c116bc..c3fa25a3 100644
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -4,12 +4,9 @@
 #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,
 
@@ -130,15 +127,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 (LINUX_VERSION_CODE >= 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 (LINUX_VERSION_CODE >= 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 +166,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 +181,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 +197,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)
 	)
@@ -202,9 +228,11 @@ 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,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 +248,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)
@@ -245,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)
@@ -271,6 +301,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)
@@ -295,6 +326,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)
@@ -309,4 +341,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
 #endif /* LTTNG_TRACE_KMEM_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>