Received-SPF: pass (google.com: domain of linux-kernel+bounces-17393-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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 1/2] mm: shrinker: add new event to trace shrink count
Date: Thu,  4 Jan 2024 17:36:06 -0800
Message-Id: <20240105013607.2868-2-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?9nylH50KXxLXXrOTmteQIVeZhlXKHBJ8VqDr4Nh6wlaMi8Lj0s0Bwo1jAmPm?=
 =?us-ascii?Q?IuBuPvG+xTMk6eZxSYpDXOBRYyrGOTjphVvqwf58rc5nvN0Xh5YzCw+OSD3o?=
 =?us-ascii?Q?+PdTEYzI4CQ8Mvzn7PSDWg9d8Lnm0b0VWbExi9BlBTLXTH9UZ2YBKRpsvA3i?=
 =?us-ascii?Q?l6gtcI6aClZOL7wpOkPyAKHKSjjn5br0tWjMrTpoMeV2h2KDN3eEfvGU/4w5?=
 =?us-ascii?Q?4mcMaXtkC4bSyqmBmq4AOVL7SAiAf3Ds3AJl/GoCvCkZWa5SU4NEOeQknT+Z?=
 =?us-ascii?Q?UEtO1Wf580rXxqaZpueYfTwL++AEn3VTzTwEkvzA4D0YPdiOWqQiTIQouHVO?=
 =?us-ascii?Q?bF2NkZoRq/iBHFQ/l9xmkO6iLg0u8JwkUwPqmvmnHWa/QDpFasih8LYhCIcP?=
 =?us-ascii?Q?CuvwcU9d8Z60thbh4d72s+Kqo7Z0ZSQLAQqvHHbt48QskqdO2rzvrslcYv98?=
 =?us-ascii?Q?IRULEj4LFqiCJedSW4MFYJV43D84VmbRdx3FVhcTzVAKJH5jBgbaWNvp53BL?=
 =?us-ascii?Q?kp8ctvIFbDoNwLD0WnYPWoXzVlugLtZmVkAQvOlLJrPIiw0x1vf7l1AWt0uw?=
 =?us-ascii?Q?CIpP+V2eCazqirfkQ4qccumdkDy3ZfceQklI0vIDOWsL9H3rjDJb7k7O0OFU?=
 =?us-ascii?Q?8ONWb/DGOcu7gfTP7IE/fRWB4zH0pRdoqaCmEBM6nAMHY0+4Ag2f7k/CxrC6?=
 =?us-ascii?Q?Aq0eXvE4QLGSwRhqApRkHAO3mbxj2T6vAX8oaovm96RsYkFlDvbezV6C7gyV?=
 =?us-ascii?Q?wpz7Y9joi9BOCbJdHoxJz/6SkKVaqrsifVDBGTT0tw7Gutl026zISW4f5hZB?=
 =?us-ascii?Q?R5iBiXvWa+MDOsmiH8028oecOK840q8NkUzFdhMEdQ1t13ufSYQZNY+UbYGi?=
 =?us-ascii?Q?wchJGPp3VTzMVo+qoHZj5PbcS5OjWOUDPCaOwyGHAtbiY+X4MYhmXZ7AGiR5?=
 =?us-ascii?Q?y9YNxWdSulNm0AM+PV9HhA5Xk/MaFIrUhyKG/g6WORm2YuGHTeZq71JxpMxp?=
 =?us-ascii?Q?T86PxxXBR85x1ZqdxQMTr6/C1VEsgnolvSWge63JYDwpG6v8hzGqlntjLTTX?=
 =?us-ascii?Q?aI2MjbgUrcTi18OmG5f5dvLQkhCUfEwTqZWb/qrG3pxGsnEAOMG5iXoekW0X?=
 =?us-ascii?Q?AsNmmPLdhVT1hFLf/EShpxiL2ESr5vctcX3V/LIH/gqFJ/S00VCvrZQKOZVo?=
 =?us-ascii?Q?dO922srh2PuMmvHdZSiLqmEL1CW5xmUQGOk/8F2osK6iKPO1vNfo+g8jKRuS?=
 =?us-ascii?Q?HOlHRQakg+ANGkr60cUe4iiVRINtFjAng/koOxC/dmqL/C3qky2GljSxd+T7?=
 =?us-ascii?Q?cZ4R+VBU0UvdBBdOmpbHvIdgPDWyoPMCF0vo443FgWT6o5w8aBYVUQBLMxFx?=
 =?us-ascii?Q?cn0Qnhpi3HKoYiv4Yk4dUX03sRzDMEDlmQFoUyRC2rNVAcNg+vKBEXKqh9g/?=
 =?us-ascii?Q?yzwkW7t0YuNZVfg756cXkqDRo9csReQMlBFfV7QpPl2322JR69S0VNC9kM79?=
 =?us-ascii?Q?D4byLZXdx+wNQmlkOBWnuRd9WkIKYqSfmFmkVcpzXsYrd0JnAV2/9/MP7/Y/?=
 =?us-ascii?Q?n5JC/WmW4mvSOK5+zSsB5tAeJ6OpQcNTMmbsT4OK?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 93c84b2f-a06c-4b1a-4d20-08dc0d8ec4d2
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:41.9742
 (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: eQGGnHYvTsxk2ouB6qlH6tOf+tA5pYbqSlBbCrZax6ahRrvJ7fweyl/z+4wHfjCGhpJkFPqAL2KcUSFX2CrxlQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4488

From: cuibixuan <cuibixuan@vivo.com>

do_shrink_slab() calculates the freeable memory through shrinker->count_objects(),
and then reclaims the memory through shrinker->scan_objects(). When reclaiming
memory, shrinker->count_objects() takes a certain amount of time:

	Fun               spend(us)
	ext4_es_count     4302
	ext4_es_scan      12
	super_cache_count 4195
	super_cache_scan  2103

Therefore, adding the trace event to count_objects() can more accurately
obtain the time taken for slab memory recycling.

Example of output:
         kswapd0-103     [003] .....  1098.317942: mm_shrink_count_start: kfree_rcu_shrink_count.cfi_jt+0x0/0x8 00000000c540ff51: nid: 0
         kswapd0-103     [003] .....  1098.317951: mm_shrink_count_end: kfree_rcu_shrink_count.cfi_jt+0x0/0x8 00000000c540ff51: nid: 0 freeable:36

Signed-off-by: Bixuan Cui <cuibixuan@vivo.com>
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 | 49 +++++++++++++++++++++++++++++++++++
 mm/shrinker.c                 |  4 +++
 2 files changed, 53 insertions(+)

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index 1a488c30afa5..b99cd28c9815 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -196,6 +196,55 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_re
 );
 #endif /* CONFIG_MEMCG */
 
+TRACE_EVENT(mm_shrink_count_start,
+	TP_PROTO(struct shrinker *shr, struct shrink_control *sc),
+
+	TP_ARGS(shr, sc),
+
+	TP_STRUCT__entry(
+		__field(struct shrinker *, shr)
+		__field(void *, shrink)
+		__field(int, nid)
+	),
+
+	TP_fast_assign(
+		__entry->shr = shr;
+		__entry->shrink = shr->count_objects;
+		__entry->nid = sc->nid;
+	),
+
+	TP_printk("%pS %p: nid: %d",
+		__entry->shrink,
+		__entry->shr,
+		__entry->nid)
+);
+
+TRACE_EVENT(mm_shrink_count_end,
+	TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long freeable),
+
+	TP_ARGS(shr, sc, freeable),
+
+	TP_STRUCT__entry(
+		__field(struct shrinker *, shr)
+		__field(void *, shrink)
+		__field(long, freeable)
+		__field(int, nid)
+	),
+
+	TP_fast_assign(
+		__entry->shr = shr;
+		__entry->shrink = shr->count_objects;
+		__entry->freeable = freeable;
+		__entry->nid = sc->nid;
+	),
+
+	TP_printk("%pS %p: nid: %d freeable:%ld",
+		__entry->shrink,
+		__entry->shr,
+		__entry->nid,
+		__entry->freeable)
+);
+
 TRACE_EVENT(mm_shrink_slab_start,
 	TP_PROTO(struct shrinker *shr, struct shrink_control *sc,
 		long nr_objects_to_shrink, unsigned long cache_items,
diff --git a/mm/shrinker.c b/mm/shrinker.c
index dd91eab43ed3..d0c7bf61db61 100644
--- a/mm/shrinker.c
+++ b/mm/shrinker.c
@@ -379,7 +379,11 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,
 					  : SHRINK_BATCH;
 	long scanned = 0, next_deferred;
 
+	trace_mm_shrink_count_start(shrinker, shrinkctl);
+
 	freeable = shrinker->count_objects(shrinker, shrinkctl);
+
+	trace_mm_shrink_count_end(shrinker, shrinkctl, freeable);
 	if (freeable == 0 || freeable == SHRINK_EMPTY)
 		return freeable;
 
-- 
2.17.1