Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   Bixuan Cui <cuibixuan@vivo.com>
To:     rostedt@goodmis.org, mhiramat@kernel.org,
        mathieu.desnoyers@efficios.com, akpm@linux-foundation.org
Cc:     linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
        linux-mm@kvack.org, cuibixuan@vivo.com, opensource.kernel@vivo.com
Subject: [PATCH -next 2/2] mm: vmscan: add new event to trace shrink lru
Date:   Mon, 11 Dec 2023 19:26:40 -0800
Message-Id: <20231212032640.6968-3-cuibixuan@vivo.com>
In-Reply-To: <20231212032640.6968-1-cuibixuan@vivo.com>
References: <20231212032640.6968-1-cuibixuan@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RSPQMdvNdFuqsHbr/s3uTn46IL39h/0PR8anaPFuO1ZsyeRLnTOCYITNoqFA?=
 =?us-ascii?Q?aSr0sZLIHKNA5VpjG7LrUts9shnGcdJ7vcV/8bUlj0UC7jitu/+v63309lhl?=
 =?us-ascii?Q?QGeoq4HJX64p0p9D61McrfAE2+Jf+fcpl7K8NMfEcrxEj6xm7PW+lS5HuBHZ?=
 =?us-ascii?Q?lAUWlkNCGOH5YZP5VhS/rtE7+tcOHiUHL/HODub61soU0QvHhPU5+oCbKgtT?=
 =?us-ascii?Q?NLtTZr1aiJRHS55GVYXoaVQivefoFeX0AAzfiJKj5zH+Z0leGNDmhhqLtJR5?=
 =?us-ascii?Q?Zxo/4VykrPFjHBKdBNshrOmpCz9BYInmxbxQuIgC52dGjpEhnuGQ0W6lrnMn?=
 =?us-ascii?Q?Vk9Ic9EUrXYRsLl/0T0CoJniVv8CAPZXie3IEGMdVXyBy4bH8e3MXuA0aySE?=
 =?us-ascii?Q?KwI2OYoLWkfCUCINYty4zKG9TONA2FQCMX/AHo9UJlCaFCYHFi76aVpjWe7W?=
 =?us-ascii?Q?8spuXElzqSiBRd5Ea3jjPP1C+QSzsNbJAdJCB2GgEqYPCHFXlDbyVJPgw9GO?=
 =?us-ascii?Q?UIlzs4G/YNPjhr3HBrAJfa8Cj6ineZu2ARpB0lqq5nz0l6DDBXio5LzRSh0l?=
 =?us-ascii?Q?GtrhhYvM8/MvXS2XT6ubceJrfaOZL/7LcIQHJnV+Ispr06pFuPbdBHuUtFsA?=
 =?us-ascii?Q?lsNabrUXFPzS0uEomWWCUthN/TSqaknKpB0nxR+0/c9Lwv6sApCOJrmph+88?=
 =?us-ascii?Q?F1X3Q4oSf62NWqbHj1NcMTWMNZMLzgsENem0C+6Qr0ECL3aSQghkUaqci4CS?=
 =?us-ascii?Q?J1iJCWrUtYSRqMaEXwPLtJA4PCzEmE5dv8sdXRVCBhIQeGZ1x57f9bkryI5B?=
 =?us-ascii?Q?tNIDsT9QojDWAlY70cFWljGKiKZzjTCHxaJfaq3EwwtaSBPshJKVQRfdlVTT?=
 =?us-ascii?Q?y6zFIYkL2yb0uX3Qb7wIYsK9IBoFNULzmVuJKxL+GlH9o9kYXzjugqBhICgj?=
 =?us-ascii?Q?ePY6xcT5Kh21L/5OHFxz56cwRbYCvJN1fQq0cCDu8vHT4eY2kEv0CW+dTZqn?=
 =?us-ascii?Q?0tBXOhbvLhaZRWojdvBv1opGnYDtZn02KJTYQ4azJOmjdJdfk8Raaz7gag6W?=
 =?us-ascii?Q?RDT6CHNXrZ3ApVdiKCDzNVC4XE5QPxKbtMwCh/YQ7tn2hPTdnMWyIIXCkapW?=
 =?us-ascii?Q?jG4hx0ZrgGMmLkTeiglba0kxSpP6eE1cnbBoQSUScrRWRJjQIqj9uW154yh4?=
 =?us-ascii?Q?7OSxQSBL41nsCTU/kIAXwS3ZVsfmFpjXYQGE5R1XqcNFMqlIjfTMI/ONbtP5?=
 =?us-ascii?Q?eZez0Ygibwdl2ivHUaLk8nvtVrWsSPoZhkxZIj4tZ7hemxMNBAVAAqROEeOD?=
 =?us-ascii?Q?edRTla2a9wkJfBs6/VEo5Hstmp9SxFHj9aOgy8SDsXEjuMUbFJkVTnQzusry?=
 =?us-ascii?Q?xDbTfIQeigXBSq6UnDpRFnsFrVrlE77tSO8iu8YbAGDeGtMoDvEiAndcw3as?=
 =?us-ascii?Q?IlVSme8Ga/+TUhikFufHM9cBi5DXrZ5OYzLPpjecbCZSUmjyncUN2ENN0Hxt?=
 =?us-ascii?Q?JKgqqVKPNsGc6MQP4Z9PO/Vx53JkeBYOHUGsEBmwboUEVZ/0IV9Ry7wmtixn?=
 =?us-ascii?Q?JBOizurgjELWLmvvDCOLPgdLZ9A2/U3amtLcgzP2?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 28db6b3f-c615-4b86-2d69-08dbfac23935
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4045.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 03:27:09.4828
 (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: mn24X+UvLKKnAlxmw4bEDG2JbJ1jQV2q3RgtmDAFtdF+zHGPiHGVWKTX4MxS37z/SyKfSGli8goJWjBGNszJyw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB6839
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 11 Dec 2023 19:27:23 -0800 (PST)

From: cuibixuan <cuibixuan@vivo.com>

Add a new event to calculate the shrink_inactive_list()/shrink_active_list()
execution time.

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>
---
 include/trace/events/vmscan.h | 38 +++++++++++++++++++++++++++++++++--
 mm/vmscan.c                   |  8 ++++++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index 406faa5591c1..9809d158f968 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -395,7 +395,24 @@ TRACE_EVENT(mm_vmscan_write_folio,
 		show_reclaim_flags(__entry->reclaim_flags))
 );
 
-TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
+TRACE_EVENT(mm_vmscan_lru_shrink_inactive_start,
+
+	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)
+);
+
+TRACE_EVENT(mm_vmscan_lru_shrink_inactive_end,
 
 	TP_PROTO(int nid,
 		unsigned long nr_scanned, unsigned long nr_reclaimed,
@@ -446,7 +463,24 @@ 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_start,
+
+	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)
+);
+
+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..73e690b3ce68 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);
 }
 
-- 
2.39.0