X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkmem.h;h=8270fcedc1851d9c57d165802b3b76d925ca627a;hb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;hp=c7869f12745d3949d5393252998c04facee93351;hpb=9bbf98da13bbaf289ac5787a80325d2e1dd81d0d;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index c7869f12..8270fced 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -1,15 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #undef TRACE_SYSTEM #define TRACE_SYSTEM kmem #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, @@ -21,28 +19,13 @@ LTTNG_TRACEPOINT_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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc, kmalloc, @@ -74,31 +57,14 @@ LTTNG_TRACEPOINT_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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc_node, kmalloc_node, @@ -127,17 +93,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(kmem_free, 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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_free, kfree, @@ -167,47 +126,52 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct, 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)) + 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, -#else -LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free, -#endif 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_PROTO(struct page *page, int cold), - TP_fast_assign( - tp_assign(page, page) - tp_assign(cold, cold) - ), + TP_ARGS(page, cold), - TP_printk("page=%p pfn=%lu order=0 cold=%d", - __entry->page, - page_to_pfn(__entry->page), - __entry->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 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, @@ -216,26 +180,14 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, 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) + ) ) LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, @@ -244,24 +196,13 @@ LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, 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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked, @@ -273,7 +214,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked, TP_ARGS(page, order, migratetype) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP(kmem_mm_page, mm_page_pcpu_drain, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain, kmem_mm_page_pcpu_drain, @@ -283,17 +224,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP(kmem_mm_page, mm_page_pcpu_drain, TP_PROTO(struct page *page, int order, int migratetype), #endif - 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) + TP_ARGS(page, order, migratetype) ) #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, @@ -303,40 +247,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, @@ -346,34 +273,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)) @@ -392,34 +300,15 @@ LTTNG_TRACEPOINT_EVENT_MAP(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)) */ @@ -436,32 +325,14 @@ LTTNG_TRACEPOINT_EVENT_MAP(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)) */ @@ -471,4 +342,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