Received-SPF: pass (google.com: domain of linux-kernel+bounces-17394-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Bixuan Cui <cuibixuan@vivo.com>
To: akpm@linux-foundation.org,
	rostedt@goodmis.org,
	mhiramat@kernel.org,
	mathieu.desnoyers@efficios.com
Cc: linux-kernel@vger.kernel.org,
	linux-trace-kernel@vger.kernel.org,
	linux-mm@kvack.org,
	opensource.kernel@vivo.com,
	cuibixuan@vivo.com
Subject: [PATCH -next v6 2/2] mm: vmscan: add new event to trace shrink lru
Date: Thu,  4 Jan 2024 17:36:07 -0800
Message-Id: <20240105013607.2868-3-cuibixuan@vivo.com>
In-Reply-To: <20240105013607.2868-1-cuibixuan@vivo.com>
References: <20240105013607.2868-1-cuibixuan@vivo.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?rv8dmPPjuWJ8m1gKvkIMxvbNwqHjw2IzNXEwQ+soK+K0qYo5c+jOE61IDU3g?=
 =?us-ascii?Q?a3BXtQ8PMXRdUp72lmLzl+zBFV7Aw0krZFewCYca8HuN18klEGpTGWWA5OdW?=
 =?us-ascii?Q?2YkAcDSOe4wAqfy5g8qk9y2+ZYou0/yLE7fI7OW/iarWV2LES96i1i80CU56?=
 =?us-ascii?Q?wRHPSDSJS9b9Fhp9iebOds1NL9f9TdYE1QNETfiSSstTyN61RFTDYqdGwYDP?=
 =?us-ascii?Q?CGyMdblMWI4D2lV/kP78c/A83+Wf4YMZ0K0cJXElYEapL4GvtUhId3VIwhCp?=
 =?us-ascii?Q?o0KNFVhEjBOgY63HMq5t528ndfK+iIV/GwOi36AIqXTtE0bsjPNXmTpbcgLo?=
 =?us-ascii?Q?jH3swktS9ar5H8juSz0x/7erzfktowV16jkwD61LK5i1DjvG2HCBcn8RRHbp?=
 =?us-ascii?Q?FK+TWnOFcSgxnwM2qq5nIzhmCIBdbuqy4eTsrC5n/L72wX/Fob2Kg1rVuadL?=
 =?us-ascii?Q?xHHD2zTjEr/0d5FDT3OcVO31tqYg7R2RnBJPRyiZAX3yTv250KaqALljMre/?=
 =?us-ascii?Q?N5QjGHUuuGEE2My1xSi+Zccxwvr+73JRtcF9G4U4Jw2NdZW5M58hKamEo5nA?=
 =?us-ascii?Q?+46OjafuiZI6b8kTLEVholMW2weKukE3Q+i0Ufdt5SGXx4IoUaf7GFRzsLfJ?=
 =?us-ascii?Q?Zl3Dc8PmHQbmd9v60oOol6Umqa06nx6owp9C1nFfIQRKTXbeUunS8ZumVVtl?=
 =?us-ascii?Q?VoHleeMO2hcewgCgzYed4wsE6QBX725nRVLog1obRBDUWCqLvHCkiligc7zC?=
 =?us-ascii?Q?44O9CH9GWM2Rvn6atiXXP/7sgaFFfmcKNLoBzHKbBHiqx/ZnxlT2WSXXfzz8?=
 =?us-ascii?Q?B5toR3WtCkr4tDvomFS0QVxsH4ujz8kS5XVPODLJBsHK07MEgTsaS69v5oAT?=
 =?us-ascii?Q?q+ULDC8yGPHRsLQ1dtlRQNhVXvs1oiZWDUPLE0+jIlUwzb3I8VN+jxc++jMB?=
 =?us-ascii?Q?IkMdrEcWwDU9rIRKb0dMsoA6usVq3YAmFK85n4yxEkbauzK0upUWinJ0DeyB?=
 =?us-ascii?Q?m7BoTLoZ3zjohYU5JP2Kv5X4WrBAIJdLM28e6hB+/nIMLVENhKRL1vBQGffS?=
 =?us-ascii?Q?Z1j6SoXEJCsn60rAc5g5HiooZkyX270QFHtXTACyoFuxLrQLkd/+wzeWvUNI?=
 =?us-ascii?Q?NHLzeZW/3Q+/qVwb81L+grvLse/1QRBI4AXZjo0gzAVFIdXLmf2ZWBoirHHD?=
 =?us-ascii?Q?wU58U+omQaQ/Iv66evbOc2z2NPCxl9FOYsfvmEBSrMV0640cqZ6XYKSMtghx?=
 =?us-ascii?Q?TWs861OCkbilJGIAiXMtIaqyv2wZty6U8sfQj696ega4nH0GsVHwy4ZlmfQc?=
 =?us-ascii?Q?iLpKnBeDD26UfRGOgTyt0zgFqfrVtUK0rHuSf3ldJARopXPJAEcXGCIE9Vwe?=
 =?us-ascii?Q?xJ+fnQXASTNLUlpJ7wISv6WtrS/tUfOyQYJBw5aZp69S79kuEZweDVNJ11gd?=
 =?us-ascii?Q?vuOsC/Ho2ac+E3OR3G3cXySnSWYlElKWaXNMgqiW0V0WWLziKSabpMwOkKA1?=
 =?us-ascii?Q?FLunEmZ1xfB0NJ0SUNX4hXeWOd8Mfy7v3jzdpYIWdL701b4tH3gpNn0+NbZ8?=
 =?us-ascii?Q?EuZBTd39ItLUE04BBhFgO9b7OrmwlWtv9JpMw6/4?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0b17d349-03dc-44a0-0ffb-08dc0d8ec737
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4045.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 01:36:46.2204
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: M0IOWpqV3yeNAPdCoeHqb846WnZ/P90Sbu8dWwOYirBoJTsCXQDVqkegbwClsx8c4sasFDnmLuryMhUMKdS5LQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4488

From: cuibixuan <cuibixuan@vivo.com>

Page reclaim is an important part of memory reclaim, including:
  * shrink_active_list(), moves folios from the active LRU to the inactive LRU
  * shrink_inactive_list(), shrink lru from inactive LRU list

Add the new events to calculate the execution time to better evaluate 
the entire memory recycling ratio.

Example of output:
         kswapd0-103     [007] .....  1098.353020: mm_vmscan_lru_shrink_active_start: nid=0
         kswapd0-103     [007] .....  1098.353040: mm_vmscan_lru_shrink_active_end: nid=0 nr_taken=32 nr_active=0 nr_deactivated=32 nr_referenced=0 priority=6 flags=RECLAIM_WB_FILE|RECLAIM_WB_ASYNC
         kswapd0-103     [007] .....  1098.353040: mm_vmscan_lru_shrink_inactive_start: nid=0
         kswapd0-103     [007] .....  1098.353094: mm_vmscan_lru_shrink_inactive_end: nid=0 nr_scanned=32 nr_reclaimed=0 nr_dirty=0 nr_writeback=0 nr_congested=0 nr_immediate=0 nr_activate_anon=0 nr_activate_file=0 nr_ref_keep=32 nr_unmap_fail=0 priority=6 flags=RECLAIM_WB_ANON|RECLAIM_WB_ASYNC
         kswapd0-103     [007] .....  1098.353094: mm_vmscan_lru_shrink_inactive_start: nid=0
         kswapd0-103     [007] .....  1098.353162: mm_vmscan_lru_shrink_inactive_end: nid=0 nr_scanned=32 nr_reclaimed=21 nr_dirty=0 nr_writeback=0 nr_congested=0 nr_immediate=0 nr_activate_anon=0 nr_activate_file=0 nr_ref_keep=11 nr_unmap_fail=0 priority=6 flags=RECLAIM_WB_FILE|RECLAIM_WB_ASYNC

Signed-off-by: Bixuan Cui <cuibixuan@vivo.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
Changes:
v6: * Add Reviewed-by from Steven Rostedt.
v5: * Use 'DECLARE_EVENT_CLASS(mm_vmscan_lru_shrink_start_template' to
replace 'RACE_EVENT(mm_vmscan_lru_shrink_inactive/active_start'
    * Add the explanation for adding new shrink lru events into 'mm: vmscan: add new event to trace shrink lru'
v4: * Add Reviewed-by and Changlog to every patch.
v3: * Swap the positions of 'nid' and 'freeable' to prevent the hole in the trace event.
v2: * Modify trace_mm_vmscan_lru_shrink_inactive() in evict_folios() at the same time to fix build error (Andrew pointed out).

 include/trace/events/vmscan.h | 31 +++++++++++++++++++++++++++++--
 mm/vmscan.c                   | 11 ++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index b99cd28c9815..4793d952c248 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -395,7 +395,34 @@ TRACE_EVENT(mm_vmscan_write_folio,
 		show_reclaim_flags(__entry->reclaim_flags))
 );
 
-TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
+DECLARE_EVENT_CLASS(mm_vmscan_lru_shrink_start_template,
+
+	TP_PROTO(int nid),
+
+	TP_ARGS(nid),
+
+	TP_STRUCT__entry(
+		__field(int, nid)
+	),
+
+	TP_fast_assign(
+		__entry->nid = nid;
+	),
+
+	TP_printk("nid=%d", __entry->nid)
+);
+
+DEFINE_EVENT(mm_vmscan_lru_shrink_start_template, mm_vmscan_lru_shrink_inactive_start,
+	TP_PROTO(int nid),
+	TP_ARGS(nid)
+);
+
+DEFINE_EVENT(mm_vmscan_lru_shrink_start_template, mm_vmscan_lru_shrink_active_start,
+	TP_PROTO(int nid),
+	TP_ARGS(nid)
+);
+
+TRACE_EVENT(mm_vmscan_lru_shrink_inactive_end,
 
 	TP_PROTO(int nid,
 		unsigned long nr_scanned, unsigned long nr_reclaimed,
@@ -446,7 +473,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
 		show_reclaim_flags(__entry->reclaim_flags))
 );
 
-TRACE_EVENT(mm_vmscan_lru_shrink_active,
+TRACE_EVENT(mm_vmscan_lru_shrink_active_end,
 
 	TP_PROTO(int nid, unsigned long nr_taken,
 		unsigned long nr_active, unsigned long nr_deactivated,
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 4e3b835c6b4a..a44d9624d60f 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1906,6 +1906,8 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan,
 	struct pglist_data *pgdat = lruvec_pgdat(lruvec);
 	bool stalled = false;
 
+	trace_mm_vmscan_lru_shrink_inactive_start(pgdat->node_id);
+
 	while (unlikely(too_many_isolated(pgdat, file, sc))) {
 		if (stalled)
 			return 0;
@@ -1990,7 +1992,7 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan,
 	if (file)
 		sc->nr.file_taken += nr_taken;
 
-	trace_mm_vmscan_lru_shrink_inactive(pgdat->node_id,
+	trace_mm_vmscan_lru_shrink_inactive_end(pgdat->node_id,
 			nr_scanned, nr_reclaimed, &stat, sc->priority, file);
 	return nr_reclaimed;
 }
@@ -2028,6 +2030,8 @@ static void shrink_active_list(unsigned long nr_to_scan,
 	int file = is_file_lru(lru);
 	struct pglist_data *pgdat = lruvec_pgdat(lruvec);
 
+	trace_mm_vmscan_lru_shrink_active_start(pgdat->node_id);
+
 	lru_add_drain();
 
 	spin_lock_irq(&lruvec->lru_lock);
@@ -2107,7 +2111,7 @@ static void shrink_active_list(unsigned long nr_to_scan,
 		lru_note_cost(lruvec, file, 0, nr_rotated);
 	mem_cgroup_uncharge_list(&l_active);
 	free_unref_page_list(&l_active);
-	trace_mm_vmscan_lru_shrink_active(pgdat->node_id, nr_taken, nr_activate,
+	trace_mm_vmscan_lru_shrink_active_end(pgdat->node_id, nr_taken, nr_activate,
 			nr_deactivate, nr_rotated, sc->priority, file);
 }
 
@@ -4524,9 +4528,10 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap
 	if (list_empty(&list))
 		return scanned;
 retry:
+	trace_mm_vmscan_lru_shrink_inactive_start(pgdat->node_id);
 	reclaimed = shrink_folio_list(&list, pgdat, sc, &stat, false);
 	sc->nr_reclaimed += reclaimed;
-	trace_mm_vmscan_lru_shrink_inactive(pgdat->node_id,
+	trace_mm_vmscan_lru_shrink_inactive_end(pgdat->node_id,
 			scanned, reclaimed, &stat, sc->priority,
 			type ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON);
 
-- 
2.17.1