mm-vmscan-add-cgroup-ids-to-vmscan-tracepoints.patch removed from -mm tree
The quilt patch titled
Subject: mm: vmscan: add cgroup IDs to vmscan tracepoints
has been removed from the -mm tree. Its filename was
mm-vmscan-add-cgroup-ids-to-vmscan-tracepoints.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Thomas Ballasi <[email protected]>
Subject: mm: vmscan: add cgroup IDs to vmscan tracepoints
Date: Mon, 16 Mar 2026 09:09:07 -0700
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 | 83 ++++++++++++++++++-------------- mm/shrinker.c | 6 +- mm/vmscan.c | 17 +++--- 3 files changed, 61 insertions(+), 45 deletions(-)
include/trace/events/vmscan.h renamed from include/trace/events/vmscan.h~mm-vmscan-add-cgroup-ids-to-vmscan-tracepoints +48 -35
@@ -124,85 +124,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 */
@@ -210,39 +217,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,
@@ -253,35 +263,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,
@@ -514,9 +527,9 @@ TRACE_EVENT(mm_vmscan_node_reclaim_beginDEFINE_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 renamed from mm/shrinker.c~mm-vmscan-add-cgroup-ids-to-vmscan-tracepoints +4 -2
@@ -410,7 +410,8 @@ static unsigned long do_shrink_slab(stru 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(stru*/ 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 renamed from mm/vmscan.c~mm-vmscan-add-cgroup-ids-to-vmscan-tracepoints +9 -8
@@ -6582,11 +6582,11 @@ unsigned long try_to_free_pages(struct zreturn 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;
@@ -6615,8 +6615,9 @@ unsigned long mem_cgroup_shrink_node(str 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
@@ -6627,7 +6628,7 @@ unsigned long mem_cgroup_shrink_node(str*/ 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;
@@ -6663,13 +6664,13 @@ unsigned long try_to_free_mem_cgroup_pagstruct 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;
@@ -7643,7 +7644,7 @@ static unsigned long __node_reclaim(strudelayacct_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; }
_
Patches currently in -mm which might be from [email protected] are