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]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA969C61D9B for ; Wed, 22 Nov 2023 10:02:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A45B46B05DD; Wed, 22 Nov 2023 05:02:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F61F6B05DE; Wed, 22 Nov 2023 05:02:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BCE86B05DF; Wed, 22 Nov 2023 05:02:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 7E4A86B05DD for ; Wed, 22 Nov 2023 05:02:10 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 541C21A062A for ; Wed, 22 Nov 2023 10:02:10 +0000 (UTC) X-FDA: 81485149620.08.5EF0D50 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by imf23.hostedemail.com (Postfix) with ESMTP id 62CFA140009 for ; Wed, 22 Nov 2023 10:02:07 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=salutedevices.com header.s=mail header.b=eyXlTCLL; dmarc=pass (policy=quarantine) header.from=salutedevices.com; spf=pass (imf23.hostedemail.com: domain of ddrokosov@salutedevices.com designates 45.89.224.132 as permitted sender) smtp.mailfrom=ddrokosov@salutedevices.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700647327; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ihuwRMROZNg9AMfolsXNCx/0gG4LGfVCgQWgEVIDo1o=; b=lyR3qifB0QWDyX1xBrJ7nhb4NWIHrw3DZQ993dAeXM62lgEH7P2iLk/xZq38E6uXXPfIpv NxpsFZZVrg3VtdPw6bj9+bEVvHT8PdotMFQ7Znj135viKa7tMsj4qr0wlWcUPCEuyqJIgF OozYfjGHOD3x4T2f0GmrMXLP2fHEAbk= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=salutedevices.com header.s=mail header.b=eyXlTCLL; dmarc=pass (policy=quarantine) header.from=salutedevices.com; spf=pass (imf23.hostedemail.com: domain of ddrokosov@salutedevices.com designates 45.89.224.132 as permitted sender) smtp.mailfrom=ddrokosov@salutedevices.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700647327; a=rsa-sha256; cv=none; b=TQ7L47Ul8unyarkaYD0hA6qLWNsMYDB82LmSZe7wZCFCmehAfYhXiLeN2nkPrj0mZfCdX0 Qbc/PmM3CCsKVUcwi4Y+tYU449/62GTxbZSSz4N3xB7RBnFUuOOPnM8mejwvFmtexxTTWd L+MPDCZe+cFpxbgGEt4WnIhVGtPWIQs= Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 48C2C120079; Wed, 22 Nov 2023 13:02:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 48C2C120079 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1700647325; bh=ihuwRMROZNg9AMfolsXNCx/0gG4LGfVCgQWgEVIDo1o=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=eyXlTCLL30waDgk1VVuibAcFiArPDA/QsTD9s6PVmHQgZDaoOl0J7HEhacQSCGzdW KpC4kNieIjEFxfS7rrl1N/XnW2xeSyvlnB3irz28yZu5koLfNmBdv3XgUW1/8bDNC2 UhUCooBWv1c8a7wGw4dtmVhFcjNzEEQ/8olZIuSXqZCPfxpqDW/7qoyGEUt+yKxmS6 OEek66LqWv/XAvLl+yqIg3FJ4LbryZ/luWoFIc5d8EH0xClBLML70hedhn3PrHyfjv DUMuF6145cZGNl7EV41++Y5LhnIxWkV/utXAwWS1AZ+8VYlsDl+KNWaRRcab96J6Wy GqtyrCw9DvGyw== 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, 22 Nov 2023 13:02:05 +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.40; Wed, 22 Nov 2023 13:02:04 +0300 From: Dmitry Rokosov To: , , , , , , , CC: , , , , , , Dmitry Rokosov Subject: [PATCH v2 1/2] mm: memcg: print out cgroup name in the memcg tracepoints Date: Wed, 22 Nov 2023 13:01:55 +0300 Message-ID: <20231122100156.6568-2-ddrokosov@salutedevices.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20231122100156.6568-1-ddrokosov@salutedevices.com> References: <20231122100156.6568-1-ddrokosov@salutedevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: 181525 [Nov 22 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: 3 0.3.3 e5c6a18a9a9bff0226d530c5b790210c0bd117c8, {Tracking_from_domain_doesnt_match_to}, salutedevices.com:7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;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/22 05:48:00 #22499758 X-KSMG-AntiVirus-Status: Clean, skipped X-Rspam-User: X-Stat-Signature: 1dqspw68euaazbq461qfw3fs5rpf3tib X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 62CFA140009 X-HE-Tag: 1700647327-77204 X-HE-Meta: U2FsdGVkX1+zETOjHRBfMITOMsZRcrARVXnqbCuoZeh2sIjQSdGrYjG2gS6FDj9vtQAYQ+JOFEgC2qXywImZr4FkG/WiEhZR07RuqUDtGSEoqPOj2SE3H54SUH2BlDSFPvoAJgJkwqzk2EELXhNoOa1uZLwy2zeKIanshO5IQru9CMKVWpsjnv36m7EbOoL1UVlVre/rA3pb96HP5KTA7Wbfmir3fF4FK3W31qr50fAQz4hxI1/WCOO5uU2dE8aIafwUYE/WI/3Z64cGyZwUfEqblR/FmvCBu/7avJn59h6NA+OTSmc6dd8T9p/taDSaW9tHA7BU9fUzy7umVCf+qKnU5pTUBR8CquRFEnZu5M961WLFQ61ZnNVwyJUo4KxUuIkV8Xz9Jw/Vm34CVGj0lfN8BRWwg55c9LyA0DDMC2nQHyggMXadl1qnrtjIbNJJqox2DVRdI0R4tonGhGqluU1hZd79+/nqeGvec6eAypFjmT7A14vbF80zBJI/FhGKqpEX4oaMJRzEM+ldCgqLow44U8eQQpRi+OCy+CwVWx3gPlSYu83B23gSjnioafUzSeIElVEB1VeHySDIniolavJZ62E0pti269ZPMMqcrSVjx40bnqB5IPyI5b1G32dyOeFlD9nG28AdSbRQUa6Cs0sN+VIFhY+TUhjJrWw7hMX4Rk1dpAVDpuzQZGuDvSEDMfo5CzRhySWjse46vDX0igk2jxVpTUxwnXinUeT8jcfnqE2anFrT0cFFRCSLbhCLFJnvqdAcgAWK6F133R9GdQrhPOdAB+8RMOAdrdh4cxyRqMUOqXo+nP1koyBtBhPSHLjaRH1P//okLS8+h8qGsaMZYnFLC0L8uBGgegre6/H38gD++B7idwwsilPFv0OaDukltSS0787FhLwtdveZPmgHrHnpbf+ORUAuHpaFXuPqqjOpHHCbw6eAkljoGkjaEAHPlHx1ymDimb1JuFH NIrxRHy6 5WY7MrJfPt7fcoxzJeFnVde/2Lp4aG3w8y97jH7Ph30UQNDNdcXPVnEkb7m39FY2e3sSnHKgz04vDCMi7dWJqkG9mIkkr/fk6lEBoZ4e7y2o1QQxNwNrBvFW46jRv+ylOkhE64f4sBgUHX85ihK3CT6EKEMrgVGxpuqkghIaE28q13WX7hKDTsGJuddIynltF/nLY1xFOhu59LjHI94UiiuJ3UcFfenjeSP7aQxmtecdnNEChASvyZSPngVW7lOjvLOOsk4ZXPQ0fdPy8bpplb8vM8lGnQ7yBWU6DOFB6S8hLXhP1XXkm8eVnUvyEbTN2BBqY+cAOUUBDRyXhl1r6zHK28Jc/VX1yeud4d49PvbAJurc= 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: 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 | 10 ++--- 2 files changed, 70 insertions(+), 17 deletions(-) diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h index d2123dd960d5..9b49cd120ae9 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 ); #ifdef CONFIG_MEMCG -DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), +DECLARE_EVENT_CLASS(mm_vmscan_memcg_reclaim_begin_template, - TP_ARGS(order, gfp_flags) + TP_PROTO(int order, gfp_t gfp_flags, const struct mem_cgroup *memcg), + + TP_ARGS(order, gfp_flags, memcg), + + TP_STRUCT__entry( + __field(int, order) + __field(unsigned long, gfp_flags) + __array(char, name, NAME_MAX + 1) + ), + + TP_fast_assign( + __entry->order = order; + __entry->gfp_flags = (__force unsigned long)gfp_flags; + cgroup_name(memcg->css.cgroup, + __entry->name, + sizeof(__entry->name)); + ), + + TP_printk("order=%d gfp_flags=%s memcg=%s", + __entry->order, + show_gfp_flags(__entry->gfp_flags), + __entry->name) ); -DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, +DEFINE_EVENT(mm_vmscan_memcg_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, - TP_PROTO(int order, gfp_t gfp_flags), + TP_PROTO(int order, gfp_t gfp_flags, const struct mem_cgroup *memcg), - TP_ARGS(order, gfp_flags) + TP_ARGS(order, gfp_flags, memcg) +); + +DEFINE_EVENT(mm_vmscan_memcg_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, + + TP_PROTO(int order, gfp_t gfp_flags, const struct mem_cgroup *memcg), + + TP_ARGS(order, gfp_flags, memcg) ); + #endif /* CONFIG_MEMCG */ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, @@ -181,19 +209,44 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end ); #ifdef CONFIG_MEMCG -DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), +DECLARE_EVENT_CLASS(mm_vmscan_memcg_reclaim_end_template, - TP_ARGS(nr_reclaimed) + TP_PROTO(unsigned long nr_reclaimed, const struct mem_cgroup *memcg), + + TP_ARGS(nr_reclaimed, memcg), + + TP_STRUCT__entry( + __field(unsigned long, nr_reclaimed) + __array(char, name, NAME_MAX + 1) + ), + + TP_fast_assign( + __entry->nr_reclaimed = nr_reclaimed; + cgroup_name(memcg->css.cgroup, + __entry->name, + sizeof(__entry->name)); + ), + + TP_printk("nr_reclaimed=%lu memcg=%s", + __entry->nr_reclaimed, + __entry->name) ); -DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, +DEFINE_EVENT(mm_vmscan_memcg_reclaim_end_template, mm_vmscan_memcg_reclaim_end, - TP_PROTO(unsigned long nr_reclaimed), + TP_PROTO(unsigned long nr_reclaimed, const struct mem_cgroup *memcg), - TP_ARGS(nr_reclaimed) + TP_ARGS(nr_reclaimed, memcg) ); + +DEFINE_EVENT(mm_vmscan_memcg_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, + + TP_PROTO(unsigned long nr_reclaimed, const struct mem_cgroup *memcg), + + TP_ARGS(nr_reclaimed, memcg) +); + #endif /* CONFIG_MEMCG */ TRACE_EVENT(mm_shrink_slab_start, diff --git a/mm/vmscan.c b/mm/vmscan.c index 1080209a568b..45780952f4b5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -7088,8 +7088,8 @@ 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.order, sc.gfp_mask, + memcg); /* * NOTE: Although we can get the priority field, using it @@ -7100,7 +7100,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; @@ -7134,13 +7134,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, 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; -- 2.36.0