X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=instrumentation%2Fevents%2Flttng-module%2Fkmem.h;h=25e58cbdd0306eed786a1f467ba79db30e0ff2a1;hb=d1cf842bc78d980ff7bac8964cb005f6da13dcb2;hp=b8dc524eba1ceb8c83bd344f2a05296035bf0b3b;hpb=c94b360dc7071538862b58761c8850c52814dfa6;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index b8dc524e..25e58cbd 100644
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -130,6 +130,7 @@ 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)
 	)
 )
@@ -146,6 +147,7 @@ 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)
 	)
 )
@@ -159,6 +161,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 +177,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)
 	)
@@ -201,9 +207,15 @@ 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,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_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,
@@ -215,6 +227,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)
@@ -226,7 +239,9 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
 
 #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,
@@ -238,6 +253,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)
@@ -264,6 +280,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)
@@ -288,6 +305,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)