X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fkmem.h;h=0d6a87692324f0309be5c3d23321b2f2a7b096a3;hb=03edc768329329821d87ff336923977ec3972d7f;hp=0f5bd8e64225d7c784b9147fe30d96fba2900920;hpb=abbffdb8dfba2a3b8ba7f5b738b6c55debcf1a13;p=lttng-modules.git diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h index 0f5bd8e6..0d6a8769 100644 --- a/include/instrumentation/events/kmem.h +++ b/include/instrumentation/events/kmem.h @@ -61,7 +61,9 @@ LTTNG_TRACEPOINT_EVENT(kmem_cache_alloc, (s->flags & SLAB_ACCOUNT)) : false) ) ) -#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0) || \ + LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc, TP_PROTO(unsigned long call_site, @@ -141,7 +143,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc, kmem_cache_alloc, ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0) || \ + LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc_node, TP_PROTO(unsigned long call_site, @@ -229,7 +233,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node, ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,348,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT_MAP(kfree, kmem_kfree, @@ -301,11 +306,7 @@ LTTNG_TRACEPOINT_EVENT(kmem_cache_free, ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,3,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free, -#else -LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct, -#endif TP_PROTO(struct page *page, unsigned int order), @@ -330,21 +331,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, ctf_integer(unsigned long, pfn, page_to_pfn(page)) ) ) -#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_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, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, TP_PROTO(struct page *page, int cold), @@ -375,7 +363,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, ) ) -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0) || \ + LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, TP_PROTO(struct page *page, unsigned int order, int migratetype, @@ -453,14 +443,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain, ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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, @@ -485,84 +467,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, ) ) -#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_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)) - ) -) - -#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,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, - int change_ownership), - - TP_ARGS(page, - alloc_order, fallback_order, - alloc_migratetype, fallback_migratetype, - 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 (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,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) - ) -) - -#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0)) */ - #endif /* LTTNG_TRACE_KMEM_H */ /* This part must be outside protection */