X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkmem.h;h=cde2a20fdf945bbf83a70977b29b44c16096b900;hb=1ac8746b654b715176178b0f82cccf8930a53e24;hp=baf4176aa1192ed0f46b48a25390f356158a5e17;hpb=7c68b363332170e4db100327ecc9e09b8a79cf29;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index baf4176a..cde2a20f 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -1,17 +1,17 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM kmem -#if !defined(_TRACE_KMEM_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_KMEM_H +#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 -DECLARE_EVENT_CLASS(kmem_alloc, +LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc, TP_PROTO(unsigned long call_site, const void *ptr, @@ -22,8 +22,8 @@ DECLARE_EVENT_CLASS(kmem_alloc, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags), TP_STRUCT__entry( - __field( unsigned long, call_site ) - __field( const void *, ptr ) + __field_hex( unsigned long, call_site ) + __field_hex( const void *, ptr ) __field( size_t, bytes_req ) __field( size_t, bytes_alloc ) __field( gfp_t, gfp_flags ) @@ -45,7 +45,9 @@ DECLARE_EVENT_CLASS(kmem_alloc, show_gfp_flags(__entry->gfp_flags)) ) -DEFINE_EVENT(kmem_alloc, kmalloc, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc, kmalloc, + + kmem_kmalloc, TP_PROTO(unsigned long call_site, const void *ptr, size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags), @@ -53,7 +55,7 @@ DEFINE_EVENT(kmem_alloc, kmalloc, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags) ) -DEFINE_EVENT(kmem_alloc, kmem_cache_alloc, +LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc, kmem_cache_alloc, TP_PROTO(unsigned long call_site, const void *ptr, size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags), @@ -61,7 +63,7 @@ DEFINE_EVENT(kmem_alloc, kmem_cache_alloc, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags) ) -DECLARE_EVENT_CLASS(kmem_alloc_node, +LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc_node, TP_PROTO(unsigned long call_site, const void *ptr, @@ -73,8 +75,8 @@ DECLARE_EVENT_CLASS(kmem_alloc_node, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node), TP_STRUCT__entry( - __field( unsigned long, call_site ) - __field( const void *, ptr ) + __field_hex( unsigned long, call_site ) + __field_hex( const void *, ptr ) __field( size_t, bytes_req ) __field( size_t, bytes_alloc ) __field( gfp_t, gfp_flags ) @@ -99,7 +101,9 @@ DECLARE_EVENT_CLASS(kmem_alloc_node, __entry->node) ) -DEFINE_EVENT(kmem_alloc_node, kmalloc_node, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc_node, kmalloc_node, + + kmem_kmalloc_node, TP_PROTO(unsigned long call_site, const void *ptr, size_t bytes_req, size_t bytes_alloc, @@ -108,7 +112,7 @@ DEFINE_EVENT(kmem_alloc_node, kmalloc_node, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node) ) -DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node, +LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node, TP_PROTO(unsigned long call_site, const void *ptr, size_t bytes_req, size_t bytes_alloc, @@ -117,15 +121,15 @@ DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node) ) -DECLARE_EVENT_CLASS(kmem_free, +LTTNG_TRACEPOINT_EVENT_CLASS(kmem_free, TP_PROTO(unsigned long call_site, const void *ptr), TP_ARGS(call_site, ptr), TP_STRUCT__entry( - __field( unsigned long, call_site ) - __field( const void *, ptr ) + __field_hex( unsigned long, call_site ) + __field_hex( const void *, ptr ) ), TP_fast_assign( @@ -136,14 +140,16 @@ DECLARE_EVENT_CLASS(kmem_free, TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr) ) -DEFINE_EVENT(kmem_free, kfree, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_free, kfree, + + kmem_kfree, TP_PROTO(unsigned long call_site, const void *ptr), TP_ARGS(call_site, ptr) ) -DEFINE_EVENT(kmem_free, kmem_cache_free, +LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free, TP_PROTO(unsigned long call_site, const void *ptr), @@ -152,9 +158,9 @@ DEFINE_EVENT(kmem_free, kmem_cache_free, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -TRACE_EVENT(mm_page_free, +LTTNG_TRACEPOINT_EVENT(mm_page_free, #else -TRACE_EVENT(mm_page_free_direct, +LTTNG_TRACEPOINT_EVENT(mm_page_free_direct, #endif TP_PROTO(struct page *page, unsigned int order), @@ -162,7 +168,7 @@ TRACE_EVENT(mm_page_free_direct, TP_ARGS(page, order), TP_STRUCT__entry( - __field( struct page *, page ) + __field_hex( struct page *, page ) __field( unsigned int, order ) ), @@ -178,9 +184,9 @@ TRACE_EVENT(mm_page_free_direct, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -TRACE_EVENT(mm_page_free_batched, +LTTNG_TRACEPOINT_EVENT(mm_page_free_batched, #else -TRACE_EVENT(mm_pagevec_free, +LTTNG_TRACEPOINT_EVENT(mm_pagevec_free, #endif TP_PROTO(struct page *page, int cold), @@ -188,7 +194,7 @@ TRACE_EVENT(mm_pagevec_free, TP_ARGS(page, cold), TP_STRUCT__entry( - __field( struct page *, page ) + __field_hex( struct page *, page ) __field( int, cold ) ), @@ -203,7 +209,7 @@ TRACE_EVENT(mm_pagevec_free, __entry->cold) ) -TRACE_EVENT(mm_page_alloc, +LTTNG_TRACEPOINT_EVENT(mm_page_alloc, TP_PROTO(struct page *page, unsigned int order, gfp_t gfp_flags, int migratetype), @@ -211,7 +217,7 @@ TRACE_EVENT(mm_page_alloc, TP_ARGS(page, order, gfp_flags, migratetype), TP_STRUCT__entry( - __field( struct page *, page ) + __field_hex( struct page *, page ) __field( unsigned int, order ) __field( gfp_t, gfp_flags ) __field( int, migratetype ) @@ -232,14 +238,14 @@ TRACE_EVENT(mm_page_alloc, show_gfp_flags(__entry->gfp_flags)) ) -DECLARE_EVENT_CLASS(mm_page, +LTTNG_TRACEPOINT_EVENT_CLASS(mm_page, TP_PROTO(struct page *page, unsigned int order, int migratetype), TP_ARGS(page, order, migratetype), TP_STRUCT__entry( - __field( struct page *, page ) + __field_hex( struct page *, page ) __field( unsigned int, order ) __field( int, migratetype ) ), @@ -258,14 +264,14 @@ DECLARE_EVENT_CLASS(mm_page, __entry->order == 0) ) -DEFINE_EVENT(mm_page, mm_page_alloc_zone_locked, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_page, mm_page_alloc_zone_locked, TP_PROTO(struct page *page, unsigned int order, int migratetype), TP_ARGS(page, order, migratetype) ) -DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain, +LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(mm_page, mm_page_pcpu_drain, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) TP_PROTO(struct page *page, unsigned int order, int migratetype), @@ -280,7 +286,95 @@ DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain, __entry->order, __entry->migratetype) ) -TRACE_EVENT(mm_page_alloc_extfrag, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30)) + +LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, + + TP_PROTO(struct page *page, + int alloc_order, int fallback_order, + int alloc_migratetype, int fallback_migratetype, int new_migratetype), + + TP_ARGS(page, + 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) +) + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) + +LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, + + TP_PROTO(struct page *page, + int alloc_order, int fallback_order, + int alloc_migratetype, int fallback_migratetype, + int change_ownership), + + TP_ARGS(page, + alloc_order, fallback_order, + alloc_migratetype, fallback_migratetype, + change_ownership), + + 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, change_ownership) + ), + + 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) +) + +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ + +LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, TP_PROTO(struct page *page, int alloc_order, int fallback_order, @@ -291,7 +385,7 @@ TRACE_EVENT(mm_page_alloc_extfrag, alloc_migratetype, fallback_migratetype), TP_STRUCT__entry( - __field( struct page *, page ) + __field_hex( struct page *, page ) __field( int, alloc_order ) __field( int, fallback_order ) __field( int, alloc_migratetype ) @@ -317,9 +411,12 @@ TRACE_EVENT(mm_page_alloc_extfrag, __entry->fallback_order < pageblock_order, __entry->alloc_migratetype == __entry->fallback_migratetype) ) + +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ + #endif -#endif /* _TRACE_KMEM_H */ +#endif /* LTTNG_TRACE_KMEM_H */ /* This part must be outside protection */ #include "../../../probes/define_trace.h"