mm: vmscan: add PID and cgroup ID to vmscan tracepoints
Subsystems (5)
cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
Attributing tracepoints to specific processes or cgroups might happen to be challenging in some scenarios. Implementing additional context to these tracepoints with PIDs and cgroup IDs will help improve analysis.
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 77 +++++++++++++++++++++++------------ mm/vmscan.c | 17 ++++---- 2 files changed, 60 insertions(+), 34 deletions(-)
Signature · 1 line
2.33.8
PATCH 1/2 mm: vmscan: add cgroup IDs to vmscan tracepoints
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 65 +++++++++++++++++++++-------------- mm/vmscan.c | 17 ++++----- 2 files changed, 48 insertions(+), 34 deletions(-)
include/trace/events/vmscan.h +39 -26
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags), +TP_ARGS (order, gfp_flags, memcg_id),TP_STRUCT__entry ( __field( int, order ) __field( unsigned long, gfp_flags ) + __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%u" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (order, gfp_flags, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (order, gfp_flags, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (order, gfp_flags, memcg_id) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg_id),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) + __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%u" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#endif /* CONFIG_MEMCG */
@@ -209,6 +216,7 @@ TRACE_EVENT(mm_shrink_slab_start, __field(struct shrinker *, shr) __field(void *, shrink) __field(int, nid) + __field(unsigned short, memcg_id) __field(long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items)
@@ -221,6 +229,7 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->shr = shr; __entry->shrink = shr->scan_objects; __entry->nid = sc->nid; + __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items;
@@ -229,10 +238,11 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -242,15 +252,16 @@ TRACE_EVENT(mm_shrink_slab_start, ); TRACE_EVENT(mm_shrink_slab_end, - TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, + TP_PROTO(struct shrinker *shr, struct shrink_control *sc, int shrinker_retval, long unused_scan_cnt, long new_scan_cnt, long total_scan), - TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, + TP_ARGS(shr, sc, shrinker_retval, unused_scan_cnt, new_scan_cnt, total_scan), TP_STRUCT__entry( __field(struct shrinker *, shr) __field(int, nid) + __field(unsigned short, memcg_id) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan)
@@ -260,7 +271,8 @@ TRACE_EVENT(mm_shrink_slab_end,TP_fast_assign ( __entry->shr = shr; - __entry->nid = nid; + __entry->nid = sc->nid; + __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt;
@@ -268,10 +280,11 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->total_scan = total_scan; ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -463,9 +476,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) ); TRACE_EVENT(mm_vmscan_throttled,
mm/vmscan.c +9 -8
@@ -931,7 +931,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl, freed, nr, new_nr, total_scan);return freed; }
@@ -7092,11 +7092,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7126,7 +7126,8 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK );trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); + sc.gfp_mask, +mem_cgroup_id (memcg));/* * NOTE: Although we can get the priority field, using it
@@ -7137,7 +7138,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed,mem_cgroup_id (memcg)); *nr_scanned = sc.nr_scanned;
@@ -7171,13 +7172,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask,mem_cgroup_id (memcg)); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed,mem_cgroup_id (memcg));set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -8072,7 +8073,7 @@ static int __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, unsigned infs_reclaim_release (sc.gfp_mask);psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc.nr_reclaimed,0 );return sc.nr_reclaimed >= nr_pages; }
Signature · 1 line
2.33.8
PATCH 2/2 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses in_task() to reliably detect when we're in process context and can safely access current->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.
--- include/trace/events/vmscan.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
include/trace/events/vmscan.h +16 -4
@@ -121,18 +121,21 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,TP_STRUCT__entry (__field (int ,order ) __field( unsigned long, gfp_flags ) +__field ( int, pid ) __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->order = order; __entry->gfp_flags = (__force unsigned long )gfp_flags; + __entry->pid =in_task () ? current->pid :-1 ; __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%u" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%u" , __entry->order,show_gfp_flags (__entry->gfp_flags), + __entry->pid, __entry->memcg_id) );
@@ -167,16 +170,19 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed ) +__field ( int, pid ) __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->pid =in_task () ? current->pid :-1 ; __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%u" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%u" , __entry->nr_reclaimed, + __entry->pid, __entry->memcg_id) );
@@ -216,6 +222,7 @@ TRACE_EVENT(mm_shrink_slab_start, __field(struct shrinker *, shr) __field(void *, shrink) __field(int, nid) + __field(int, pid) __field(unsigned short, memcg_id) __field(long, nr_objects_to_shrink) __field(unsigned long, gfp_flags)
@@ -229,6 +236,7 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->shr = shr; __entry->shrink = shr->scan_objects; __entry->nid = sc->nid; + __entry->pid =in_task () ? current->pid :-1 ; __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask;
@@ -238,10 +246,11 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; ), - TP_printk("%pS %p: nid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d pid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags),
@@ -261,6 +270,7 @@ TRACE_EVENT(mm_shrink_slab_end,TP_STRUCT__entry (__field (struct shrinker *,shr )__field (int, nid) +__field (int, pid) __field(unsigned short, memcg_id) __field(void *, shrink) __field(long, unused_scan)
@@ -272,6 +282,7 @@ TRACE_EVENT(mm_shrink_slab_end,TP_fast_assign ( __entry->shr = shr; __entry->nid = sc->nid; + __entry->pid =in_task () ? current->pid :-1 ; __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt;
@@ -280,10 +291,11 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->total_scan = total_scan; ), - TP_printk("%pS %p: nid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d pid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan,
Signature · 1 line
2.33.8
Steven Rostedt
maintainerRe: [PATCH 2/2] mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, · line 124
Quoted 13 lines · On Mon, 8 Dec 2025 10:14:13 -0800 Thomas Ballasi…
--- include/trace/events/vmscan.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)include/trace/events/vmscan.h +1
-0@@ -121,18 +121,21 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,TP_STRUCT__entry (__field (int ,order ) __field( unsigned long, gfp_flags ) + __field( int, pid )
This puts a hole in the ring buffer on 64 bit machines. Please keep pid next to order as they are both 'int' and not have an "unsigned long" between the two.
include/trace/events/vmscan.h DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, · line 126
Quoted 2 lines
include/trace/events/vmscan.h +0
-0__field( unsigned short, memcg_id ) ),
-- Steve
v2 cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
In reply to Thomas BallasiChanges in v2:
- Swapped field entries to prevent a hole in the ring buffer
Link to v1:
https://lore.kernel.org/linux-trace-kernel/[email protected]/
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 77 +++++++++++++++++++++++------------ mm/vmscan.c | 17 ++++---- 2 files changed, 60 insertions(+), 34 deletions(-)
Signature · 1 line
2.33.8
PATCH v2 1/2 mm: vmscan: add cgroup IDs to vmscan tracepoints
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 65 +++++++++++++++++++++-------------- mm/vmscan.c | 17 ++++----- 2 files changed, 48 insertions(+), 34 deletions(-)
include/trace/events/vmscan.h +39 -26
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags), +TP_ARGS (order, gfp_flags, memcg_id),TP_STRUCT__entry ( __field( int, order ) __field( unsigned long, gfp_flags ) + __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%u" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (order, gfp_flags, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (order, gfp_flags, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (order, gfp_flags, memcg_id) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg_id),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) + __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%u" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#endif /* CONFIG_MEMCG */
@@ -209,6 +216,7 @@ TRACE_EVENT(mm_shrink_slab_start, __field(struct shrinker *, shr) __field(void *, shrink) __field(int, nid) + __field(unsigned short, memcg_id) __field(long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items)
@@ -221,6 +229,7 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->shr = shr; __entry->shrink = shr->scan_objects; __entry->nid = sc->nid; + __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items;
@@ -229,10 +238,11 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -242,15 +252,16 @@ TRACE_EVENT(mm_shrink_slab_start, ); TRACE_EVENT(mm_shrink_slab_end, - TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, + TP_PROTO(struct shrinker *shr, struct shrink_control *sc, int shrinker_retval, long unused_scan_cnt, long new_scan_cnt, long total_scan), - TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, + TP_ARGS(shr, sc, shrinker_retval, unused_scan_cnt, new_scan_cnt, total_scan), TP_STRUCT__entry( __field(struct shrinker *, shr) __field(int, nid) + __field(unsigned short, memcg_id) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan)
@@ -260,7 +271,8 @@ TRACE_EVENT(mm_shrink_slab_end,TP_fast_assign ( __entry->shr = shr; - __entry->nid = nid; + __entry->nid = sc->nid; + __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt;
@@ -268,10 +280,11 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->total_scan = total_scan; ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -463,9 +476,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) ); TRACE_EVENT(mm_vmscan_throttled,
mm/vmscan.c +9 -8
@@ -931,7 +931,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl, freed, nr, new_nr, total_scan);return freed; }
@@ -7092,11 +7092,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7126,7 +7126,8 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK );trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); + sc.gfp_mask, +mem_cgroup_id (memcg));/* * NOTE: Although we can get the priority field, using it
@@ -7137,7 +7138,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed,mem_cgroup_id (memcg)); *nr_scanned = sc.nr_scanned;
@@ -7171,13 +7172,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask,mem_cgroup_id (memcg)); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed,mem_cgroup_id (memcg));set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -8072,7 +8073,7 @@ static int __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask, unsigned infs_reclaim_release (sc.gfp_mask);psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc.nr_reclaimed,0 );return sc.nr_reclaimed >= nr_pages; }
Signature · 1 line
2.33.8
Shakeel Butt
reviewerRe: [PATCH v2 1/2] mm: vmscan: add cgroup IDs to vmscan tracepoints
Quoted 10 lines · Thomas Ballasi
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (
memcg_id) to key vmscan tracepoints to enable better correlation and analysis.For operations not associated with a specific cgroup, the field is defaulted to 0.
Signed-off-by Thomas Ballasi <[email protected]>---
...
Quoted 1 line
(quoted diff) +1
-0+ __entry->memcg_id = sc->memcg ? mem_cgroup_id(sc->memcg) : 0;
...
Quoted 1 line
(quoted diff) +1
-0+ __entry->memcg_id = sc->memcg ? mem_cgroup_id(sc->memcg) : 0;
...
Quoted 1 line
...
Quoted 5 lines
mm/vmscan.c +2
-1trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); + sc.gfp_mask, +mem_cgroup_id (memcg));
...
Quoted 1 line
mm/vmscan.c +1
-0+trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed,mem_cgroup_id (memcg));
...
Quoted 1 line
mm/vmscan.c +1
-0+trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask,mem_cgroup_id (memcg));
...
mm/vmscan.c unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg, · line 7181
Quoted 1 line
mm/vmscan.c +1
-0+trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed,mem_cgroup_id (memcg));
Please don't use mem_cgroup_id() here as it is an ID internal to memcg. Use cgroup_id(memcg->css.cgroup) instead which is inode number and is exposed to the userspace.
Steven Rostedt
maintainerRe: [PATCH v2 1/2] mm: vmscan: add cgroup IDs to vmscan tracepoints
In reply to Thomas BallasiQuoted 14 lines · On Tue, 16 Dec 2025 06:02:51 -0800 Thomas Ballasi…
--- include/trace/events/vmscan.h | 65 +++++++++++++++++++++-------------- mm/vmscan.c | 17 ++++----- 2 files changed, 48 insertions(+), 34 deletions(-)include/trace/events/vmscan.h +0
-1@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd, DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags),
include/trace/events/vmscan.h TRACE_EVENT(mm_vmscan_wakeup_kswapd, · line 125
Quoted 10 lines
include/trace/events/vmscan.h +3
-1+ TP_PROTO(int order, gfp_t gfp_flags, unsigned short memcg_id), -TP_ARGS (order, gfp_flags), +TP_ARGS (order, gfp_flags, memcg_id),TP_STRUCT__entry ( __field( int, order )__field (unsigned long ,gfp_flags ) + __field( unsigned short, memcg_id ) ),
Hmm, the above adds some holes. Note, events are at a minimum, 4 bytes aligend. On 64bit, they can be 8 byte aligned. Still, above is the same as:
struct {
int order;
unsigned long gfp_flags;
unsigned short memcg_id;
};See the issue? Perhaps it may be better to add the memcg_id in between the order and gfp_flags?
-- Steve
PATCH v2 2/2 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses in_task() to reliably detect when we're in process context and can safely access current->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.
--- include/trace/events/vmscan.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
include/trace/events/vmscan.h +16 -4
@@ -120,19 +120,22 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,TP_STRUCT__entry (__field (int ,order ) +__field ( int, pid ) __field( unsigned long, gfp_flags ) __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->order = order; + __entry->pid =in_task () ? current->pid :-1 ; __entry->gfp_flags = (__force unsigned long )gfp_flags; __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%u" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%u" , __entry->order,show_gfp_flags (__entry->gfp_flags), + __entry->pid, __entry->memcg_id) );
@@ -167,16 +170,19 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed ) +__field ( int, pid ) __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->pid =in_task () ? current->pid :-1 ; __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%u" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%u" , __entry->nr_reclaimed, + __entry->pid, __entry->memcg_id) );
@@ -216,6 +222,7 @@ TRACE_EVENT(mm_shrink_slab_start, __field(struct shrinker *, shr) __field(void *, shrink) __field(int, nid) + __field(int, pid) __field(unsigned short, memcg_id) __field(long, nr_objects_to_shrink) __field(unsigned long, gfp_flags)
@@ -229,6 +236,7 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->shr = shr; __entry->shrink = shr->scan_objects; __entry->nid = sc->nid; + __entry->pid =in_task () ? current->pid :-1 ; __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask;
@@ -238,10 +246,11 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; ), - TP_printk("%pS %p: nid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d pid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags),
@@ -261,6 +270,7 @@ TRACE_EVENT(mm_shrink_slab_end,TP_STRUCT__entry (__field (struct shrinker *,shr )__field (int, nid) +__field (int, pid) __field(unsigned short, memcg_id) __field(void *, shrink) __field(long, unused_scan)
@@ -272,6 +282,7 @@ TRACE_EVENT(mm_shrink_slab_end,TP_fast_assign ( __entry->shr = shr; __entry->nid = sc->nid; + __entry->pid =in_task () ? current->pid :-1 ; __entry->memcg_id = sc->memcg ?mem_cgroup_id (sc->memcg) :0 ; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt;
@@ -280,10 +291,11 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->total_scan = total_scan; ), - TP_printk("%pS %p: nid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d pid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan,
Signature · 1 line
2.33.8
Steven Rostedt
maintainerRe: [PATCH v2 2/2] mm: vmscan: add PIDs to vmscan tracepoints
Quoted 9 lines · On Tue, 16 Dec 2025 06:02:52 -0800 Thomas Ballasi…
The changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses
in_task()to reliably detect when we're in process context and can safely accesscurrent->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.Signed-off-by Thomas Ballasi <[email protected]>
Is this really needed? The trace events already show if you are in interrupt context or not.
# tracer: nop
#
# entries-in-buffer/entries-written: 25817/25817 #P:8
#
# _-----=> irqs-off/BH-disabled
# / _----=> need-resched
# | / _---=> hardirq/softirq <<<<------ Shows irq context
# || / _--=> preempt-depth
# ||| / _-=> migrate-disable
# |||| / delay
# TASK-PID CPU# ||||| TIMESTAMP FUNCTION
# | | | ||||| | |
<idle>-0 [002] d..1. 11429.293552: rcu_watching: Startirq 0 1 0x74c
<idle>-0 [000] d.H1. 11429.293564: rcu_utilization: Start scheduler-tick
<idle>-0 [000] d.H1. 11429.293566: rcu_utilization: End scheduler-tick
<idle>-0 [002] dN.1. 11429.293567: rcu_watching: Endirq 1 0 0x74c
<idle>-0 [002] dN.1. 11429.293568: rcu_watching: Start 0 1 0x754
<idle>-0 [000] d.s1. 11429.293577: rcu_watching: --= 3 1 0xdf4
<idle>-0 [002] dN.1. 11429.293579: rcu_utilization: Start context switch
<idle>-0 [002] dN.1. 11429.293580: rcu_utilization: End context switch
rcu_sched-15 [002] d..1. 11429.293589: rcu_grace_period: rcu_sched 132685 start
<idle>-0 [000] dN.1. 11429.293592: rcu_watching: Endirq 1 0 0xdf4
rcu_sched-15 [002] d..1. 11429.293592: rcu_grace_period: rcu_sched 132685 cpustart
rcu_sched-15 [002] d..1. 11429.293592: rcu_grace_period_init: rcu_sched 132685 0 0 7 ff
<idle>-0 [000] dN.1. 11429.293593: rcu_watching: Start 0 1 0xdfcThus, you can already tell if you are in interrupt context or not, and you always get the current pid. The 'H', 'h' or 's' means you are in a interrupt type context. ('H' for hard interrupt interrupting a softirq, 'h' for just a hard interrupt, and 's' for a softirq).
What's the point of adding another field to cover the same information that's already available?
-- Steve
Re: [PATCH v2 2/2] mm: vmscan: add PIDs to vmscan tracepoints
Quoted 47 lines · Steven Rostedt
Quoted 9 lines · On Tue, 16 Dec 2025 06:02:52 -0800 Thomas Ballasi…
The changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses
in_task()to reliably detect when we're in process context and can safely accesscurrent->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.Signed-off-by Thomas Ballasi <[email protected]>Is this really needed? The trace events already show if you are in interrupt context or not.
# tracer: nop
#
# entries-in-buffer/entries-written: 25817/25817 #P:8
#
# _-----=> irqs-off/BH-disabled
# / _----=> need-resched# | / _---=> hardirq/softirq <<<<------ Shows irq context # || / _--=> preempt-depth # ||| / _-=> migrate-disable # |||| / delay # TASK-PID CPU# ||||| TIMESTAMP FUNCTION # | | | ||||| | | <idle>-0 [002] d..1. 11429.293552: rcu_watching: Startirq 0 1 0x74c <idle>-0 [000] d.H1. 11429.293564: rcu_utilization: Start scheduler-tick <idle>-0 [000] d.H1. 11429.293566: rcu_utilization: End scheduler-tick <idle>-0 [002] dN.1. 11429.293567: rcu_watching: Endirq 1 0 0x74c <idle>-0 [002] dN.1. 11429.293568: rcu_watching: Start 0 1 0x754 <idle>-0 [000] d.s1. 11429.293577: rcu_watching: --= 3 1 0xdf4 <idle>-0 [002] dN.1. 11429.293579: rcu_utilization: Start context switch <idle>-0 [002] dN.1. 11429.293580: rcu_utilization: End context switch rcu_sched-15 [002] d..1. 11429.293589: rcu_grace_period: rcu_sched 132685 start <idle>-0 [000] dN.1. 11429.293592: rcu_watching: Endirq 1 0 0xdf4 rcu_sched-15 [002] d..1. 11429.293592: rcu_grace_period: rcu_sched 132685 cpustart rcu_sched-15 [002] d..1. 11429.293592: rcu_grace_period_init: rcu_sched 132685 0 0 7 ff <idle>-0 [000] dN.1. 11429.293593: rcu_watching: Start 0 1 0xdfcThus, you can already tell if you are in interrupt context or not, and you always get the current pid. The 'H', 'h' or 's' means you are in a interrupt type context. ('H' for hard interrupt interrupting a softirq, 'h' for just a hard interrupt, and 's' for a softirq).
Quoted 4 lines
What's the point of adding another field to cover the same information that's already available?
-- Steve
(re-sending the reply as I believe I missed the reply all)
It indeed shows whether or not we're in an IRQ, but I believe the kernel shouldn't show erronous debugging values. Even though it can be obvious that we're in an interrupt, some people might look directly at the garbage PID value without having second thoughts and taking it for granted. On the other hand, it takes just a small check to mark the debugging information as clearly invalid, which complements the IRQ context flag.
If we shouldn't put that check there, I'd happily remove it, but I'd tend to think it's a trivial addition that can only be for the best.
Thomas
Steven Rostedt
maintainerRe: [PATCH v2 2/2] mm: vmscan: add PIDs to vmscan tracepoints
Quoted 10 lines · On Mon, 29 Dec 2025 02:54:27 -0800 Thomas Ballasi…
It indeed shows whether or not we're in an IRQ, but I believe the kernel shouldn't show erronous debugging values. Even though it can be obvious that we're in an interrupt, some people might look directly at the garbage PID value without having second thoughts and taking it for granted. On the other hand, it takes just a small check to mark the debugging information as clearly invalid, which complements the IRQ context flag.
If we shouldn't put that check there, I'd happily remove it, but I'd tend to think it's a trivial addition that can only be for the best.
I just don't like wasting valuable ring buffer space for something that can be easily determined without it.
How about this. I just wrote up this patch, and it could be something you use. I tested it against the sched waking events, by adding:
__entry->target_cpu = task_cpu(p);
),
- TP_printk("comm=%s pid=%d prio=%d target_cpu=%03d",
+ TP_printk("comm=%s pid=%d prio=%d target_cpu=%03d %s",
__entry->comm, __entry->pid, __entry->prio,
- __entry->target_cpu) + __entry->target_cpu, + __event_in_irq() ? "(in-irq)" : "")
);
Which produces:
<idle>-0 [003] d.h4. 44.832126: sched_waking: comm=in:imklog pid=619 prio=120 target_cpu=006 (in-irq)
<idle>-0 [003] d.s3. 44.832180: sched_waking: comm=rcu_preempt pid=15 prio=120 target_cpu=001 (in-irq)
in:imklog-619 [006] d..2. 44.832393: sched_waking: comm=rs:main Q:Reg pid=620 prio=120 target_cpu=003 You can see it adds "(in-irq)" when the even is executed from IRQ context (soft or hard irq). But I also added __event_in_hardirq() and __event_in_softirq() if you wanted to distinguish them.
Now you don't need to update what goes into the ring buffer (and waste its space), but only update the output format that makes it obvious that the task was in interrupt context or not.
I also used trace-cmd to record the events, and it still parses properly with no updates to libtraceevent needed.
Would this work for you?
Below is the patch that allows for this:
-- Steve
include/trace/stages/stage3_trace_output.h +8 -0
@@ -150,3 +150,11 @@#undef __get_buf#define __get_buf (len) trace_seq_acquire(p, (len)) + +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +#define __event_in_hardirq () (__entry->ent.flags & TRACE_FLAG_HARDIRQ) +#define __event_in_softirq () (__entry->ent.flags & TRACE_FLAG_SOFTIRQ) +#define __event_in_irq () (__entry->ent.flags & (TRACE_FLAG_HARDIRQ | TRACE_FLAG_SOFTIRQ))
include/trace/stages/stage7_class_define.h +19 -0
@@ -26,6 +26,25 @@#undef __print_hex_dump#undef __get_buf +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +/* +* The TRACE_FLAG_* are enums. Instead of using TRACE_DEFINE_ENUM(), +* use their hardcoded values. These values are parsed by user space +* tooling elsewhere so they will never change. +* +* See "enum trace_flag_type" in linux/trace_events.h: +* TRACE_FLAG_HARDIRQ +* TRACE_FLAG_SOFTIRQ +*/ + +/* This is what is displayed in the format files */ +#define __event_in_hardirq () (REC->common_flags & 0x8) +#define __event_in_softirq () (REC->common_flags & 0x10) +#define __event_in_irq () (REC->common_flags & 0x18) +/* * The below is not executed in the kernel. It is only what is * displayed in the print format for userspace to parse.
Steven Rostedt
maintainerRe: [PATCH v2 2/2] mm: vmscan: add PIDs to vmscan tracepoints
Quoted 27 lines · On Mon, 29 Dec 2025 13:29:42 -0500 Steven Rostedt <[email protected]> wrote:
I just don't like wasting valuable ring buffer space for something that can be easily determined without it.
How about this. I just wrote up this patch, and it could be something you use. I tested it against the sched waking events, by adding:
(quoted diff) +3
-2__entry->target_cpu = task_cpu(p); ), - TP_printk("comm=%s pid=%d prio=%d target_cpu=%03d", + TP_printk("comm=%s pid=%d prio=%d target_cpu=%03d %s", __entry->comm, __entry->pid, __entry->prio, - __entry->target_cpu) + __entry->target_cpu, + __event_in_irq() ? "(in-irq)" : "") );Which produces:
<idle>-0 [003] d.h4. 44.832126: sched_waking: comm=in:imklog pid=619 prio=120 target_cpu=006 (in-irq) <idle>-0 [003] d.s3. 44.832180: sched_waking: comm=rcu_preempt pid=15 prio=120 target_cpu=001 (in-irq) in:imklog-619 [006] d..2. 44.832393: sched_waking: comm=rs:main Q:Reg pid=620 prio=120 target_cpu=003You can see it adds "(in-irq)" when the even is executed from IRQ context (soft or hard irq). But I also added
__event_in_hardirq()and__event_in_softirq()if you wanted to distinguish them.
Quoted 8 lines
Now you don't need to update what goes into the ring buffer (and waste its space), but only update the output format that makes it obvious that the task was in interrupt context or not.
I also used trace-cmd to record the events, and it still parses properly with no updates to libtraceevent needed.
Would this work for you?
If this would work for you. Feel free to take the patch I posted and use that:
https://lore.kernel.org/all/[email protected]/
-- Steve
v3 cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
In reply to Thomas BallasiChanges in v3:
- Swapped multiple field entries to prevent a hole in the ring buffer
- Replaced in_task() with __event_in_irq
- Replaced mem_cgroup_id(memcg) with cgroup_id(memcg->css.cgroup)
- Rebased the tree to latest 6.18
Link to v2:
https://lore.kernel.org/linux-trace-kernel/[email protected]/
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 100 ++++++++++++++++++++++------------ mm/shrinker.c | 2 +- mm/vmscan.c | 17 +++--- 3 files changed, 74 insertions(+), 45 deletions(-)
Signature · 1 line
2.33.8
PATCH v3 1/2 mm: vmscan: add cgroup IDs to vmscan tracepoints
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 79 ++++++++++++++++++++--------------- mm/shrinker.c | 2 +- mm/vmscan.c | 17 ++++---- 3 files changed, 56 insertions(+), 42 deletions(-)
include/trace/events/vmscan.h +46 -33
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, unsigned short memcg_id), -TP_ARGS (order, gfp_flags), +TP_ARGS (gfp_flags, order, memcg_id),TP_STRUCT__entry ( - __field( int, order ) __field( unsigned long, gfp_flags ) + __field( int, order ) + __field( unsigned short, memcg_id ) ),TP_fast_assign ( - __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->order = order; + __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%u" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, unsigned short memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg_id),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) + __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%u" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#endif /* CONFIG_MEMCG */
@@ -208,31 +215,34 @@ TRACE_EVENT(mm_shrink_slab_start,TP_STRUCT__entry (__field (struct shrinker *,shr ) __field(void *, shrink) -__field (int, nid)__field (long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan) __field(int, priority) + __field(int, nid) + __field(unsigned short, memcg_id) ),TP_fast_assign ( __entry->shr = shr; __entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id = sc->memcg ?cgroup_id (sc->memcg->css.cgroup) :0 ; ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -242,36 +252,39 @@ TRACE_EVENT(mm_shrink_slab_start, ); TRACE_EVENT(mm_shrink_slab_end, - TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, + TP_PROTO(struct shrinker *shr, struct shrink_control *sc, int shrinker_retval, long unused_scan_cnt, long new_scan_cnt, long total_scan), - TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, + TP_ARGS(shr, sc, shrinker_retval, unused_scan_cnt, new_scan_cnt, total_scan), TP_STRUCT__entry( __field(struct shrinker *, shr) - __field(int, nid) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan) - __field(int, retval) __field(long, total_scan) + __field(int, nid) + __field(int, retval) + __field(unsigned short, memcg_id) ), TP_fast_assign( __entry->shr = shr; - __entry->nid = nid; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; - __entry->retval = shrinker_retval; __entry->total_scan = total_scan; + __entry->nid = sc->nid; + __entry->retval = shrinker_retval; + __entry->memcg_id = cgroup_id(sc->memcg->css.cgroup); ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -504,9 +517,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) ); TRACE_EVENT(mm_vmscan_throttled,
mm/shrinker.c +1 -1
@@ -461,7 +461,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl, freed, nr, new_nr, total_scan);return freed; }
mm/vmscan.c +9 -8
@@ -6642,11 +6642,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (sc.gfp_mask, order,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -6675,8 +6675,9 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, sc.gfp_mask = (gfp_mask &GFP_RECLAIM_MASK ) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK ); -trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); +trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.gfp_mask, + sc.order, +cgroup_id (memcg->css.cgroup));/* * NOTE: Although we can get the priority field, using it
@@ -6687,7 +6688,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed,cgroup_id (memcg->css.cgroup)); *nr_scanned = sc.nr_scanned;
@@ -6723,13 +6724,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (sc.gfp_mask,0 ,cgroup_id (memcg->css.cgroup)); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed,cgroup_id (memcg->css.cgroup));set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7675,7 +7676,7 @@ static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,delayacct_freepages_end ();psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed,0 );return sc->nr_reclaimed; }
Signature · 1 line
2.33.8
Shakeel Butt
reviewerRe: [PATCH v3 1/2] mm: vmscan: add cgroup IDs to vmscan tracepoints
Quoted 9 lines · Thomas Ballasi
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (
memcg_id) to key vmscan tracepoints to enable better correlation and analysis.For operations not associated with a specific cgroup, the field is defaulted to 0.
Signed-off-by Thomas Ballasi <[email protected]>
Couple of comments:
1. memcg_id is u64 but the patch is using 'unsigned short'.
2. I would prefer memcg pointer be passed in tracepoint and then in trace header file cgroup_id() be used similar to other users in include/trace/events/ folder.
Orthogonally I am cleaning up memcg id usage and after that cleanup, mem_cgroup_id() would be preferred way to get the ID. No need to do anything now as I will cleanup this usage later as well.
Shakeel Butt
reviewerRe: [PATCH v3 1/2] mm: vmscan: add cgroup IDs to vmscan tracepoints
On Mon, Jan 05, 2026 at 02:46:39PM -0800, Shakeel Butt wrote:
[...]
Quoted 4 lines
Orthogonally I am cleaning up memcg id usage and after that cleanup,
mem_cgroup_id()would be preferred way to get the ID. No need to do anything now as I will cleanup this usage later as well.
The series has been landed in mm-new. Please use mem_cgroup_id() instead of cgroup_id(memcg->css.cgroup).
Andrew Morton
maintainerRe: [PATCH v3 1/2] mm: vmscan: add cgroup IDs to vmscan tracepoints
Quoted 9 lines · On Wed, 7 Jan 2026 10:14:53 -0800 Shakeel Butt <[email protected]> wrote:
On Mon, Jan 05, 2026 at 02:46:39PM -0800, Shakeel Butt wrote:
[...]Quoted 4 lines
Orthogonally I am cleaning up memcg id usage and after that cleanup,
mem_cgroup_id()would be preferred way to get the ID. No need to do anything now as I will cleanup this usage later as well.The series has been landed in mm-new. Please use
mem_cgroup_id()instead ofcgroup_id(memcg->css.cgroup).
fyi, I removed this series yesterday due to a CONFIG_MEMCG=n build failure.
Shakeel Butt
reviewerRe: [PATCH v3 1/2] mm: vmscan: add cgroup IDs to vmscan tracepoints
Quoted 5 lines · Andrew Morton
Quoted 3 lines · On Wed, 7 Jan 2026 10:14:53 -0800 Shakeel Butt <[email protected]> wrote:
On Mon, Jan 05, 2026 at 02:46:39PM -0800, Shakeel Butt wrote:
[...]Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Orthogonally I am cleaning up memcg id usage and after that cleanup,
mem_cgroup_id()would be preferred way to get the ID. No need to do anything now as I will cleanup this usage later as well.The series has been landed in mm-new. Please use
mem_cgroup_id()instead ofcgroup_id(memcg->css.cgroup).fyi, I removed this series yesterday due to a
CONFIG_MEMCG=nbuild failure.
Oh sorry, I meant my series [1] landed in mm-new and with that Thomas can directly use mem_cgroup_id() without worrying about CONFIG_MEMCG=n.
build error on CONFIG_MEMCG=n "error: invalid use of undefined type 'struct mem_cgroup'"
In reply to Thomas BallasiQuoted 22 lines · Thomas Ballasi
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (
memcg_id) to key vmscan tracepoints to enable better correlation and analysis.For operations not associated with a specific cgroup, the field is defaulted to 0.
Signed-off-by Thomas Ballasi <[email protected]>--- include/trace/events/vmscan.h | 79 ++++++++++++++++++++--------------- mm/shrinker.c | 2 +- mm/vmscan.c | 17 ++++---- 3 files changed, 56 insertions(+), 42 deletions(-)include/trace/events/vmscan.h +0
-0@@ -208,31 +215,34 @@ TRACE_EVENT(mm_shrink_slab_start,TP_fast_assign ( __entry->shr = shr;
include/trace/events/vmscan.h TRACE_EVENT(mm_shrink_slab_start, · line 225
Quoted 10 lines
include/trace/events/vmscan.h +2
-1__entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id = sc->memcg ?cgroup_id (sc->memcg->css.cgroup) :0 ;
Hi Thomas, this is breaking CONFIG_MEMCG=n builds.
In file included from ./include/trace/define_trace.h:132,
from ./include/trace/events/vmscan.h:569,
from mm/vmscan.c:73:./include/trace/events/vmscan.h: In function ‘do_trace_event_raw_event_mm_shrink_slab_start’:./include/trace/events/vmscan.h:248:68: error: invalid use of undefined type ‘struct mem_cgroup’
248 | __entry->memcg_id = sc->memcg ? cgroup_id(sc->memcg->css.cgroup) : 0;
| ^~./include/trace/trace_events.h:427:11: note: in definition of macro ‘__DECLARE_EVENT_CLASS’
427 | { assign; } \
| ^~~~~~
./include/trace/trace_events.h:435:23: note: in expansion of macro ‘PARAMS’
435 | PARAMS(assign), PARAMS(print)) \
| ^~~~~~
./include/trace/trace_events.h:40:9: note: in expansion of macro ‘DECLARE_EVENT_CLASS’
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
./include/trace/trace_events.h:44:30: note: in expansion of macro ‘PARAMS’
44 | PARAMS(assign), \
| ^~~~~~
./include/trace/events/vmscan.h:214:1: note: in expansion of macro ‘TRACE_EVENT’
214 | TRACE_EVENT(mm_shrink_slab_start,
| ^~~~~~~~~~~
./include/trace/events/vmscan.h:237:9: note: in expansion of macro ‘TP_fast_assign’
237 | TP_fast_assign(
| ^~~~~~~~~~~~~~./include/trace/events/vmscan.h: In function ‘do_trace_event_raw_event_mm_shrink_slab_end’:./include/trace/events/vmscan.h:293:56: error: invalid use of undefined type ‘struct mem_cgroup’
293 | __entry->memcg_id = cgroup_id(sc->memcg->css.cgroup);
| ^~./include/trace/trace_events.h:427:11: note: in definition of macro ‘__DECLARE_EVENT_CLASS’
427 | { assign; } \
| ^~~~~~
./include/trace/trace_events.h:435:23: note: in expansion of macro ‘PARAMS’
435 | PARAMS(assign), PARAMS(print)) \
| ^~~~~~
./include/trace/trace_events.h:40:9: note: in expansion of macro ‘DECLARE_EVENT_CLASS’
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
./include/trace/trace_events.h:44:30: note: in expansion of macro ‘PARAMS’
44 | PARAMS(assign), \
| ^~~~~~
./include/trace/events/vmscan.h:266:1: note: in expansion of macro ‘TRACE_EVENT’
266 | TRACE_EVENT(mm_shrink_slab_end,
| ^~~~~~~~~~~
./include/trace/events/vmscan.h:285:9: note: in expansion of macro ‘TP_fast_assign’
285 | TP_fast_assign(
| ^~~~~~~~~~~~~~In file included from ./include/trace/define_trace.h:133:./include/trace/events/vmscan.h: In function ‘do_perf_trace_mm_shrink_slab_start’:./include/trace/events/vmscan.h:248:68: error: invalid use of undefined type ‘struct mem_cgroup’
248 | __entry->memcg_id = sc->memcg ? cgroup_id(sc->memcg->css.cgroup) : 0;
| ^~./include/trace/perf.h:51:11: note: in definition of macro ‘__DECLARE_EVENT_CLASS’
51 | { assign; } \
| ^~~~~~
./include/trace/perf.h:67:23: note: in expansion of macro ‘PARAMS’
67 | PARAMS(assign), PARAMS(print)) \
| ^~~~~~
./include/trace/trace_events.h:40:9: note: in expansion of macro ‘DECLARE_EVENT_CLASS’
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
./include/trace/trace_events.h:44:30: note: in expansion of macro ‘PARAMS’
44 | PARAMS(assign), \
| ^~~~~~
./include/trace/events/vmscan.h:214:1: note: in expansion of macro ‘TRACE_EVENT’
214 | TRACE_EVENT(mm_shrink_slab_start,
| ^~~~~~~~~~~
./include/trace/events/vmscan.h:237:9: note: in expansion of macro ‘TP_fast_assign’
237 | TP_fast_assign(
| ^~~~~~~~~~~~~~./include/trace/events/vmscan.h: In function ‘do_perf_trace_mm_shrink_slab_end’:./include/trace/events/vmscan.h:293:56: error: invalid use of undefined type ‘struct mem_cgroup’
293 | __entry->memcg_id = cgroup_id(sc->memcg->css.cgroup);
| ^~./include/trace/perf.h:51:11: note: in definition of macro ‘__DECLARE_EVENT_CLASS’
51 | { assign; } \
| ^~~~~~
./include/trace/perf.h:67:23: note: in expansion of macro ‘PARAMS’
67 | PARAMS(assign), PARAMS(print)) \
| ^~~~~~
./include/trace/trace_events.h:40:9: note: in expansion of macro ‘DECLARE_EVENT_CLASS’
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
./include/trace/trace_events.h:44:30: note: in expansion of macro ‘PARAMS’
44 | PARAMS(assign), \
| ^~~~~~
./include/trace/events/vmscan.h:266:1: note: in expansion of macro ‘TRACE_EVENT’
266 | TRACE_EVENT(mm_shrink_slab_end,
| ^~~~~~~~~~~
./include/trace/events/vmscan.h:285:9: note: in expansion of macro ‘TP_fast_assign’
285 | TP_fast_assign(
| ^~~~~~~~~~~~~~ CC arch/x86/mm/extable.o
make[3]: *** [scripts/Makefile.build:287: mm/vmscan.o] Error 1 make[2]: *** [scripts/Makefile.build:556: mm] Error 2 make[2]: *** Waiting for unfinished jobs....
Signature · 2 lines
Cheers, Harry / Hyeonggon
Quoted 70 lines
include/trace/events/vmscan.h +14
-10), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,@@ -242,36 +252,39 @@ TRACE_EVENT(mm_shrink_slab_start, ); TRACE_EVENT(mm_shrink_slab_end, - TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, + TP_PROTO(struct shrinker *shr, struct shrink_control *sc, int shrinker_retval, long unused_scan_cnt, long new_scan_cnt, long total_scan), - TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, + TP_ARGS(shr, sc, shrinker_retval, unused_scan_cnt, new_scan_cnt, total_scan), TP_STRUCT__entry( __field(struct shrinker *, shr) - __field(int, nid) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan) - __field(int, retval) __field(long, total_scan) + __field(int, nid) + __field(int, retval) + __field(unsigned short, memcg_id) ), TP_fast_assign( __entry->shr = shr; - __entry->nid = nid; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; - __entry->retval = shrinker_retval; __entry->total_scan = total_scan; + __entry->nid = sc->nid; + __entry->retval = shrinker_retval; + __entry->memcg_id = cgroup_id(sc->memcg->css.cgroup); ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,@@ -504,9 +517,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, unsigned short memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) ); TRACE_EVENT(mm_vmscan_throttled,
Andrew Morton
maintainerRe: build error on CONFIG_MEMCG=n "error: invalid use of undefined type 'struct mem_cgroup'"
Quoted 9 lines · On Wed, 7 Jan 2026 10:56:46 +0900 Harry Yoo <[email protected]> wrote:
Quoted 9 lines
include/trace/events/vmscan.h +0
-1@@ -208,31 +215,34 @@ TRACE_EVENT(mm_shrink_slab_start,TP_fast_assign ( __entry->shr = shr; __entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask;
Quoted 8 lines
include/trace/events/vmscan.h TRACE_EVENT(mm_shrink_slab_start, · line 238
Quoted 6 lines
include/trace/events/vmscan.h +2
-0__entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id = sc->memcg ?cgroup_id (sc->memcg->css.cgroup) :0 ;Hi Thomas, this is breaking
CONFIG_MEMCG=nbuilds.
yup, thanks, that series has been removed from mm.git.
PATCH v3 2/2 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses in_task() to reliably detect when we're in process context and can safely access current->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.
--- include/trace/events/vmscan.h | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-)
include/trace/events/vmscan.h +24 -9
@@ -121,19 +121,23 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,TP_STRUCT__entry (__field (unsigned long ,gfp_flags )__field ( int, order ) +__field ( int, pid ) __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; + __entry->pid = current->pid; __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%u" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%u %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, ++__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
@@ -167,17 +171,21 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed ) +__field ( int, pid ) __field( unsigned short, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->pid = current->pid; __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%u" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%u %s" , __entry->nr_reclaimed, - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
@@ -222,6 +230,7 @@ TRACE_EVENT(mm_shrink_slab_start, __field(unsigned long, total_scan) __field(int, priority) __field(int, nid) + __field(int, pid) __field(unsigned short, memcg_id) ),
@@ -235,20 +244,23 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->total_scan = total_scan; __entry->priority = priority; __entry->nid = sc->nid; + __entry->pid = current->pid; __entry->memcg_id = sc->memcg ?cgroup_id (sc->memcg->css.cgroup) :0 ; ), -TP_printk ("%pS %p: nid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %u objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink,show_gfp_flags (__entry->gfp_flags), __entry->cache_items, __entry->delta, __entry->total_scan, - __entry->priority) + __entry->priority, ++__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_shrink_slab_end,
@@ -266,29 +278,32 @@ TRACE_EVENT(mm_shrink_slab_end, __field(long, total_scan) __field(int, nid) __field(int, retval) + __field(int, pid) __field(unsigned short, memcg_id) ),TP_fast_assign ( __entry->shr = shr; - __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; __entry->total_scan = total_scan; __entry->nid = sc->nid; __entry->retval = shrinker_retval; + __entry->pid = current->pid; __entry->memcg_id =cgroup_id (sc->memcg->css.cgroup); ), -TP_printk ("%pS %p: nid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %u unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan, - __entry->retval) + __entry->retval, ++__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_vmscan_lru_isolate,
Signature · 1 line
2.33.8
kernel test robot
build botRe: [PATCH v3 2/2] mm: vmscan: add PIDs to vmscan tracepoints
kernel test robot noticed the following build errors:
Hi Thomas,
kernel test robot noticed the following build errors:
[auto build test ERROR on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Thomas-Ballasi/mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints/20260106-000721 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/20260105160423.23708-3-tballasi%40linux.microsoft.com patch subject: [PATCH v3 2/2] mm: vmscan: add PIDs to vmscan tracepoints config: x86_64-kexec (https://download.01.org/0day-ci/archive/20260106/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260106/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from mm/vmscan.c:73:
In file included from include/trace/events/vmscan.h:569:
In file included from include/trace/define_trace.h:132:
In file included from include/trace/trace_events.h:256:
>> include/trace/events/vmscan.h:140:4: error: call to undeclared function '__event_in_irq'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
140 | + __event_in_irq() ? "(in-irq)" : "")
| ^
include/trace/events/vmscan.h:188:3: error: call to undeclared function '__event_in_irq'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
188 | __event_in_irq() ? "(in-irq)" : "")
| ^
include/trace/events/vmscan.h:263:4: error: call to undeclared function '__event_in_irq'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
263 | + __event_in_irq() ? "(in-irq)" : "")
| ^
include/trace/events/vmscan.h:306:4: error: call to undeclared function '__event_in_irq'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
306 | + __event_in_irq() ? "(in-irq)" : "")
| ^4 errors generated.
vim +/__event_in_irq +140 include/trace/events/vmscan.h
116
117 TP_PROTO(gfp_t gfp_flags, int order, unsigned short memcg_id),
118
119 TP_ARGS(gfp_flags, order, memcg_id),
120
121 TP_STRUCT__entry(
122 __field( unsigned long, gfp_flags )
123 __field( int, order )
124 __field( int, pid )
125 __field( unsigned short, memcg_id )
126 ),
127
128 TP_fast_assign(
129 __entry->gfp_flags = (__force unsigned long)gfp_flags;
130 __entry->order = order;
131 __entry->pid = current->pid;
132 __entry->memcg_id = memcg_id;
133 ),
134
135 TP_printk("order=%d gfp_flags=%s pid=%d memcg_id=%u %s",
136 __entry->order,
137 show_gfp_flags(__entry->gfp_flags),
138 __entry->pid,
139 __entry->memcg_id,
> 140 + __event_in_irq() ? "(in-irq)" : "")
141 );
142
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v3 2/2] mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas Ballasikernel test robot noticed the following build errors:
Hi Thomas,
kernel test robot noticed the following build errors:
[auto build test ERROR on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Thomas-Ballasi/mm-vmscan-add-cgroup-IDs-to-vmscan-tracepoints/20260106-000721 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/20260105160423.23708-3-tballasi%40linux.microsoft.com patch subject: [PATCH v3 2/2] mm: vmscan: add PIDs to vmscan tracepoints config: x86_64-rhel-9.4-ltp (https://download.01.org/0day-ci/archive/20260106/[email protected]/config) compiler: gcc-14 (Debian 14.2.0-19) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260106/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from include/trace/define_trace.h:132,
from include/trace/events/vmscan.h:569,
from mm/vmscan.c:73:
include/trace/events/vmscan.h: In function 'trace_raw_output_mm_vmscan_direct_reclaim_begin_template':
>> include/trace/events/vmscan.h:140:17: error: implicit declaration of function '__event_in_irq' [-Wimplicit-function-declaration]
140 | + __event_in_irq() ? "(in-irq)" : "")
| ^~~~~~~~~~~~~~
include/trace/trace_events.h:219:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
219 | trace_event_printf(iter, print); \
| ^~~~~
include/trace/events/vmscan.h:135:9: note: in expansion of macro 'TP_printk'
135 | TP_printk("order=%d gfp_flags=%s pid=%d memcg_id=%u %s",
| ^~~~~~~~~vim +/__event_in_irq +140 include/trace/events/vmscan.h
116
117 TP_PROTO(gfp_t gfp_flags, int order, unsigned short memcg_id),
118
119 TP_ARGS(gfp_flags, order, memcg_id),
120
121 TP_STRUCT__entry(
122 __field( unsigned long, gfp_flags )
123 __field( int, order )
124 __field( int, pid )
125 __field( unsigned short, memcg_id )
126 ),
127
128 TP_fast_assign(
129 __entry->gfp_flags = (__force unsigned long)gfp_flags;
130 __entry->order = order;
131 __entry->pid = current->pid;
132 __entry->memcg_id = memcg_id;
133 ),
134
135 TP_printk("order=%d gfp_flags=%s pid=%d memcg_id=%u %s",
136 __entry->order,
137 show_gfp_flags(__entry->gfp_flags),
138 __entry->pid,
139 __entry->memcg_id,
> 140 + __event_in_irq() ? "(in-irq)" : "")
141 );
142
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Andrew Morton
maintainerQuoted 5 lines · On Mon, 5 Jan 2026 08:04:21 -0800 Thomas Ballasi…
Changes in v3:
- Swapped multiple field entries to prevent a hole in the ring buffer
- Replacedin_task()with__event_in_irq
- Replacedmem_cgroup_id(memcg)withcgroup_id(memcg->css.cgroup)
- Rebased the tree to latest 6.18
x86_64 allmodconfig;
In file included from ./include/trace/define_trace.h:132,
from ./include/trace/events/vmscan.h:569,
from mm/vmscan.c:73:
./include/trace/events/vmscan.h: In function 'trace_raw_output_mm_vmscan_direct_reclaim_begin_template':
./include/trace/events/vmscan.h:140:17: error: implicit declaration of function '__event_in_irq' [-Wimplicit-function-declaration]
140 | + __event_in_irq() ? "(in-irq)" : "")
| ^~~~~~~~~~~~~~./include/trace/trace_events.h:219:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
219 | trace_event_printf(iter, print); \
| ^~~~~./include/trace/events/vmscan.h:135:9: note: in expansion of macro 'TP_printk'
135 | TP_printk("order=%d gfp_flags=%s pid=%d memcg_id=%u %s",
| ^~~~~~~~~make[3]: *** [scripts/Makefile.build:287: mm/vmscan.o] Error 1 make[2]: *** [scripts/Makefile.build:556: mm] Error 2 make[1]: *** [/usr/src/25/Makefile:2054: .] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Steven Rostedt
maintainerQuoted 22 lines · On Mon, 5 Jan 2026 18:06:40 -0800 Andrew Morton <[email protected]>…
Quoted 5 lines · On Mon, 5 Jan 2026 08:04:21 -0800 Thomas Ballasi…
Changes in v3:
- Swapped multiple field entries to prevent a hole in the ring buffer
- Replacedin_task()with__event_in_irq
- Replacedmem_cgroup_id(memcg)withcgroup_id(memcg->css.cgroup)
- Rebased the tree to latest 6.18
x86_64allmodconfig;In file included from
./include/trace/define_trace.h:132,from ./include/trace/events/vmscan.h:569, from mm/vmscan.c:73: ./include/trace/events/vmscan.h: In function 'trace_raw_output_mm_vmscan_direct_reclaim_begin_template': ./include/trace/events/vmscan.h:140:17: error: implicit declaration of function '__event_in_irq' [-Wimplicit-function-declaration] 140 | + __event_in_irq() ? "(in-irq)" : "") | ^~~~~~~~~~~~~~
./include/trace/trace_events.h:219:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
219 |trace_event_printf(iter, print); \
| ^~~~~./include/trace/events/vmscan.h:135:9: note: in expansion of macro 'TP_printk'
Quoted 6 lines
135 | TP_printk("order=%d gfp_flags=%s pid=%d memcg_id=%u %s", | ^~~~~~~~~make[3]: *** [
scripts/Makefile.build:287:mm/vmscan.o] Error 1 make[2]: *** [scripts/Makefile.build:556: mm] Error 2 make[1]: *** [/usr/src/25/Makefile:2054: .] Error 2
make: *** [Makefile:248: __sub-make] Error 2
This is dependent on my patch:
https://lore.kernel.org/all/[email protected]/
Where I said you can take this patch. But I don't see it as part of the series.
https://lore.kernel.org/all/[email protected]/
-- Steve
v4 cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
In reply to Thomas BallasiChanges in v4:
- added Steven's patch for __even_in_*irq() calls
- moved back to mem_cgroup_id() following Shakeel's changes
- passed cgroup ID through trace calls for slab_* tracepoints instead of in vmscan.h directly
- changed memcg_id instances types from unsigned short to u64 and updated struct entries accordingly
Link to v3:
https://lore.kernel.org/linux-trace-kernel/[email protected]/
Steven Rostedt (1):
tracing: Add __event_in_*irq() helpers
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 104 +++++++++++++-------- include/trace/stages/stage3_trace_output.h | 8 ++ include/trace/stages/stage7_class_define.h | 19 ++++ mm/shrinker.c | 6 +- mm/vmscan.c | 17 ++-- 5 files changed, 106 insertions(+), 48 deletions(-)
Signature · 1 line
2.33.8
PATCH v4 1/3 tracing: Add __event_in_*irq() helpers
From: Steven Rostedt <[email protected]>
Some trace events want to expose in their output if they were triggered in an interrupt or softirq context. Instead of recording this in the event structure itself, as this information is stored in the flags portion of the event header, add helper macros that can be used in the print format:
TP_printk("val=%d %s", __entry->val, __entry_in_irq() ? "(in-irq)" : "")
This will output "(in-irq)" for the event in the trace data if the event was triggered in hard or soft interrupt context.
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -150,3 +150,11 @@#undef __get_buf#define __get_buf (len) trace_seq_acquire(p, (len)) + +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +#define __event_in_hardirq () (__entry->ent.flags & TRACE_FLAG_HARDIRQ) +#define __event_in_softirq () (__entry->ent.flags & TRACE_FLAG_SOFTIRQ) +#define __event_in_irq () (__entry->ent.flags & (TRACE_FLAG_HARDIRQ | TRACE_FLAG_SOFTIRQ))
include/trace/stages/stage7_class_define.h +19 -0
@@ -26,6 +26,25 @@#undef __print_hex_dump#undef __get_buf +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +/* +* The TRACE_FLAG_* are enums. Instead of using TRACE_DEFINE_ENUM(), +* use their hardcoded values. These values are parsed by user space +* tooling elsewhere so they will never change. +* +* See "enum trace_flag_type" in linux/trace_events.h: +* TRACE_FLAG_HARDIRQ +* TRACE_FLAG_SOFTIRQ +*/ + +/* This is what is displayed in the format files */ +#define __event_in_hardirq () (REC->common_flags & 0x8) +#define __event_in_softirq () (REC->common_flags & 0x10) +#define __event_in_irq () (REC->common_flags & 0x18) +/* * The below is not executed in the kernel. It is only what is * displayed in the print format for userspace to parse.
Signature · 1 line
2.33.8
PATCH v4 2/3 mm: vmscan: add cgroup IDs to vmscan tracepoints
In reply to Thomas BallasiMemory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 83 ++++++++++++++++++++--------------- mm/shrinker.c | 6 ++- mm/vmscan.c | 17 +++---- 3 files changed, 61 insertions(+), 45 deletions(-)
include/trace/events/vmscan.h +48 -35
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags), +TP_ARGS (gfp_flags, order, memcg_id),TP_STRUCT__entry ( - __field( int, order ) __field( unsigned long, gfp_flags ) + __field( u64, memcg_id ) +__field ( int, order ) ),TP_fast_assign ( - __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->order = order; + __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg_id),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) +__field ( u64, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#endif /* CONFIG_MEMCG */
@@ -200,39 +207,42 @@ TRACE_EVENT(mm_shrink_slab_start, TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long nr_objects_to_shrink, unsigned long cache_items, unsigned long long delta, unsigned long total_scan, - int priority), + int priority, u64 memcg_id),TP_ARGS (shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan, - priority), + priority, memcg_id),TP_STRUCT__entry ( __field(struct shrinker *, shr)__field (void *,shrink ) -__field (int, nid)__field (long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan)__field (int, priority) +__field (int, nid) +__field (u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; __entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id = memcg_id; ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -243,35 +253,38 @@ TRACE_EVENT(mm_shrink_slab_start, TRACE_EVENT(mm_shrink_slab_end, TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt, long total_scan), + long unused_scan_cnt, long new_scan_cnt, long total_scan, u64 memcg_id), TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, - total_scan), + total_scan, memcg_id), TP_STRUCT__entry( __field(struct shrinker *, shr) - __field(int, nid) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan) - __field(int, retval) __field(long, total_scan) + __field(int, nid) + __field(int, retval) + __field(u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; - __entry->nid = nid; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; - __entry->retval = shrinker_retval; __entry->total_scan = total_scan; + __entry->nid = nid; + __entry->retval = shrinker_retval; + __entry->memcg_id = memcg_id; ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -504,9 +517,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) ); TRACE_EVENT(mm_vmscan_throttled,
mm/shrinker.c +4 -2
@@ -410,7 +410,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, total_scan =min (total_scan, (2 * freeable));trace_mm_shrink_slab_start (shrinker, shrinkctl, nr, - freeable, delta, total_scan, priority); + freeable, delta, total_scan, priority, +mem_cgroup_id (shrinkctl->memcg));/* * Normally, we should not scan less than batch_size objects in one
@@ -461,7 +462,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan, +mem_cgroup_id (shrinkctl->memcg));return freed; }
mm/vmscan.c +9 -8
@@ -6642,11 +6642,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (sc.gfp_mask, order,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -6675,8 +6675,9 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, sc.gfp_mask = (gfp_mask &GFP_RECLAIM_MASK ) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK ); -trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); +trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.gfp_mask, + sc.order, +mem_cgroup_id (memcg));/* * NOTE: Although we can get the priority field, using it
@@ -6687,7 +6688,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed,mem_cgroup_id (memcg)); *nr_scanned = sc.nr_scanned;
@@ -6723,13 +6724,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (sc.gfp_mask,0 ,mem_cgroup_id (memcg)); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed,mem_cgroup_id (memcg));set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7675,7 +7676,7 @@ static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,delayacct_freepages_end ();psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed,0 );return sc->nr_reclaimed; }
Signature · 1 line
2.33.8
PATCH v4 3/3 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses in_task() to reliably detect when we're in process context and can safely access current->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.
--- include/trace/events/vmscan.h | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
include/trace/events/vmscan.h +25 -10
@@ -122,18 +122,22 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, __field( unsigned long, gfp_flags ) __field( u64, memcg_id ) __field( int, order ) + __field( int, pid ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; + __entry->pid = current->pid; __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, ++__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
@@ -168,16 +172,20 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed )__field ( u64, memcg_id ) +__field ( int, pid ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; __entry->memcg_id = memcg_id; + __entry->pid = current->pid; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%llu %s" , __entry->nr_reclaimed, - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
@@ -220,9 +228,10 @@ TRACE_EVENT(mm_shrink_slab_start, __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan) + __field(u64, memcg_id) __field(int, priority) __field(int, nid) - __field(u64, memcg_id) + __field(int, pid) ), TP_fast_assign(
@@ -236,19 +245,22 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; __entry->nid = sc->nid; __entry->memcg_id = memcg_id; + __entry->pid = current->pid; ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink,show_gfp_flags (__entry->gfp_flags), __entry->cache_items, __entry->delta, __entry->total_scan, - __entry->priority) + __entry->priority, ++__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_shrink_slab_end,
@@ -266,29 +278,32 @@ TRACE_EVENT(mm_shrink_slab_end, __field(long, total_scan) __field(int, nid) __field(int, retval) + __field(int, pid)__field (u64, memcg_id) ),TP_fast_assign ( __entry->shr = shr; - __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; __entry->total_scan = total_scan; __entry->nid = nid; __entry->retval = shrinker_retval; + __entry->pid = current->pid; __entry->memcg_id = memcg_id; ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan, - __entry->retval) + __entry->retval, ++__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_vmscan_lru_isolate,
Signature · 1 line
2.33.8
v5 cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
In reply to Thomas BallasiChanges in v5:
- Fixed a small quirk that added extra +'s at (in-irq) warnings
Link to v4:
https://lore.kernel.org/linux-trace-kernel/[email protected]/
Steven Rostedt (1):
tracing: Add __event_in_*irq() helpers
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 104 +++++++++++++-------- include/trace/stages/stage3_trace_output.h | 8 ++ include/trace/stages/stage7_class_define.h | 19 ++++ mm/shrinker.c | 6 +- mm/vmscan.c | 17 ++-- 5 files changed, 106 insertions(+), 48 deletions(-)
Signature · 1 line
2.33.8
PATCH v5 1/3 tracing: Add __event_in_*irq() helpers
From: Steven Rostedt <[email protected]>
Some trace events want to expose in their output if they were triggered in an interrupt or softirq context. Instead of recording this in the event structure itself, as this information is stored in the flags portion of the event header, add helper macros that can be used in the print format:
TP_printk("val=%d %s", __entry->val, __entry_in_irq() ? "(in-irq)" : "")
This will output "(in-irq)" for the event in the trace data if the event was triggered in hard or soft interrupt context.
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -150,3 +150,11 @@#undef __get_buf#define __get_buf (len) trace_seq_acquire(p, (len)) + +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +#define __event_in_hardirq () (__entry->ent.flags & TRACE_FLAG_HARDIRQ) +#define __event_in_softirq () (__entry->ent.flags & TRACE_FLAG_SOFTIRQ) +#define __event_in_irq () (__entry->ent.flags & (TRACE_FLAG_HARDIRQ | TRACE_FLAG_SOFTIRQ))
include/trace/stages/stage7_class_define.h +19 -0
@@ -26,6 +26,25 @@#undef __print_hex_dump#undef __get_buf +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +/* +* The TRACE_FLAG_* are enums. Instead of using TRACE_DEFINE_ENUM(), +* use their hardcoded values. These values are parsed by user space +* tooling elsewhere so they will never change. +* +* See "enum trace_flag_type" in linux/trace_events.h: +* TRACE_FLAG_HARDIRQ +* TRACE_FLAG_SOFTIRQ +*/ + +/* This is what is displayed in the format files */ +#define __event_in_hardirq () (REC->common_flags & 0x8) +#define __event_in_softirq () (REC->common_flags & 0x10) +#define __event_in_irq () (REC->common_flags & 0x18) +/* * The below is not executed in the kernel. It is only what is * displayed in the print format for userspace to parse.
Signature · 1 line
2.33.8
PATCH v5 2/3 mm: vmscan: add cgroup IDs to vmscan tracepoints
In reply to Thomas BallasiMemory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 83 ++++++++++++++++++++--------------- mm/shrinker.c | 6 ++- mm/vmscan.c | 17 +++---- 3 files changed, 61 insertions(+), 45 deletions(-)
include/trace/events/vmscan.h +48 -35
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags), +TP_ARGS (gfp_flags, order, memcg_id),TP_STRUCT__entry ( - __field( int, order ) __field( unsigned long, gfp_flags ) + __field( u64, memcg_id ) +__field ( int, order ) ),TP_fast_assign ( - __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->order = order; + __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg_id) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg_id),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) +__field ( u64, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = memcg_id; ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) );#endif /* CONFIG_MEMCG */
@@ -200,39 +207,42 @@ TRACE_EVENT(mm_shrink_slab_start, TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long nr_objects_to_shrink, unsigned long cache_items, unsigned long long delta, unsigned long total_scan, - int priority), + int priority, u64 memcg_id),TP_ARGS (shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan, - priority), + priority, memcg_id),TP_STRUCT__entry ( __field(struct shrinker *, shr)__field (void *,shrink ) -__field (int, nid)__field (long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan)__field (int, priority) +__field (int, nid) +__field (u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; __entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id = memcg_id; ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -243,35 +253,38 @@ TRACE_EVENT(mm_shrink_slab_start, TRACE_EVENT(mm_shrink_slab_end, TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt, long total_scan), + long unused_scan_cnt, long new_scan_cnt, long total_scan, u64 memcg_id), TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, - total_scan), + total_scan, memcg_id), TP_STRUCT__entry( __field(struct shrinker *, shr) - __field(int, nid) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan) - __field(int, retval) __field(long, total_scan) + __field(int, nid) + __field(int, retval) + __field(u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; - __entry->nid = nid; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; - __entry->retval = shrinker_retval; __entry->total_scan = total_scan; + __entry->nid = nid; + __entry->retval = shrinker_retval; + __entry->memcg_id = memcg_id; ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -504,9 +517,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, u64 memcg_id), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg_id) ); TRACE_EVENT(mm_vmscan_throttled,
mm/shrinker.c +4 -2
@@ -410,7 +410,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, total_scan =min (total_scan, (2 * freeable));trace_mm_shrink_slab_start (shrinker, shrinkctl, nr, - freeable, delta, total_scan, priority); + freeable, delta, total_scan, priority, +mem_cgroup_id (shrinkctl->memcg));/* * Normally, we should not scan less than batch_size objects in one
@@ -461,7 +462,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan, +mem_cgroup_id (shrinkctl->memcg));return freed; }
mm/vmscan.c +9 -8
@@ -6642,11 +6642,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (sc.gfp_mask, order,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -6675,8 +6675,9 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, sc.gfp_mask = (gfp_mask &GFP_RECLAIM_MASK ) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK ); -trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); +trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.gfp_mask, + sc.order, +mem_cgroup_id (memcg));/* * NOTE: Although we can get the priority field, using it
@@ -6687,7 +6688,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed,mem_cgroup_id (memcg)); *nr_scanned = sc.nr_scanned;
@@ -6723,13 +6724,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (sc.gfp_mask,0 ,mem_cgroup_id (memcg)); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed,mem_cgroup_id (memcg));set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7675,7 +7676,7 @@ static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,delayacct_freepages_end ();psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed,0 );return sc->nr_reclaimed; }
Signature · 1 line
2.33.8
Shakeel Butt
reviewerRe: [PATCH v5 2/3] mm: vmscan: add cgroup IDs to vmscan tracepoints
Quoted 31 lines · Thomas Ballasi
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (
memcg_id) to key vmscan tracepoints to enable better correlation and analysis.For operations not associated with a specific cgroup, the field is defaulted to 0.
Signed-off-by Thomas Ballasi <[email protected]>--- include/trace/events/vmscan.h | 83 ++++++++++++++++++++--------------- mm/shrinker.c | 6 ++- mm/vmscan.c | 17 +++---- 3 files changed, 61 insertions(+), 45 deletions(-)include/trace/events/vmscan.h +2
-3@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd, DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, u64 memcg_id), - TP_ARGS(order, gfp_flags), + TP_ARGS(gfp_flags, order, memcg_id), TP_STRUCT__entry( - __field( int, order )
include/trace/events/vmscan.h TRACE_EVENT(mm_vmscan_wakeup_kswapd, · line 130
Quoted 10 lines
include/trace/events/vmscan.h +4
-1__field( unsigned long, gfp_flags ) + __field( u64, memcg_id ) + __field( int, order ) ),TP_fast_assign ( - __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->order = order; + __entry->memcg_id = memcg_id;
Please pass memcg pointer to tracepoints and call mem_cgroup_id(memcg) here.
PATCH v5 3/3 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses in_task() to reliably detect when we're in process context and can safely access current->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.
--- include/trace/events/vmscan.h | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
include/trace/events/vmscan.h +25 -10
@@ -122,18 +122,22 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, __field( unsigned long, gfp_flags ) __field( u64, memcg_id ) __field( int, order ) + __field( int, pid ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; + __entry->pid = current->pid; __entry->memcg_id = memcg_id; ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
@@ -168,16 +172,20 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed )__field ( u64, memcg_id ) +__field ( int, pid ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; __entry->memcg_id = memcg_id; + __entry->pid = current->pid; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%llu %s" , __entry->nr_reclaimed, - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
@@ -220,9 +228,10 @@ TRACE_EVENT(mm_shrink_slab_start, __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan) + __field(u64, memcg_id) __field(int, priority) __field(int, nid) - __field(u64, memcg_id) + __field(int, pid) ), TP_fast_assign(
@@ -236,19 +245,22 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; __entry->nid = sc->nid; __entry->memcg_id = memcg_id; + __entry->pid = current->pid; ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink,show_gfp_flags (__entry->gfp_flags), __entry->cache_items, __entry->delta, __entry->total_scan, - __entry->priority) + __entry->priority, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_shrink_slab_end,
@@ -266,29 +278,32 @@ TRACE_EVENT(mm_shrink_slab_end, __field(long, total_scan) __field(int, nid) __field(int, retval) + __field(int, pid)__field (u64, memcg_id) ),TP_fast_assign ( __entry->shr = shr; - __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; __entry->total_scan = total_scan; __entry->nid = nid; __entry->retval = shrinker_retval; + __entry->pid = current->pid; __entry->memcg_id = memcg_id; ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan, - __entry->retval) + __entry->retval, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_vmscan_lru_isolate,
Signature · 1 line
2.33.8
Andrew Morton
maintainerQuoted 3 lines · On Thu, 22 Jan 2026 10:25:07 -0800 Thomas Ballasi…
Changes in v5:
- Fixed a small quirk that added extra +'s at (in-irq) warnings
Pleae cc the relevant maintainers on vmscan changes. We have a veritable army of them:
hp2:/usr/src/mm> scripts/get_maintainer.pl --no-rolestats --nogit -f mm/vmscan.c Andrew Morton <[email protected]>
Axel Rasmussen <[email protected]>
Yuanchu Xie <[email protected]>
Wei Xu <[email protected]>
Johannes Weiner <[email protected]>
David Hildenbrand <[email protected]>
Michal Hocko <[email protected]>
Qi Zheng <[email protected]>
Shakeel Butt <[email protected]>
Lorenzo Stoakes <[email protected]>
The first patch should have your Signed-off-by:, as you were on the delivery path.
The patchset looks sensible to me - I'll await reviewer input before proceeding. Thanks.
v6 cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
In reply to Thomas BallasiChanges in v6:
- Updated Steven's patch with sign-off
- Passed memcg pointers as arguments in tracepoints instead of memcg_id
Link to v5:
https://lore.kernel.org/linux-trace-kernel/[email protected]/
Steven Rostedt (1):
tracing: Add __event_in_*irq() helpers
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 104 +++++++++++++-------- include/trace/stages/stage3_trace_output.h | 8 ++ include/trace/stages/stage7_class_define.h | 19 ++++ mm/shrinker.c | 6 +- mm/vmscan.c | 17 ++-- 5 files changed, 106 insertions(+), 48 deletions(-)
Signature · 1 line
2.33.8
PATCH v6 1/3 tracing: Add __event_in_*irq() helpers
From: Steven Rostedt <[email protected]>
Some trace events want to expose in their output if they were triggered in an interrupt or softirq context. Instead of recording this in the event structure itself, as this information is stored in the flags portion of the event header, add helper macros that can be used in the print format:
TP_printk("val=%d %s", __entry->val, __entry_in_irq() ? "(in-irq)" : "")
This will output "(in-irq)" for the event in the trace data if the event was triggered in hard or soft interrupt context.
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -150,3 +150,11 @@#undef __get_buf#define __get_buf (len) trace_seq_acquire(p, (len)) + +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +#define __event_in_hardirq () (__entry->ent.flags & TRACE_FLAG_HARDIRQ) +#define __event_in_softirq () (__entry->ent.flags & TRACE_FLAG_SOFTIRQ) +#define __event_in_irq () (__entry->ent.flags & (TRACE_FLAG_HARDIRQ | TRACE_FLAG_SOFTIRQ))
include/trace/stages/stage7_class_define.h +19 -0
@@ -26,6 +26,25 @@#undef __print_hex_dump#undef __get_buf +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +/* +* The TRACE_FLAG_* are enums. Instead of using TRACE_DEFINE_ENUM(), +* use their hardcoded values. These values are parsed by user space +* tooling elsewhere so they will never change. +* +* See "enum trace_flag_type" in linux/trace_events.h: +* TRACE_FLAG_HARDIRQ +* TRACE_FLAG_SOFTIRQ +*/ + +/* This is what is displayed in the format files */ +#define __event_in_hardirq () (REC->common_flags & 0x8) +#define __event_in_softirq () (REC->common_flags & 0x10) +#define __event_in_irq () (REC->common_flags & 0x18) +/* * The below is not executed in the kernel. It is only what is * displayed in the print format for userspace to parse.
Signature · 1 line
2.33.8
Re: [PATCH v6 1/3] tracing: Add __event_in_*irq() helpers
Quoted 8 lines · On Fri, 13 Feb 2026 10:15:35 -0800 Thomas Ballasi…
From: Steven Rostedt <[email protected]>
Some trace events want to expose in their output if they were triggered in an interrupt or softirq context. Instead of recording this in the event structure itself, as this information is stored in the flags portion of the event header, add helper macros that can be used in the print format:
TP_printk("val=%d %s", __entry->val, __entry_in_irq() ? "(in-irq)" : "")
Should this read __event_in_irq() and not __entry_in_irq()?
Quoted 6 lines
This will output "(in-irq)" for the event in the trace data if the event was triggered in hard or soft interrupt context.
Steven Rostedt
maintainerRe: [PATCH v6 1/3] tracing: Add __event_in_*irq() helpers
Quoted 3 lines · On Mon, 16 Feb 2026 08:13:21 -0800 Usama Arif <[email protected]> wrote:
Quoted 1 line
TP_printk("val=%d %s", __entry->val, __entry_in_irq() ? "(in-irq)" : "")Should this read
__event_in_irq()and not__entry_in_irq()?
Yeah. That's when you should have done "cut-and-paste" but instead just typed it in by memory :-p
-- Steve
PATCH v6 2/3 mm: vmscan: add cgroup IDs to vmscan tracepoints
In reply to Thomas BallasiMemory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 83 ++++++++++++++++++++--------------- mm/shrinker.c | 6 ++- mm/vmscan.c | 17 +++---- 3 files changed, 61 insertions(+), 45 deletions(-)
include/trace/events/vmscan.h +48 -35
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags), +TP_ARGS (gfp_flags, order, memcg),TP_STRUCT__entry ( - __field( int, order ) __field( unsigned long, gfp_flags ) + __field( u64, memcg_id ) +__field ( int, order ) ),TP_fast_assign ( - __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->order = order; + __entry->memcg_id = mem_cgroup_id(memcg); ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) +__field ( u64, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = mem_cgroup_id(memcg); ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );#endif /* CONFIG_MEMCG */
@@ -200,39 +207,42 @@ TRACE_EVENT(mm_shrink_slab_start, TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long nr_objects_to_shrink, unsigned long cache_items, unsigned long long delta, unsigned long total_scan, - int priority), + int priority, struct mem_cgroup *memcg),TP_ARGS (shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan, - priority), + priority, memcg),TP_STRUCT__entry ( __field(struct shrinker *, shr)__field (void *,shrink ) -__field (int, nid)__field (long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan)__field (int, priority) +__field (int, nid) +__field (u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; __entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id =mem_cgroup_id (memcg); ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -243,35 +253,38 @@ TRACE_EVENT(mm_shrink_slab_start, TRACE_EVENT(mm_shrink_slab_end, TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt, long total_scan), + long unused_scan_cnt, long new_scan_cnt, long total_scan, struct mem_cgroup *memcg), TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, - total_scan), + total_scan, memcg), TP_STRUCT__entry( __field(struct shrinker *, shr) - __field(int, nid) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan) - __field(int, retval) __field(long, total_scan) + __field(int, nid) + __field(int, retval) + __field(u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; - __entry->nid = nid; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; - __entry->retval = shrinker_retval; __entry->total_scan = total_scan; + __entry->nid = nid; + __entry->retval = shrinker_retval; + __entry->memcg_id = mem_cgroup_id(memcg); ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -504,9 +517,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) ); TRACE_EVENT(mm_vmscan_throttled,
mm/shrinker.c +4 -2
@@ -410,7 +410,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, total_scan =min (total_scan, (2 * freeable));trace_mm_shrink_slab_start (shrinker, shrinkctl, nr, - freeable, delta, total_scan, priority); + freeable, delta, total_scan, priority, + shrinkctl->memcg);/* * Normally, we should not scan less than batch_size objects in one
@@ -461,7 +462,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan, + shrinkctl->memcg);return freed; }
mm/vmscan.c +9 -8
@@ -6603,11 +6603,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (sc.gfp_mask, order,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -6636,8 +6636,9 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, sc.gfp_mask = (gfp_mask &GFP_RECLAIM_MASK ) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK ); -trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); +trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.gfp_mask, + sc.order, + memcg);/* * NOTE: Although we can get the priority field, using it
@@ -6648,7 +6649,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed, memcg); *nr_scanned = sc.nr_scanned;
@@ -6684,13 +6685,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (sc.gfp_mask,0 , memcg); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed, memcg);set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7642,7 +7643,7 @@ static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,delayacct_freepages_end ();psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed,0 );return sc->nr_reclaimed; }
Signature · 1 line
2.33.8
PATCH v6 3/3 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses in_task() to reliably detect when we're in process context and can safely access current->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.
--- include/trace/events/vmscan.h | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
include/trace/events/vmscan.h +25 -10
@@ -122,18 +122,22 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, __field( unsigned long, gfp_flags ) __field( u64, memcg_id ) __field( int, order ) + __field( int, pid ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; + __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
@@ -168,16 +172,20 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed )__field ( u64, memcg_id ) +__field ( int, pid ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; __entry->memcg_id =mem_cgroup_id (memcg); + __entry->pid = current->pid; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%llu %s" , __entry->nr_reclaimed, - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
@@ -220,9 +228,10 @@ TRACE_EVENT(mm_shrink_slab_start, __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan) + __field(u64, memcg_id) __field(int, priority) __field(int, nid) - __field(u64, memcg_id) + __field(int, pid) ), TP_fast_assign(
@@ -236,19 +245,22 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; __entry->nid = sc->nid; __entry->memcg_id =mem_cgroup_id (memcg); + __entry->pid = current->pid; ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink,show_gfp_flags (__entry->gfp_flags), __entry->cache_items, __entry->delta, __entry->total_scan, - __entry->priority) + __entry->priority, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_shrink_slab_end,
@@ -266,29 +278,32 @@ TRACE_EVENT(mm_shrink_slab_end, __field(long, total_scan) __field(int, nid) __field(int, retval) + __field(int, pid)__field (u64, memcg_id) ),TP_fast_assign ( __entry->shr = shr; - __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; __entry->total_scan = total_scan; __entry->nid = nid; __entry->retval = shrinker_retval; + __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan, - __entry->retval) + __entry->retval, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_vmscan_lru_isolate,
Signature · 1 line
2.33.8
Re: [PATCH v6 3/3] mm: vmscan: add PIDs to vmscan tracepoints
Quoted 103 lines · On Fri, 13 Feb 2026 10:15:37 -0800 Thomas Ballasi…
The changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses
in_task()to reliably detect when we're in process context and can safely accesscurrent->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.Signed-off-by Thomas Ballasi <[email protected]>--- include/trace/events/vmscan.h | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)include/trace/events/vmscan.h +19
-7@@ -122,18 +122,22 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, __field( unsigned long, gfp_flags ) __field( u64, memcg_id ) __field( int, order ) + __field( int, pid ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; + __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,@@ -168,16 +172,20 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed )__field ( u64, memcg_id ) +__field ( int, pid ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; __entry->memcg_id =mem_cgroup_id (memcg); + __entry->pid = current->pid; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%llu %s" , __entry->nr_reclaimed, - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,@@ -220,9 +228,10 @@ TRACE_EVENT(mm_shrink_slab_start, __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan) + __field(u64, memcg_id) __field(int, priority) __field(int, nid) - __field(u64, memcg_id) + __field(int, pid) ), TP_fast_assign(@@ -236,19 +245,22 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; __entry->nid = sc->nid; __entry->memcg_id =mem_cgroup_id (memcg); + __entry->pid = current->pid; ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink,show_gfp_flags (__entry->gfp_flags), __entry->cache_items, __entry->delta, __entry->total_scan, - __entry->priority) + __entry->priority, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_shrink_slab_end,
include/trace/events/vmscan.h TRACE_EVENT(mm_shrink_slab_end, · line 274
Quoted 10 lines
include/trace/events/vmscan.h +1
-1@@ -266,29 +278,32 @@ TRACE_EVENT(mm_shrink_slab_end, __field(long, total_scan) __field(int, nid) __field(int, retval) + __field(int, pid)__field (u64, memcg_id) ),TP_fast_assign ( __entry->shr = shr; - __entry->shrink = shr->scan_objects;
__entry->shrink is removed here, but still printed below. Was this an intended change of this commit?
Quoted 29 lines
include/trace/events/vmscan.h +5
-2__entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; __entry->total_scan = total_scan; __entry->nid = nid; __entry->retval = shrinker_retval; + __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan, - __entry->retval) + __entry->retval, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_vmscan_lru_isolate,Signature · 1 line
2.33.8
v7 cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
In reply to Thomas BallasiChanges in v6:
- Edited __entry_in_irq() to __event_in_irq() in corresponding commit message
- Restore an entry that was removed inadvertently
Link to v6:
https://lore.kernel.org/linux-trace-kernel/[email protected]/
Steven Rostedt (1):
tracing: Add __event_in_*irq() helpers
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 103 +++++++++++++-------- include/trace/stages/stage3_trace_output.h | 8 ++ include/trace/stages/stage7_class_define.h | 19 ++++ mm/shrinker.c | 6 +- mm/vmscan.c | 17 ++-- 5 files changed, 106 insertions(+), 47 deletions(-)
Signature · 1 line
2.33.8
PATCH v7 1/3 tracing: Add __event_in_*irq() helpers
From: Steven Rostedt <[email protected]>
Some trace events want to expose in their output if they were triggered in an interrupt or softirq context. Instead of recording this in the event structure itself, as this information is stored in the flags portion of the event header, add helper macros that can be used in the print format:
TP_printk("val=%d %s", __entry->val, __event_in_irq() ? "(in-irq)" : "")
This will output "(in-irq)" for the event in the trace data if the event was triggered in hard or soft interrupt context.
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -150,3 +150,11 @@#undef __get_buf#define __get_buf (len) trace_seq_acquire(p, (len)) + +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +#define __event_in_hardirq () (__entry->ent.flags & TRACE_FLAG_HARDIRQ) +#define __event_in_softirq () (__entry->ent.flags & TRACE_FLAG_SOFTIRQ) +#define __event_in_irq () (__entry->ent.flags & (TRACE_FLAG_HARDIRQ | TRACE_FLAG_SOFTIRQ))
include/trace/stages/stage7_class_define.h +19 -0
@@ -26,6 +26,25 @@#undef __print_hex_dump#undef __get_buf +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +/* +* The TRACE_FLAG_* are enums. Instead of using TRACE_DEFINE_ENUM(), +* use their hardcoded values. These values are parsed by user space +* tooling elsewhere so they will never change. +* +* See "enum trace_flag_type" in linux/trace_events.h: +* TRACE_FLAG_HARDIRQ +* TRACE_FLAG_SOFTIRQ +*/ + +/* This is what is displayed in the format files */ +#define __event_in_hardirq () (REC->common_flags & 0x8) +#define __event_in_softirq () (REC->common_flags & 0x10) +#define __event_in_irq () (REC->common_flags & 0x18) +/* * The below is not executed in the kernel. It is only what is * displayed in the print format for userspace to parse.
Signature · 1 line
2.33.8
Re: [PATCH v7 1/3] tracing: Add __event_in_*irq() helpers
Quoted 9 lines · Thomas Ballasi
From: Steven Rostedt <[email protected]>
Some trace events want to expose in their output if they were triggered in an interrupt or softirq context. Instead of recording this in the event structure itself, as this information is stored in the flags portion of the event header, add helper macros that can be used in the print format:
TP_printk("val=%d %s", __entry->val, __event_in_irq() ? "(in-irq)" : "")
Quoted 7 lines
This will output "(in-irq)" for the event in the trace data if the event was triggered in hard or soft interrupt context.
Signed-off-by Steven Rostedt (Google) <[email protected]>Signed-off-by Thomas Ballasi <[email protected]>
PATCH v7 2/3 mm: vmscan: add cgroup IDs to vmscan tracepoints
In reply to Thomas BallasiMemory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 83 ++++++++++++++++++++--------------- mm/shrinker.c | 6 ++- mm/vmscan.c | 17 +++---- 3 files changed, 61 insertions(+), 45 deletions(-)
include/trace/events/vmscan.h +48 -35
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags), +TP_ARGS (gfp_flags, order, memcg),TP_STRUCT__entry ( - __field( int, order ) __field( unsigned long, gfp_flags ) + __field( u64, memcg_id ) +__field ( int, order ) ),TP_fast_assign ( - __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->order = order; + __entry->memcg_id = mem_cgroup_id(memcg); ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) +__field ( u64, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = mem_cgroup_id(memcg); ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );#endif /* CONFIG_MEMCG */
@@ -200,39 +207,42 @@ TRACE_EVENT(mm_shrink_slab_start, TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long nr_objects_to_shrink, unsigned long cache_items, unsigned long long delta, unsigned long total_scan, - int priority), + int priority, struct mem_cgroup *memcg),TP_ARGS (shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan, - priority), + priority, memcg),TP_STRUCT__entry ( __field(struct shrinker *, shr)__field (void *,shrink ) -__field (int, nid)__field (long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan)__field (int, priority) +__field (int, nid) +__field (u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; __entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id =mem_cgroup_id (memcg); ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -243,35 +253,38 @@ TRACE_EVENT(mm_shrink_slab_start, TRACE_EVENT(mm_shrink_slab_end, TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt, long total_scan), + long unused_scan_cnt, long new_scan_cnt, long total_scan, struct mem_cgroup *memcg), TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, - total_scan), + total_scan, memcg), TP_STRUCT__entry( __field(struct shrinker *, shr) - __field(int, nid) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan) - __field(int, retval) __field(long, total_scan) + __field(int, nid) + __field(int, retval) + __field(u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; - __entry->nid = nid; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; - __entry->retval = shrinker_retval; __entry->total_scan = total_scan; + __entry->nid = nid; + __entry->retval = shrinker_retval; + __entry->memcg_id = mem_cgroup_id(memcg); ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -504,9 +517,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) ); TRACE_EVENT(mm_vmscan_throttled,
mm/shrinker.c +4 -2
@@ -410,7 +410,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, total_scan =min (total_scan, (2 * freeable));trace_mm_shrink_slab_start (shrinker, shrinkctl, nr, - freeable, delta, total_scan, priority); + freeable, delta, total_scan, priority, + shrinkctl->memcg);/* * Normally, we should not scan less than batch_size objects in one
@@ -461,7 +462,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan, + shrinkctl->memcg);return freed; }
mm/vmscan.c +9 -8
@@ -6603,11 +6603,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (sc.gfp_mask, order,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -6636,8 +6636,9 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, sc.gfp_mask = (gfp_mask &GFP_RECLAIM_MASK ) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK ); -trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); +trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.gfp_mask, + sc.order, + memcg);/* * NOTE: Although we can get the priority field, using it
@@ -6648,7 +6649,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed, memcg); *nr_scanned = sc.nr_scanned;
@@ -6684,13 +6685,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (sc.gfp_mask,0 , memcg); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed, memcg);set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7642,7 +7643,7 @@ static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,delayacct_freepages_end ();psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed,0 );return sc->nr_reclaimed; }
Signature · 1 line
2.33.8
Re: [PATCH v7 2/3] mm: vmscan: add cgroup IDs to vmscan tracepoints
Quoted 9 lines · Thomas Ballasi
Memory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (
memcg_id) to key vmscan tracepoints to enable better correlation and analysis.For operations not associated with a specific cgroup, the field is defaulted to 0.
Signed-off-by Thomas Ballasi <[email protected]>
PATCH v7 3/3 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses in_task() to reliably detect when we're in process context and can safely access current->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.
--- include/trace/events/vmscan.h | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-)
include/trace/events/vmscan.h +25 -9
@@ -122,18 +122,22 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, __field( unsigned long, gfp_flags ) __field( u64, memcg_id ) __field( int, order ) + __field( int, pid ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; + __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
@@ -168,16 +172,20 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,TP_STRUCT__entry (__field (unsigned long ,nr_reclaimed )__field ( u64, memcg_id ) +__field ( int, pid ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; __entry->memcg_id =mem_cgroup_id (memcg); + __entry->pid = current->pid; ), -TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%llu %s" , __entry->nr_reclaimed, - __entry->memcg_id) + __entry->pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
@@ -220,9 +228,10 @@ TRACE_EVENT(mm_shrink_slab_start, __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan) + __field(u64, memcg_id) __field(int, priority) __field(int, nid) - __field(u64, memcg_id) + __field(int, pid) ), TP_fast_assign(
@@ -236,19 +245,22 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; __entry->nid = sc->nid; __entry->memcg_id =mem_cgroup_id (memcg); + __entry->pid = current->pid; ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->nr_objects_to_shrink,show_gfp_flags (__entry->gfp_flags), __entry->cache_items, __entry->delta, __entry->total_scan, - __entry->priority) + __entry->priority, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_shrink_slab_end,
@@ -266,6 +278,7 @@ TRACE_EVENT(mm_shrink_slab_end, __field(long, total_scan) __field(int, nid) __field(int, retval) + __field(int, pid)__field (u64, memcg_id) ),
@@ -277,18 +290,21 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->total_scan = total_scan; __entry->nid = nid; __entry->retval = shrinker_retval; + __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan, - __entry->retval) + __entry->retval, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_vmscan_lru_isolate,
Signature · 1 line
2.33.8
Shakeel Butt
reviewerRe: [PATCH v7 3/3] mm: vmscan: add PIDs to vmscan tracepoints
Quoted 4 lines · Thomas Ballasi
The changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses
in_task()to reliably detect when we're in process
Where is this in_task() check happening? Also this patch is changing tracepoints for memory reclaim which never happens in any context other than process context, so we don't need __event_in_irq() checks for these tracepoints.
Masami Hiramatsu (Google)
maintainerRe: [PATCH v7 3/3] mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiHi,
Quoted 18 lines · On Mon, 23 Feb 2026 09:15:44 -0800 Thomas Ballasi…
The changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
The PID field uses
in_task()to reliably detect when we're in process context and can safely accesscurrent->pid. When not in process context (such as in interrupt or in an asynchronous RCU context), the field is set to -1 as a sentinel value.Signed-off-by Thomas Ballasi <[email protected]>--- include/trace/events/vmscan.h | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-)include/trace/events/vmscan.h +0
-0
include/trace/events/vmscan.h DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, · line 131
Quoted 10 lines
include/trace/events/vmscan.h +2
-0@@ -122,18 +122,22 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, __field( unsigned long, gfp_flags ) __field( u64, memcg_id ) __field( int, order ) + __field( int, pid ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; + __entry->pid = current->pid;
All entries saves current->pid in common_pid field. Can you use this common field?
# cat events/vmscan/mm_vmscan_reclaim_pages/format name: mm_vmscan_reclaim_pages ID: 590 format: field:unsigned short common_type; offset:0; size:2; signed:0; field:unsigned char common_flags; offset:2; size:1; signed:0; field:unsigned char common_preempt_count; offset:3; size:1; signed:0; field:int common_pid; offset:4; size:4; signed:1; ## <------------here
field:int nid; offset:8; size:4; signed:1; field:unsigned long nr_scanned; offset:16; size:8; signed:0; field:unsigned long nr_reclaimed; offset:24; size:8; signed:0; field:unsigned long nr_dirty; offset:32; size:8; signed:0; field:unsigned long nr_writeback; offset:40; size:8; signed:0; field:unsigned long nr_congested; offset:48; size:8; signed:0; field:unsigned long nr_immediate; offset:56; size:8; signed:0; field:unsigned int nr_activate0; offset:64; size:4; signed:0; field:unsigned int nr_activate1; offset:68; size:4; signed:0; field:unsigned long nr_ref_keep; offset:72; size:8; signed:0; field:unsigned long nr_unmap_fail; offset:80; size:8; signed:0;
Thank you,
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
v8 cover mm: vmscan: add PID and cgroup ID to vmscan tracepoints
In reply to Thomas BallasiChanges in v8:
- Removed in_task() mention in PID commit message
- Moved __entry->pid to __entry->ent.pid
Link to v7:
https://lore.kernel.org/linux-trace-kernel/[email protected]/
Steven Rostedt (1):
tracing: Add __event_in_*irq() helpers
Thomas Ballasi (2):
mm: vmscan: add cgroup IDs to vmscan tracepoints
mm: vmscan: add PIDs to vmscan tracepoints
include/trace/events/vmscan.h | 95 +++++++++++++--------- include/trace/stages/stage3_trace_output.h | 8 ++ include/trace/stages/stage7_class_define.h | 19 +++++ mm/shrinker.c | 6 +- mm/vmscan.c | 17 ++-- 5 files changed, 98 insertions(+), 47 deletions(-)
Signature · 1 line
2.45.3
PATCH v8 1/3 tracing: Add __event_in_*irq() helpers
From: Steven Rostedt <[email protected]>
Some trace events want to expose in their output if they were triggered in an interrupt or softirq context. Instead of recording this in the event structure itself, as this information is stored in the flags portion of the event header, add helper macros that can be used in the print format:
TP_printk("val=%d %s", __entry->val, __event_in_irq() ? "(in-irq)" : "")
This will output "(in-irq)" for the event in the trace data if the event was triggered in hard or soft interrupt context.
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -150,3 +150,11 @@#undef __get_buf#define __get_buf (len) trace_seq_acquire(p, (len)) + +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +#define __event_in_hardirq () (__entry->ent.flags & TRACE_FLAG_HARDIRQ) +#define __event_in_softirq () (__entry->ent.flags & TRACE_FLAG_SOFTIRQ) +#define __event_in_irq () (__entry->ent.flags & (TRACE_FLAG_HARDIRQ | TRACE_FLAG_SOFTIRQ))
include/trace/stages/stage7_class_define.h +19 -0
@@ -26,6 +26,25 @@#undef __print_hex_dump#undef __get_buf +#undef __event_in_hardirq +#undef __event_in_softirq +#undef __event_in_irq + +/* +* The TRACE_FLAG_* are enums. Instead of using TRACE_DEFINE_ENUM(), +* use their hardcoded values. These values are parsed by user space +* tooling elsewhere so they will never change. +* +* See "enum trace_flag_type" in linux/trace_events.h: +* TRACE_FLAG_HARDIRQ +* TRACE_FLAG_SOFTIRQ +*/ + +/* This is what is displayed in the format files */ +#define __event_in_hardirq () (REC->common_flags & 0x8) +#define __event_in_softirq () (REC->common_flags & 0x10) +#define __event_in_irq () (REC->common_flags & 0x18) +/* * The below is not executed in the kernel. It is only what is * displayed in the print format for userspace to parse.
Signature · 1 line
2.45.3
PATCH v8 2/3 mm: vmscan: add cgroup IDs to vmscan tracepoints
In reply to Thomas BallasiMemory reclaim events are currently difficult to attribute to specific cgroups, making debugging memory pressure issues challenging. This patch adds memory cgroup ID (memcg_id) to key vmscan tracepoints to enable better correlation and analysis.
For operations not associated with a specific cgroup, the field is defaulted to 0.
--- include/trace/events/vmscan.h | 83 ++++++++++++++++++++--------------- mm/shrinker.c | 6 ++- mm/vmscan.c | 17 +++---- 3 files changed, 61 insertions(+), 45 deletions(-)
include/trace/events/vmscan.h +48 -35
@@ -114,85 +114,92 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd,DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_begin_template, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags), +TP_ARGS (gfp_flags, order, memcg),TP_STRUCT__entry ( - __field( int, order ) __field( unsigned long, gfp_flags ) + __field( u64, memcg_id ) +__field ( int, order ) ),TP_fast_assign ( - __entry->order = order; __entry->gfp_flags = (__force unsigned long)gfp_flags; + __entry->order = order; + __entry->memcg_id = mem_cgroup_id(memcg); ), -TP_printk ("order=%d gfp_flags=%s" , +TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , __entry->order, -show_gfp_flags (__entry->gfp_flags)) +show_gfp_flags (__entry->gfp_flags), + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );DEFINE_EVENT (mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(gfp_t gfp_flags, int order, struct mem_cgroup *memcg), -TP_ARGS (order, gfp_flags) +TP_ARGS (gfp_flags, order, memcg) );#endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS (mm_vmscan_direct_reclaim_end_template, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed), +TP_ARGS (nr_reclaimed, memcg),TP_STRUCT__entry ( __field( unsigned long, nr_reclaimed ) +__field ( u64, memcg_id ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; + __entry->memcg_id = mem_cgroup_id(memcg); ), -TP_printk ("nr_reclaimed=%lu" , __entry->nr_reclaimed) +TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , + __entry->nr_reclaimed, + __entry->memcg_id) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );#ifdef CONFIG_MEMCG DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) );#endif /* CONFIG_MEMCG */
@@ -200,39 +207,42 @@ TRACE_EVENT(mm_shrink_slab_start, TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long nr_objects_to_shrink, unsigned long cache_items, unsigned long long delta, unsigned long total_scan, - int priority), + int priority, struct mem_cgroup *memcg),TP_ARGS (shr, sc, nr_objects_to_shrink, cache_items, delta, total_scan, - priority), + priority, memcg),TP_STRUCT__entry ( __field(struct shrinker *, shr)__field (void *,shrink ) -__field (int, nid)__field (long, nr_objects_to_shrink) __field(unsigned long, gfp_flags) __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan)__field (int, priority) +__field (int, nid) +__field (u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; __entry->shrink = shr->scan_objects; - __entry->nid = sc->nid; __entry->nr_objects_to_shrink = nr_objects_to_shrink; __entry->gfp_flags = (__force unsigned long )sc->gfp_mask; __entry->cache_items = cache_items; __entry->delta = delta; __entry->total_scan = total_scan; __entry->priority = priority; + __entry->nid = sc->nid; + __entry->memcg_id =mem_cgroup_id (memcg); ), - TP_printk("%pS %p: nid: %d objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags), __entry->cache_items,
@@ -243,35 +253,38 @@ TRACE_EVENT(mm_shrink_slab_start, TRACE_EVENT(mm_shrink_slab_end, TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt, long total_scan), + long unused_scan_cnt, long new_scan_cnt, long total_scan, struct mem_cgroup *memcg), TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, - total_scan), + total_scan, memcg), TP_STRUCT__entry( __field(struct shrinker *, shr) - __field(int, nid) __field(void *, shrink) __field(long, unused_scan) __field(long, new_scan) - __field(int, retval) __field(long, total_scan) + __field(int, nid) + __field(int, retval) + __field(u64, memcg_id) ), TP_fast_assign( __entry->shr = shr; - __entry->nid = nid; __entry->shrink = shr->scan_objects; __entry->unused_scan = unused_scan_cnt; __entry->new_scan = new_scan_cnt; - __entry->retval = shrinker_retval; __entry->total_scan = total_scan; + __entry->nid = nid; + __entry->retval = shrinker_retval; + __entry->memcg_id = mem_cgroup_id(memcg); ), - TP_printk("%pS %p: nid: %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", + TP_printk("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", __entry->shrink, __entry->shr, __entry->nid, + __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan,
@@ -504,9 +517,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_begin,DEFINE_EVENT (mm_vmscan_direct_reclaim_end_template, mm_vmscan_node_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, struct mem_cgroup *memcg), -TP_ARGS (nr_reclaimed) +TP_ARGS (nr_reclaimed, memcg) ); TRACE_EVENT(mm_vmscan_throttled,
mm/shrinker.c +4 -2
@@ -410,7 +410,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, total_scan =min (total_scan, (2 * freeable));trace_mm_shrink_slab_start (shrinker, shrinkctl, nr, - freeable, delta, total_scan, priority); + freeable, delta, total_scan, priority, + shrinkctl->memcg);/* * Normally, we should not scan less than batch_size objects in one
@@ -461,7 +462,8 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,*/ new_nr =add_nr_deferred (next_deferred, shrinker, shrinkctl); -trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); +trace_mm_shrink_slab_end (shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan, + shrinkctl->memcg);return freed; }
mm/vmscan.c +9 -8
@@ -6652,11 +6652,11 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,return 1 ;set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_direct_reclaim_begin (order, sc.gfp_mask); +trace_mm_vmscan_direct_reclaim_begin (sc.gfp_mask, order,0 ); nr_reclaimed =do_try_to_free_pages (zonelist, &sc); -trace_mm_vmscan_direct_reclaim_end (nr_reclaimed); +trace_mm_vmscan_direct_reclaim_end (nr_reclaimed,0 );set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -6685,8 +6685,9 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg, sc.gfp_mask = (gfp_mask &GFP_RECLAIM_MASK ) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK ); -trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.order, - sc.gfp_mask); +trace_mm_vmscan_memcg_softlimit_reclaim_begin (sc.gfp_mask, + sc.order, + memcg);/* * NOTE: Although we can get the priority field, using it
@@ -6697,7 +6698,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,*/ shrink_lruvec (lruvec, &sc); -trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed); +trace_mm_vmscan_memcg_softlimit_reclaim_end (sc.nr_reclaimed, memcg); *nr_scanned = sc.nr_scanned;
@@ -6733,13 +6734,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,struct zonelist *zonelist =node_zonelist (numa_node_id (), sc.gfp_mask);set_task_reclaim_state (current, &sc.reclaim_state); -trace_mm_vmscan_memcg_reclaim_begin (0 , sc.gfp_mask); +trace_mm_vmscan_memcg_reclaim_begin (sc.gfp_mask,0 , memcg); noreclaim_flag =memalloc_noreclaim_save (); nr_reclaimed =do_try_to_free_pages (zonelist, &sc);memalloc_noreclaim_restore (noreclaim_flag); -trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed); +trace_mm_vmscan_memcg_reclaim_end (nr_reclaimed, memcg);set_task_reclaim_state (current,NULL );return nr_reclaimed;
@@ -7685,7 +7686,7 @@ static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,delayacct_freepages_end ();psi_memstall_leave (&pflags); -trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed); +trace_mm_vmscan_node_reclaim_end (sc->nr_reclaimed,0 );return sc->nr_reclaimed; }
Signature · 1 line
2.45.3
PATCH v8 3/3 mm: vmscan: add PIDs to vmscan tracepoints
In reply to Thomas BallasiThe changes aims at adding additionnal tracepoints variables to help debuggers attribute them to specific processes.
--- include/trace/events/vmscan.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
include/trace/events/vmscan.h +16 -8
@@ -130,10 +130,12 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("order=%d gfp_flags=%s memcg_id=%llu" , +TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->memcg_id) + __entry->ent.pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
@@ -175,9 +177,11 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("nr_reclaimed=%lu memcg_id=%llu" , +TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%llu %s" , __entry->nr_reclaimed, - __entry->memcg_id) + __entry->ent.pid, + __entry->memcg_id, +__event_in_irq () ?"(in-irq)" :"" ) ); DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
@@ -238,17 +242,19 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->ent.pid, __entry->memcg_id, __entry->nr_objects_to_shrink,show_gfp_flags (__entry->gfp_flags), __entry->cache_items, __entry->delta, __entry->total_scan, - __entry->priority) + __entry->priority, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_shrink_slab_end,
@@ -280,15 +286,17 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->memcg_id =mem_cgroup_id (memcg); ), -TP_printk ("%pS %p: nid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d" , +TP_printk ("%pS %p: nid: %d pid: %d memcg_id: %llu unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d %s" , __entry->shrink, __entry->shr, __entry->nid, + __entry->ent.pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan, __entry->total_scan, - __entry->retval) + __entry->retval, +__event_in_irq () ?"(in-irq)" :"" ) ); TRACE_EVENT(mm_vmscan_lru_isolate,
Signature · 1 line
2.45.3
Andrew Morton
maintainerQuoted 4 lines · On Mon, 16 Mar 2026 09:09:05 -0700 Thomas Ballasi…
Changes in v8:
- Removedin_task()mention in PID commit message
- Moved__entry->pidto__entry->ent.pid
Below is how this update altered mm.git.
It's a minor change, so I'll retain Shakeel's Acked-by and Reviewed-by on the first two patches.
include/trace/events/vmscan.h renamed from include/trace/events/vmscan.h~b +5 -13
@@ -132,20 +132,18 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_rec __field( unsigned long, gfp_flags ) __field( u64, memcg_id ) __field( int, order ) - __field( int, pid ) ),TP_fast_assign ( __entry->gfp_flags = (__force unsigned long)gfp_flags; __entry->order = order; - __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ),TP_printk ("order=%d gfp_flags=%s pid=%d memcg_id=%llu %s" , __entry->order,show_gfp_flags (__entry->gfp_flags), - __entry->pid, + __entry->ent.pid, __entry->memcg_id,__event_in_irq () ?"(in-irq)" :"" ) );
@@ -182,18 +180,16 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_recTP_STRUCT__entry (__field (unsigned long ,nr_reclaimed )__field ( u64, memcg_id ) -__field ( int, pid ) ),TP_fast_assign ( __entry->nr_reclaimed = nr_reclaimed; __entry->memcg_id =mem_cgroup_id (memcg); - __entry->pid = current->pid; ),TP_printk ("nr_reclaimed=%lu pid=%d memcg_id=%llu %s" , __entry->nr_reclaimed, - __entry->pid, + __entry->ent.pid, __entry->memcg_id,__event_in_irq () ?"(in-irq)" :"" ) );
@@ -238,10 +234,9 @@ TRACE_EVENT(mm_shrink_slab_start, __field(unsigned long, cache_items) __field(unsigned long long, delta) __field(unsigned long, total_scan) - __field(u64, memcg_id) __field(int, priority) __field(int, nid) - __field(int, pid) + __field(u64, memcg_id) ), TP_fast_assign(
@@ -255,14 +250,13 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->priority = priority; __entry->nid = sc->nid; __entry->memcg_id =mem_cgroup_id (memcg); - __entry->pid = current->pid; ), TP_printk("%pS %p: nid: %d pid: %d memcg_id: %llu objects to shrink %ld gfp_flags %s cache items %ld delta %lld total_scan %ld priority %d %s", __entry->shrink, __entry->shr, __entry->nid, - __entry->pid, + __entry->ent.pid, __entry->memcg_id, __entry->nr_objects_to_shrink, show_gfp_flags(__entry->gfp_flags),
@@ -288,7 +282,6 @@ TRACE_EVENT(mm_shrink_slab_end, __field(long, total_scan) __field(int, nid) __field(int, retval) - __field(int, pid)__field (u64, memcg_id) ),
@@ -300,7 +293,6 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->total_scan = total_scan; __entry->nid = nid; __entry->retval = shrinker_retval; - __entry->pid = current->pid; __entry->memcg_id =mem_cgroup_id (memcg); ),
@@ -308,7 +300,7 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->shrink, __entry->shr, __entry->nid, - __entry->pid, + __entry->ent.pid, __entry->memcg_id, __entry->unused_scan, __entry->new_scan,
_