X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkmem.h;h=c3fa25a3a7e32de9079bd11272839f62249c849f;hb=f35c8d7a0476a3bcaf962ad33bc20044d60a2418;hp=2bc70a8d3db5136b48ab954b98b36ca01e765725;hpb=926b925690602310917356ebcac2fde83e8b354c;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index 2bc70a8d..c3fa25a3 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -1,17 +1,14 @@ #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 #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, @@ -21,31 +18,16 @@ DECLARE_EVENT_CLASS(kmem_alloc, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags), - TP_STRUCT__entry( - __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 ) - ), - - TP_fast_assign( - tp_assign(call_site, call_site) - tp_assign(ptr, ptr) - tp_assign(bytes_req, bytes_req) - tp_assign(bytes_alloc, bytes_alloc) - tp_assign(gfp_flags, gfp_flags) - ), - - TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s", - __entry->call_site, - __entry->ptr, - __entry->bytes_req, - __entry->bytes_alloc, - show_gfp_flags(__entry->gfp_flags)) + TP_FIELDS( + ctf_integer_hex(unsigned long, call_site, call_site) + ctf_integer_hex(const void *, ptr, ptr) + ctf_integer(size_t, bytes_req, bytes_req) + ctf_integer(size_t, bytes_alloc, bytes_alloc) + ctf_integer(gfp_t, gfp_flags, gfp_flags) + ) ) -DEFINE_EVENT_MAP(kmem_alloc, kmalloc, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc, kmalloc, kmem_kmalloc, @@ -55,7 +37,7 @@ DEFINE_EVENT_MAP(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), @@ -63,7 +45,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, @@ -74,34 +56,17 @@ DECLARE_EVENT_CLASS(kmem_alloc_node, TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node), - TP_STRUCT__entry( - __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 ) - __field( int, node ) - ), - - TP_fast_assign( - tp_assign(call_site, call_site) - tp_assign(ptr, ptr) - tp_assign(bytes_req, bytes_req) - tp_assign(bytes_alloc, bytes_alloc) - tp_assign(gfp_flags, gfp_flags) - tp_assign(node, node) - ), - - TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d", - __entry->call_site, - __entry->ptr, - __entry->bytes_req, - __entry->bytes_alloc, - show_gfp_flags(__entry->gfp_flags), - __entry->node) + TP_FIELDS( + ctf_integer_hex(unsigned long, call_site, call_site) + ctf_integer_hex(const void *, ptr, ptr) + ctf_integer(size_t, bytes_req, bytes_req) + ctf_integer(size_t, bytes_alloc, bytes_alloc) + ctf_integer(gfp_t, gfp_flags, gfp_flags) + ctf_integer(int, node, node) + ) ) -DEFINE_EVENT_MAP(kmem_alloc_node, kmalloc_node, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc_node, kmalloc_node, kmem_kmalloc_node, @@ -112,7 +77,7 @@ DEFINE_EVENT_MAP(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, @@ -121,26 +86,19 @@ 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_hex( unsigned long, call_site ) - __field_hex( const void *, ptr ) - ), - - TP_fast_assign( - tp_assign(call_site, call_site) - tp_assign(ptr, ptr) - ), - - TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr) + TP_FIELDS( + ctf_integer_hex(unsigned long, call_site, call_site) + ctf_integer_hex(const void *, ptr, ptr) + ) ) -DEFINE_EVENT_MAP(kmem_free, kfree, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_free, kfree, kmem_kfree, @@ -149,7 +107,7 @@ DEFINE_EVENT_MAP(kmem_free, kfree, 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), @@ -158,120 +116,106 @@ 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_MAP(mm_page_free, kmem_mm_page_free, #else -TRACE_EVENT(mm_page_free_direct, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct, #endif TP_PROTO(struct page *page, unsigned int order), TP_ARGS(page, order), - TP_STRUCT__entry( - __field_hex( struct page *, page ) - __field( unsigned int, order ) - ), + TP_FIELDS( + ctf_integer_hex(struct page *, page, page) + ctf_integer(unsigned long, pfn, page_to_pfn(page)) + ctf_integer(unsigned int, order, order) + ) +) - TP_fast_assign( - tp_assign(page, page) - tp_assign(order, order) - ), +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, - TP_printk("page=%p pfn=%lu order=%d", - __entry->page, - page_to_pfn(__entry->page), - __entry->order) -) + TP_PROTO(struct page *page), -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -TRACE_EVENT(mm_page_free_batched, -#else -TRACE_EVENT(mm_pagevec_free, -#endif + 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_STRUCT__entry( - __field_hex( struct page *, page ) - __field( int, 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, - TP_fast_assign( - tp_assign(page, page) - tp_assign(cold, cold) - ), + TP_PROTO(struct page *page, int cold), - TP_printk("page=%p pfn=%lu order=0 cold=%d", - __entry->page, - page_to_pfn(__entry->page), - __entry->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) + ) ) +#endif -TRACE_EVENT(mm_page_alloc, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, TP_PROTO(struct page *page, unsigned int order, gfp_t gfp_flags, int migratetype), TP_ARGS(page, order, gfp_flags, migratetype), - TP_STRUCT__entry( - __field_hex( struct page *, page ) - __field( unsigned int, order ) - __field( gfp_t, gfp_flags ) - __field( int, migratetype ) - ), - - TP_fast_assign( - tp_assign(page, page) - tp_assign(order, order) - tp_assign(gfp_flags, gfp_flags) - tp_assign(migratetype, migratetype) - ), - - TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s", - __entry->page, - __entry->page ? page_to_pfn(__entry->page) : 0, - __entry->order, - __entry->migratetype, - show_gfp_flags(__entry->gfp_flags)) + 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) + ) ) -DECLARE_EVENT_CLASS(mm_page, +LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, TP_PROTO(struct page *page, unsigned int order, int migratetype), TP_ARGS(page, order, migratetype), - TP_STRUCT__entry( - __field_hex( struct page *, page ) - __field( unsigned int, order ) - __field( int, migratetype ) - ), - - TP_fast_assign( - tp_assign(page, page) - tp_assign(order, order) - tp_assign(migratetype, migratetype) - ), - - TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d", - __entry->page, - __entry->page ? page_to_pfn(__entry->page) : 0, - __entry->order, - __entry->migratetype, - __entry->order == 0) + 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) + ) ) -DEFINE_EVENT(mm_page, mm_page_alloc_zone_locked, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked, + + kmem_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_MAP(kmem_mm_page, mm_page_pcpu_drain, + + kmem_mm_page_pcpu_drain, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) TP_PROTO(struct page *page, unsigned int order, int migratetype), @@ -279,16 +223,71 @@ DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain, TP_PROTO(struct page *page, int order, int migratetype), #endif - TP_ARGS(page, order, migratetype), + TP_ARGS(page, order, migratetype) +) - TP_printk("page=%p pfn=%lu order=%d migratetype=%d", - __entry->page, page_to_pfn(__entry->page), - __entry->order, __entry->migratetype) +#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,34, 3,17,0,0)) + +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, + + kmem_mm_page_alloc_extfrag, + + TP_PROTO(struct page *page, + int alloc_order, int fallback_order, + int alloc_migratetype, int fallback_migratetype), + + TP_ARGS(page, + alloc_order, fallback_order, + alloc_migratetype, fallback_migratetype), + + 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))) + ) +) + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30)) + +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, + + kmem_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_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)) + ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) -TRACE_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, @@ -300,39 +299,22 @@ TRACE_EVENT(mm_page_alloc_extfrag, 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) + 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, change_ownership) + ) ) #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ -TRACE_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, @@ -342,39 +324,21 @@ TRACE_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 ) - ), - - 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_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->alloc_migratetype == __entry->fallback_migratetype) + 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) + ) ) #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" +#include