X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkmem.h;h=2313ae812a80b6f3e16b5b819e734e160c5f9d92;hb=43314106ec0d70c56b516efc978986176aa46cbd;hp=ee83d3863a97821e6e3372dc95c001c214096fa4;hpb=72e6c528aad2cdd1152af21258a5f84870155b41;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index ee83d386..2313ae81 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, @@ -117,7 +115,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free, TP_ARGS(call_site, ptr) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free, #else @@ -130,15 +127,38 @@ 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) ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, + + TP_PROTO(struct page *page), + + 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_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, -#endif TP_PROTO(struct page *page, int cold), @@ -146,9 +166,11 @@ 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) ) ) +#endif LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, @@ -159,6 +181,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 +197,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) ) @@ -191,18 +217,18 @@ 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), -#else - TP_PROTO(struct page *page, int order, int migratetype), -#endif TP_ARGS(page, order, migratetype) ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2) \ || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \ - || LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,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, @@ -218,6 +244,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) @@ -243,6 +270,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) @@ -269,6 +297,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) @@ -293,6 +322,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) @@ -302,9 +332,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ -#endif - #endif /* LTTNG_TRACE_KMEM_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include