From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 053FAD6CFA3 for ; Thu, 22 Jan 2026 18:25:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8902C6B02F6; Thu, 22 Jan 2026 13:25:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 80F2C6B02F8; Thu, 22 Jan 2026 13:25:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 599A86B02F9; Thu, 22 Jan 2026 13:25:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3769D6B02F8 for ; Thu, 22 Jan 2026 13:25:39 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 016EF590AC for ; Thu, 22 Jan 2026 18:25:38 +0000 (UTC) X-FDA: 84360427998.09.A62F651 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf29.hostedemail.com (Postfix) with ESMTP id 35927120004 for ; Thu, 22 Jan 2026 18:25:37 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=JhDZiyeO; spf=pass (imf29.hostedemail.com: domain of tballasi@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=tballasi@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1769106337; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UrCywMgmAMKu0qlSlnYCkzHJvrHK6AYgpW9R5wGTiNQ=; b=ZnoeRn4jSDhiHkVJnJ+uYOWvv42XRBf1QBMkb7q1jqUAuS+YXgpybDgOm9PZawrNYupo3k w2OROIKFzr6+k8ITdUk4/GVlk0+vv5UBEBk3VePl5hq+jwlocXBytL0jfGHew8UklJ7t+S PMUstKjLgsnybZosuUAFxIPt+4iFjUI= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=JhDZiyeO; spf=pass (imf29.hostedemail.com: domain of tballasi@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=tballasi@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1769106337; a=rsa-sha256; cv=none; b=JSnPfpiNvuY3jqTbVHoza+W7SMsyYQPrM/8VKY96Dsblw55VeHKPf3DmrygGMfl/K95xBX KZamw5Nt4zOmEMCj2iunMFC2JEzDXC3ChLD6rkr7H89bGoUitBGCTQlFYzdfZv3kjAMwtT fky+y9oj3C1Vf7wgXYDjPB4pvVIC+mw= Received: from LAPTOP-U3CCR7C6.corp.microsoft.com (unknown [4.255.188.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 5F54220B716B; Thu, 22 Jan 2026 10:25:35 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5F54220B716B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1769106336; bh=UrCywMgmAMKu0qlSlnYCkzHJvrHK6AYgpW9R5wGTiNQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JhDZiyeO00UEuvQVQ0G/Hij64J1IDrBE3bxLzXQIjP9YuqRcuLj1SB9t/KaqBooQx KGNmPJSyFGWBZBSqHpGI2hkuTNypqUbVDat7dyhW5O1SVW6XsF6KHK6TSyWyzl8h7i M5X0ViHGAMnLVCobElyYObv9uMl+rn3k5jq3RMpk= From: Thomas Ballasi To: tballasi@linux.microsoft.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, mhiramat@kernel.org, rostedt@goodmis.org Subject: [PATCH v5 2/3] mm: vmscan: add cgroup IDs to vmscan tracepoints Date: Thu, 22 Jan 2026 10:25:09 -0800 Message-Id: <20260122182510.2126-3-tballasi@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260122182510.2126-1-tballasi@linux.microsoft.com> References: <20260115123809.2257-1-tballasi@linux.microsoft.com> <20260122182510.2126-1-tballasi@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 35927120004 X-Stat-Signature: cjekiht8afbeq1shyp9a7su95k9j5si3 X-Rspam-User: X-HE-Tag: 1769106336-749269 X-HE-Meta: U2FsdGVkX1+Zq7SNi12rlh857bEig8mjwCe6N4pCxwxhZFE0RGt70nRv9c+CTBukNwl6WO/4JCUrNOdWWbZqVJJgzYo0R/MTq5HXevFP5+Kad2YdTvUDTTpQ/B5ZQWEcMscqQUeSgbIfb/JEpfcBOKtlY8gESMJuOb8yO09lvZ2unt2kH6wYFWsvPVNv1pezdPVMjaPbjxYnIqs2D+jXlG6UmXFbOpcIgtGjdVuDtFqZD+pggf+ivNiqSAxArBvvnWprRw0nYR2ZJ5T/moAE4mMyKptEtpHwRvcoFoT0vdjH8MABl4vsJd4H6uowIIis1an5RaeRtIDcFQm9ql9rTglkG4ovtv8wZPDvAX0JNcwjNAtA/KzFAUTUUskcK+2VFiwen8uKWrPEddEOuwOr0DXZJY7+LFQzQ8jfV0JDb6WtlC0tdkHRtoSbJlQGj7NejjG3z9hXuBN7bAuaLkthEonbNupgkRvYh/etgqsU2igq/Bow+EbCMe6XOofENeDI6DfI8KSvNI+v3eDDNOiYb84XY1C6cIcirYnqfSq/XirMpXbi9557hX1874w+XDvRU4+DdQ45wbd6BIdxbj8mv+nekS0thd0yL7I/OJ16aHS4KuazDOPI8ABEOs51ej9BWIfxehuuZ/KYbw1/GvmsOmkbnKuOEOT1U0dNpUgA7LNUiJzILM/B2wstgRArjUR2KocoFGTrlkIbpyYYeFIomruV3o10uB7qV+ZlpJ9KOnbjEZP2mPZvwZsjXF2LsMK77O5PJuU2m1mIvN+NOKqw7fSnbnJdhcfc4Jp7jw2TYLOfX3Pj5CX2AVKXBUcQEuLXMcS/DTD88I7NV2eHqbW02nZCS1jwviV3lo6wy1tKXaAbOv/nigXaNnGIgM9S6AhlEa1spHyz7RpJ4c0V2qgKXBbGJzSHtVaYUUbNyXMajh/w6e6CrxsL4aJalHPIQVW2k8XVxx6/ZsUC6u7Ziia UdSlt4hK A6QqZ3USrAGsVObhKxSGRtp6b/buzAPwEG2JtTfalk2YBxTeoGt47R/9bXb5rGcpNBTun8muQYbmzZ0qfgXts/y+jeLotXlUt17K+qB29yd9YmnSrNBv56E8MLzJawXQ74HH+JEXJtxpTXnzou5FQrXecWr12YlLeaw/Qtp/vxHTp6rrVo33aTeGs/TqrZbcsFm0H+l80czq51ZGIWxM3IrKvWi9z7B1VZacNF3LeVbeTP2jpOyGJlfZC/g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 --- include/trace/events/vmscan.h | 83 ++++++++++++++++++++--------------- mm/shrinker.c | 6 ++- mm/vmscan.c | 17 +++---- 3 files changed, 61 insertions(+), 45 deletions(-) diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h index 490958fa10dee..20160e79eb0d7 100644 --- a/include/trace/events/vmscan.h +++ b/include/trace/events/vmscan.h @@ -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, diff --git a/mm/shrinker.c b/mm/shrinker.c index 4a93fd433689a..ccfbe3fb3b378 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -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; } diff --git a/mm/vmscan.c b/mm/vmscan.c index b2fc8b626d3df..9a3cd975a9f30 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -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; } -- 2.33.8