Commit 3544de8e authored by Jacob Wen's avatar Jacob Wen Committed by Linus Torvalds

mm, tracing: record slab name for kmem_cache_free()

Currently, a trace record generated by the RCU core is as below.

... kmem_cache_free: call_site=rcu_core+0x1fd/0x610 ptr=00000000f3b49a66

It doesn't tell us what the RCU core has freed.

This patch adds the slab name to trace_kmem_cache_free().
The new format is as follows.

... kmem_cache_free: call_site=rcu_core+0x1fd/0x610 ptr=0000000037f79c8d name=dentry
... kmem_cache_free: call_site=rcu_core+0x1fd/0x610 ptr=00000000f78cb7b5 name=sock_inode_cache
... kmem_cache_free: call_site=rcu_core+0x1fd/0x610 ptr=0000000018768985 name=pool_workqueue
... kmem_cache_free: call_site=rcu_core+0x1fd/0x610 ptr=000000006a6cb484 name=radix_tree_node

We can use it to understand what the RCU core is going to free. For
example, some users maybe interested in when the RCU core starts
freeing reclaimable slabs like dentry to reduce memory pressure.

Link: https://lkml.kernel.org/r/20201216072804.8838-1-jian.w.wen@oracle.comSigned-off-by: default avatarJacob Wen <jian.w.wen@oracle.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93da4003
...@@ -115,7 +115,7 @@ DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node, ...@@ -115,7 +115,7 @@ DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node,
TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node) TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node)
); );
DECLARE_EVENT_CLASS(kmem_free, TRACE_EVENT(kfree,
TP_PROTO(unsigned long call_site, const void *ptr), TP_PROTO(unsigned long call_site, const void *ptr),
...@@ -135,18 +135,26 @@ DECLARE_EVENT_CLASS(kmem_free, ...@@ -135,18 +135,26 @@ DECLARE_EVENT_CLASS(kmem_free,
(void *)__entry->call_site, __entry->ptr) (void *)__entry->call_site, __entry->ptr)
); );
DEFINE_EVENT(kmem_free, kfree, TRACE_EVENT(kmem_cache_free,
TP_PROTO(unsigned long call_site, const void *ptr), TP_PROTO(unsigned long call_site, const void *ptr, const char *name),
TP_ARGS(call_site, ptr) TP_ARGS(call_site, ptr, name),
);
DEFINE_EVENT(kmem_free, kmem_cache_free, TP_STRUCT__entry(
__field( unsigned long, call_site )
__field( const void *, ptr )
__field( const char *, name )
),
TP_PROTO(unsigned long call_site, const void *ptr), TP_fast_assign(
__entry->call_site = call_site;
__entry->ptr = ptr;
__entry->name = name;
),
TP_ARGS(call_site, ptr) TP_printk("call_site=%pS ptr=%p name=%s",
(void *)__entry->call_site, __entry->ptr, __entry->name)
); );
TRACE_EVENT(mm_page_free, TRACE_EVENT(mm_page_free,
......
...@@ -3717,7 +3717,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp) ...@@ -3717,7 +3717,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
__cache_free(cachep, objp, _RET_IP_); __cache_free(cachep, objp, _RET_IP_);
local_irq_restore(flags); local_irq_restore(flags);
trace_kmem_cache_free(_RET_IP_, objp); trace_kmem_cache_free(_RET_IP_, objp, cachep->name);
} }
EXPORT_SYMBOL(kmem_cache_free); EXPORT_SYMBOL(kmem_cache_free);
......
...@@ -673,7 +673,7 @@ void kmem_cache_free(struct kmem_cache *c, void *b) ...@@ -673,7 +673,7 @@ void kmem_cache_free(struct kmem_cache *c, void *b)
__kmem_cache_free(b, c->size); __kmem_cache_free(b, c->size);
} }
trace_kmem_cache_free(_RET_IP_, b); trace_kmem_cache_free(_RET_IP_, b, c->name);
} }
EXPORT_SYMBOL(kmem_cache_free); EXPORT_SYMBOL(kmem_cache_free);
......
...@@ -3157,7 +3157,7 @@ void kmem_cache_free(struct kmem_cache *s, void *x) ...@@ -3157,7 +3157,7 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
if (!s) if (!s)
return; return;
slab_free(s, virt_to_head_page(x), x, NULL, 1, _RET_IP_); slab_free(s, virt_to_head_page(x), x, NULL, 1, _RET_IP_);
trace_kmem_cache_free(_RET_IP_, x); trace_kmem_cache_free(_RET_IP_, x, s->name);
} }
EXPORT_SYMBOL(kmem_cache_free); EXPORT_SYMBOL(kmem_cache_free);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment