projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix: correct RHEL range for kmem_cache_free define
[lttng-modules.git] / include / instrumentation / events / kmem.h
diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h
index 8c19e9624a2f13502b08a7142e43e8fbf8c35d61..0d6a87692324f0309be5c3d23321b2f2a7b096a3 100644 (file)
--- a/include/instrumentation/events/kmem.h
+++ b/include/instrumentation/events/kmem.h
@@ -9,6 +9,102 @@
 #include <linux/types.h>
 #include <lttng/kernel-version.h>
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0))
+#include <../../mm/slab.h>
+#endif
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,1,0))
+LTTNG_TRACEPOINT_EVENT_MAP(kmalloc,
+
+       kmem_kmalloc,
+
+       TP_PROTO(unsigned long call_site,
+                const void *ptr,
+                size_t bytes_req,
+                size_t bytes_alloc,
+                gfp_t gfp_flags,
+                int node),
+
+       TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, 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)
+               ctf_integer(bool, accounted, (IS_ENABLED(CONFIG_MEMCG_KMEM) &&
+                       (gfp_flags & __GFP_ACCOUNT) ? true : false))
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(kmem_cache_alloc,
+
+       TP_PROTO(unsigned long call_site,
+                const void *ptr,
+                struct kmem_cache *s,
+                gfp_t gfp_flags,
+                int node),
+
+       TP_ARGS(call_site, ptr, s, gfp_flags, 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, s->object_size)
+               ctf_integer(size_t, bytes_alloc, s->size)
+               ctf_integer(gfp_t, gfp_flags, gfp_flags)
+               ctf_integer(int, node, node)
+               ctf_integer(bool, accounted, IS_ENABLED(CONFIG_MEMCG_KMEM) ?
+                       ((gfp_flags & __GFP_ACCOUNT) ||
+                       (s->flags & SLAB_ACCOUNT)) : false)
+       )
+)
+#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,
+                const void *ptr,
+                struct kmem_cache *s,
+                size_t bytes_req,
+                size_t bytes_alloc,
+                gfp_t gfp_flags),
+
+       TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, 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)
+               ctf_integer(bool, accounted, IS_ENABLED(CONFIG_MEMCG_KMEM) ?
+                       ((gfp_flags & __GFP_ACCOUNT) ||
+                       (s && s->flags & SLAB_ACCOUNT)) : false)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc, kmalloc,
+
+       kmem_kmalloc,
+
+       TP_PROTO(unsigned long call_site, const void *ptr, struct kmem_cache *s,
+                size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
+
+       TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc, kmem_cache_alloc,
+
+       TP_PROTO(unsigned long call_site, const void *ptr, struct kmem_cache *s,
+                size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
+
+       TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags)
+)
+#else
 LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
 
        TP_PROTO(unsigned long call_site,
@@ -45,7 +141,56 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc, kmem_cache_alloc,
 
        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags)
 )
+#endif
+
+#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,
+                const void *ptr,
+                struct kmem_cache *s,
+                size_t bytes_req,
+                size_t bytes_alloc,
+                gfp_t gfp_flags,
+                int node),
+
+       TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, 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)
+               ctf_integer(bool, accounted, IS_ENABLED(CONFIG_MEMCG_KMEM) ?
+                       ((gfp_flags & __GFP_ACCOUNT) ||
+                       (s && s->flags & SLAB_ACCOUNT)) : false)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_alloc_node, kmalloc_node,
+
+       kmem_kmalloc_node,
+
+       TP_PROTO(unsigned long call_site, const void *ptr,
+                struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,
+                gfp_t gfp_flags, int node),
+
+       TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node,
+
+       TP_PROTO(unsigned long call_site, const void *ptr,
+                struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,
+                gfp_t gfp_flags, int node),
 
+       TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node)
+)
+#else
 LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc_node,
 
        TP_PROTO(unsigned long call_site,
@@ -86,8 +231,10 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node,
 
        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, 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,
@@ -101,19 +248,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(kfree,
                ctf_integer_hex(const void *, ptr, ptr)
        )
 )
-
-LTTNG_TRACEPOINT_EVENT(kmem_cache_free,
-
-       TP_PROTO(unsigned long call_site, const void *ptr, const char *name),
-
-       TP_ARGS(call_site, ptr, name),
-
-       TP_FIELDS(
-               ctf_integer_hex(unsigned long, call_site, call_site)
-               ctf_integer_hex(const void *, ptr, ptr)
-               ctf_string(name, name)
-       )
-)
 #else
 LTTNG_TRACEPOINT_EVENT_CLASS(kmem_free,
 
@@ -144,12 +278,36 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, 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,
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,1,0))
+LTTNG_TRACEPOINT_EVENT(kmem_cache_free,
+
+       TP_PROTO(unsigned long call_site, const void *ptr, const struct kmem_cache *s),
+
+       TP_ARGS(call_site, ptr, s),
+
+       TP_FIELDS(
+               ctf_integer_hex(unsigned long, call_site, call_site)
+               ctf_integer_hex(const void *, ptr, ptr)
+               ctf_string(name, s->name)
+       )
+)
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0))
+LTTNG_TRACEPOINT_EVENT(kmem_cache_free,
+
+       TP_PROTO(unsigned long call_site, const void *ptr, const char *name),
+
+       TP_ARGS(call_site, ptr, name),
+
+       TP_FIELDS(
+               ctf_integer_hex(unsigned long, call_site, call_site)
+               ctf_integer_hex(const void *, ptr, ptr)
+               ctf_string(name, name)
+       )
+)
 #endif
 
+LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free,
+
        TP_PROTO(struct page *page, unsigned int order),
 
        TP_ARGS(page, order),
@@ -173,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),
 
@@ -218,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,
@@ -296,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,
@@ -328,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 */
LTTng 2.0/0.x modules
This page took 0.027328 seconds and 4 git commands to generate.