X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkmem.h;h=ad7bf77ebdecaed94432e495f067544cfac719de;hb=2e9cb2ea35b4d7f91af714cbddf58b674bbf7b2c;hp=c94f8af9f345819dd7dcc342662ed69de9a613b0;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index c94f8af9..ad7bf77e 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 #include #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) -#include -#endif LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc, @@ -130,6 +127,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 +144,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 +158,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 +174,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 +204,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 +223,23 @@ 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(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) + 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 +249,15 @@ 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(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) + 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)) @@ -304,6 +278,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) @@ -328,6 +303,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) @@ -342,4 +318,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