From nobody Wed Dec 17 09:47:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AAC6C4332F for ; Wed, 1 Nov 2023 10:29:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235138AbjKAK3K (ORCPT ); Wed, 1 Nov 2023 06:29:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235112AbjKAK3C (ORCPT ); Wed, 1 Nov 2023 06:29:02 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6246E92; Wed, 1 Nov 2023 03:28:52 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4CE2E100002; Wed, 1 Nov 2023 13:28:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4CE2E100002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1698834530; bh=zCPacf57FSqxrGG9gY+g6RYvl7Lu5qlKOE+d98c3Zi0=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=ITydPT6H7oESdjce3b3rVNtP7ZXGiAvh+dWNOoFyzXQJicTPbAogyAoNAz7Sxqjep AldIYSpxJUJUphdHnjU6LdtQH3ywy+ljT9eg2o9EwnGArrvT5dAvnJ2+4OP5A3nkmA NJJxW8g0y9Qt+pzRuExNKn2Xj2ZEQ+7+C8y7MbFRU4btr7AAypM9j7dY3j2Rd37CzV G3SmTEmFjCh8SNS2mw9BcgU3n10ulMxSLUylPS0H+ii2buOQEPRilKPxFLLXWphyHv Jy4MiYmndJBkS0wgngoBkA7rmyk+IM3JmVpa6KvmwPSe5sm7hR5V7W2xTp3559i+N5 M3jEfjV7/rVmQ== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 1 Nov 2023 13:28:50 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Wed, 1 Nov 2023 13:28:49 +0300 From: Dmitry Rokosov To: , , , , , , , CC: , , , , , , Dmitry Rokosov Subject: [PATCH v1 1/2] mm: memcg: print out cgroup name in the memcg tracepoints Date: Wed, 1 Nov 2023 13:28:36 +0300 Message-ID: <20231101102837.25205-2-ddrokosov@salutedevices.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20231101102837.25205-1-ddrokosov@salutedevices.com> References: <20231101102837.25205-1-ddrokosov@salutedevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 181040 [Nov 01 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 X-KSMG-AntiSpam-Envelope-From: ddrokosov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 543 543 1e3516af5cdd92079dfeb0e292c8747a62cb1ee4, {Tracking_from_domain_doesnt_match_to}, salutedevices.com:7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;100.64.160.123:7.1.2, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/11/01 06:18:00 #22376334 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Sometimes it is necessary to understand in which memcg tracepoint event occurred. The function cgroup_name() is a useful tool for this purpose. To integrate cgroup_name() into the existing memcg tracepoints, this patch introduces a new tracepoint template for the begin() and end() events, utilizing static __array() to store the cgroup name. Signed-off-by: Dmitry Rokosov --- include/trace/events/vmscan.h | 77 +++++++++++++++++++++++++++++------ mm/vmscan.c | 8 ++-- 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h index d2123dd960d5..124bc22866c8 100644 --- a/include/trace/events/vmscan.h +++ b/include/trace/events/vmscan.h @@ -141,19 +141,47 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template,= mm_vmscan_direct_reclaim_b ); =20 #ifdef CONFIG_MEMCG -DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_recl= aim_begin, =20 - TP_PROTO(int order, gfp_t gfp_flags), +DECLARE_EVENT_CLASS(mm_vmscan_memcg_reclaim_begin_template, =20 - TP_ARGS(order, gfp_flags) + TP_PROTO(const struct mem_cgroup *memcg, int order, gfp_t gfp_flags), + + TP_ARGS(memcg, order, gfp_flags), + + TP_STRUCT__entry( + __field(int, order) + __field(unsigned long, gfp_flags) + __array(char, name, NAME_MAX + 1) + ), + + TP_fast_assign( + __entry->order =3D order; + __entry->gfp_flags =3D (__force unsigned long)gfp_flags; + cgroup_name(memcg->css.cgroup, + __entry->name, + sizeof(__entry->name)); + ), + + TP_printk("memcg=3D%s order=3D%d gfp_flags=3D%s", + __entry->name, + __entry->order, + show_gfp_flags(__entry->gfp_flags)) ); =20 -DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_soft= limit_reclaim_begin, +DEFINE_EVENT(mm_vmscan_memcg_reclaim_begin_template, mm_vmscan_memcg_recla= im_begin, =20 - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(const struct mem_cgroup *memcg, int order, gfp_t gfp_flags), =20 - TP_ARGS(order, gfp_flags) + TP_ARGS(memcg, order, gfp_flags) +); + +DEFINE_EVENT(mm_vmscan_memcg_reclaim_begin_template, mm_vmscan_memcg_softl= imit_reclaim_begin, + + TP_PROTO(const struct mem_cgroup *memcg, int order, gfp_t gfp_flags), + + TP_ARGS(memcg, order, gfp_flags) ); + #endif /* CONFIG_MEMCG */ =20 DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, @@ -181,19 +209,44 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, m= m_vmscan_direct_reclaim_end ); =20 #ifdef CONFIG_MEMCG -DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclai= m_end, =20 - TP_PROTO(unsigned long nr_reclaimed), +DECLARE_EVENT_CLASS(mm_vmscan_memcg_reclaim_end_template, =20 - TP_ARGS(nr_reclaimed) + TP_PROTO(const struct mem_cgroup *memcg, unsigned long nr_reclaimed), + + TP_ARGS(memcg, nr_reclaimed), + + TP_STRUCT__entry( + __field(unsigned long, nr_reclaimed) + __array(char, name, NAME_MAX + 1) + ), + + TP_fast_assign( + __entry->nr_reclaimed =3D nr_reclaimed; + cgroup_name(memcg->css.cgroup, + __entry->name, + sizeof(__entry->name)); + ), + + TP_printk("memcg=3D%s nr_reclaimed=3D%lu", + __entry->name, + __entry->nr_reclaimed) ); =20 -DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softli= mit_reclaim_end, +DEFINE_EVENT(mm_vmscan_memcg_reclaim_end_template, mm_vmscan_memcg_reclaim= _end, =20 - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(const struct mem_cgroup *memcg, unsigned long nr_reclaimed), =20 - TP_ARGS(nr_reclaimed) + TP_ARGS(memcg, nr_reclaimed) ); + +DEFINE_EVENT(mm_vmscan_memcg_reclaim_end_template, mm_vmscan_memcg_softlim= it_reclaim_end, + + TP_PROTO(const struct mem_cgroup *memcg, unsigned long nr_reclaimed), + + TP_ARGS(memcg, nr_reclaimed) +); + #endif /* CONFIG_MEMCG */ =20 TRACE_EVENT(mm_shrink_slab_start, diff --git a/mm/vmscan.c b/mm/vmscan.c index 1080209a568b..4309eaf188b4 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -7088,7 +7088,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgrou= p *memcg, sc.gfp_mask =3D (gfp_mask & GFP_RECLAIM_MASK) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK); =20 - trace_mm_vmscan_memcg_softlimit_reclaim_begin(sc.order, + trace_mm_vmscan_memcg_softlimit_reclaim_begin(memcg, sc.order, sc.gfp_mask); =20 /* @@ -7100,7 +7100,7 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgrou= p *memcg, */ shrink_lruvec(lruvec, &sc); =20 - trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed); + trace_mm_vmscan_memcg_softlimit_reclaim_end(memcg, sc.nr_reclaimed); =20 *nr_scanned =3D sc.nr_scanned; =20 @@ -7134,13 +7134,13 @@ unsigned long try_to_free_mem_cgroup_pages(struct m= em_cgroup *memcg, struct zonelist *zonelist =3D node_zonelist(numa_node_id(), sc.gfp_mask); =20 set_task_reclaim_state(current, &sc.reclaim_state); - trace_mm_vmscan_memcg_reclaim_begin(0, sc.gfp_mask); + trace_mm_vmscan_memcg_reclaim_begin(memcg, 0, sc.gfp_mask); noreclaim_flag =3D memalloc_noreclaim_save(); =20 nr_reclaimed =3D do_try_to_free_pages(zonelist, &sc); =20 memalloc_noreclaim_restore(noreclaim_flag); - trace_mm_vmscan_memcg_reclaim_end(nr_reclaimed); + trace_mm_vmscan_memcg_reclaim_end(memcg, nr_reclaimed); set_task_reclaim_state(current, NULL); =20 return nr_reclaimed; --=20 2.25.1 From nobody Wed Dec 17 09:47:58 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F6BDC4332F for ; Wed, 1 Nov 2023 10:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235131AbjKAK3G (ORCPT ); Wed, 1 Nov 2023 06:29:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235110AbjKAK3C (ORCPT ); Wed, 1 Nov 2023 06:29:02 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88AA4DE; Wed, 1 Nov 2023 03:28:52 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 39397120033; Wed, 1 Nov 2023 13:28:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 39397120033 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1698834531; bh=pSKI4+L8HJRYn63UrrAYG4N/D56LntFTm89/ZK6IV24=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=hQdEufFtltMp4tP59pfpQfMZAy5u5HUeSe7wslXZZYG0+RgoZAruI5nqoFqESnayv 8PDojzaOXskd/K7rXMwIx6qNKqm6R5vcNxDJK681HH83Rps5sg7ya2aMBELUJAJ6+k WMIv7jOTRVH3GHf7iukh+HewyvxYIkLSOb9Z4tjRH2k4Kp5IBR1TKZZ0fimlsP4pwF u4noMpFQRni0uYtGrP5RH1EpCivQAkmimxBRQzhD27R6S11XCbOzTNSmO9ePcwujmk QtHTqb1InR6V7SZErR2B8uCuSGeHYqP2v8FxvSROexv5DeZrnYOs7Ohb6iEczA7DlU slqJr1B6XRbag== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 1 Nov 2023 13:28:50 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Wed, 1 Nov 2023 13:28:50 +0300 From: Dmitry Rokosov To: , , , , , , , CC: , , , , , , Dmitry Rokosov Subject: [PATCH v1 2/2] mm: memcg: introduce new event to trace shrink_memcg Date: Wed, 1 Nov 2023 13:28:37 +0300 Message-ID: <20231101102837.25205-3-ddrokosov@salutedevices.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20231101102837.25205-1-ddrokosov@salutedevices.com> References: <20231101102837.25205-1-ddrokosov@salutedevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 181040 [Nov 01 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 X-KSMG-AntiSpam-Envelope-From: ddrokosov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 543 543 1e3516af5cdd92079dfeb0e292c8747a62cb1ee4, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/11/01 06:18:00 #22376334 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The shrink_memcg flow plays a crucial role in memcg reclamation. Currently, it is not possible to trace this point from non-direct reclaim paths. However, direct reclaim has its own tracepoint, so there is no issue there. In certain cases, when debugging memcg pressure, developers may need to identify all potential requests for memcg reclamation including kswapd(). The patchset introduces the tracepoints mm_vmscan_memcg_shrink_{begin|end}() to address this problem. Example of output in the kswapd context (non-direct reclaim): kswapd0-39 [001] ..... 240.356378: mm_vmscan_memcg_shrink_begin:= memcg=3Dtest order=3D0 gfp_flags=3DGFP_KERNEL kswapd0-39 [001] ..... 240.356396: mm_vmscan_memcg_shrink_end: m= emcg=3Dtest nr_reclaimed=3D0 kswapd0-39 [001] ..... 240.356420: mm_vmscan_memcg_shrink_begin:= memcg=3Dtest oorder=3D0 gfp_flags=3DGFP_KERNEL kswapd0-39 [001] ..... 240.356454: mm_vmscan_memcg_shrink_end: m= emcg=3Dtest nr_reclaimed=3D1 kswapd0-39 [001] ..... 240.356479: mm_vmscan_memcg_shrink_begin:= memcg=3Dtest oorder=3D0 gfp_flags=3DGFP_KERNEL kswapd0-39 [001] ..... 240.356506: mm_vmscan_memcg_shrink_end: m= emcg=3Dtest nr_reclaimed=3D4 kswapd0-39 [001] ..... 240.356525: mm_vmscan_memcg_shrink_begin:= memcg=3Dtest oorder=3D0 gfp_flags=3DGFP_KERNEL kswapd0-39 [001] ..... 240.356593: mm_vmscan_memcg_shrink_end: m= emcg=3Dtest nr_reclaimed=3D11 kswapd0-39 [001] ..... 240.356614: mm_vmscan_memcg_shrink_begin:= memcg=3Dtest oorder=3D0 gfp_flags=3DGFP_KERNEL kswapd0-39 [001] ..... 240.356738: mm_vmscan_memcg_shrink_end: m= emcg=3Dtest nr_reclaimed=3D25 kswapd0-39 [001] ..... 240.356790: mm_vmscan_memcg_shrink_begin:= memcg=3Dtest oorder=3D0 gfp_flags=3DGFP_KERNEL kswapd0-39 [001] ..... 240.357125: mm_vmscan_memcg_shrink_end: m= emcg=3Dtest nr_reclaimed=3D53 Signed-off-by: Dmitry Rokosov --- include/trace/events/vmscan.h | 14 ++++++++++++++ mm/vmscan.c | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h index 124bc22866c8..518e7232c9eb 100644 --- a/include/trace/events/vmscan.h +++ b/include/trace/events/vmscan.h @@ -182,6 +182,13 @@ DEFINE_EVENT(mm_vmscan_memcg_reclaim_begin_template, m= m_vmscan_memcg_softlimit_r TP_ARGS(memcg, order, gfp_flags) ); =20 +DEFINE_EVENT(mm_vmscan_memcg_reclaim_begin_template, mm_vmscan_memcg_shrin= k_begin, + + TP_PROTO(const struct mem_cgroup *memcg, int order, gfp_t gfp_flags), + + TP_ARGS(memcg, order, gfp_flags) +); + #endif /* CONFIG_MEMCG */ =20 DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, @@ -247,6 +254,13 @@ DEFINE_EVENT(mm_vmscan_memcg_reclaim_end_template, mm_= vmscan_memcg_softlimit_rec TP_ARGS(memcg, nr_reclaimed) ); =20 +DEFINE_EVENT(mm_vmscan_memcg_reclaim_end_template, mm_vmscan_memcg_shrink_= end, + + TP_PROTO(const struct mem_cgroup *memcg, unsigned long nr_reclaimed), + + TP_ARGS(memcg, nr_reclaimed) +); + #endif /* CONFIG_MEMCG */ =20 TRACE_EVENT(mm_shrink_slab_start, diff --git a/mm/vmscan.c b/mm/vmscan.c index 4309eaf188b4..6b9619922dfb 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6461,6 +6461,10 @@ static void shrink_node_memcgs(pg_data_t *pgdat, str= uct scan_control *sc) */ cond_resched(); =20 + trace_mm_vmscan_memcg_shrink_begin(memcg, + sc->order, + sc->gfp_mask); + mem_cgroup_calculate_protection(target_memcg, memcg); =20 if (mem_cgroup_below_min(target_memcg, memcg)) { @@ -6491,6 +6495,9 @@ static void shrink_node_memcgs(pg_data_t *pgdat, stru= ct scan_control *sc) shrink_slab(sc->gfp_mask, pgdat->node_id, memcg, sc->priority); =20 + trace_mm_vmscan_memcg_shrink_end(memcg, + sc->nr_reclaimed - reclaimed); + /* Record the group's reclaim efficiency */ if (!sc->proactive) vmpressure(sc->gfp_mask, memcg, false, --=20 2.25.1