From nobody Mon Oct 6 10:17:30 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2063.outbound.protection.outlook.com [40.107.244.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FF96B667; Tue, 22 Jul 2025 19:46:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753213618; cv=fail; b=FkAivCR5R9gKWJrs12dDmmLP69MZXgt4WpzCuRPEgRpyqckFnR2dAVR62RgArm3k6pGI64z4KGiqIMmKYjiBWVMTiDS3QabXmj0ib8Le0Bkmykfx6btPkRhFq7PzGqL26o9zLGhs53vDVr+GslbLtG8KTFnm4spYWScMKIs8r98= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753213618; c=relaxed/simple; bh=qIqFIWWLfisC3tX5kNXO11OBTysxbXlkSydnY5sfoks=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=MC29ya0S3YQbR31adnRtax10rg8YiNoASu2qQi6BKf1iu06sNhb7dDQ0NmTFAABYAg/IOREn5fongf2GyOiZoq3ZDQlVbuoz+QF2PNd2xVarHpf/TH5is2QJCRLskp1HOwBndOw7tIqMKtaUDn99Pa4SXBO+nag7C+VIPweQR24= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=ORnxll60; arc=fail smtp.client-ip=40.107.244.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="ORnxll60" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q37Sf45JVrGWypY9nm6VOTGB67Rr0etrJveKe564ZPORwLinEfIx8Y0FN8hqJSDxgDnD1pDXeiKZPScRr/LMKcggZpc304V+cbujQ1+78R3gX9GJ5x8S3pc4neEreljhJzsLZIhvlXKJ1GfP/0DxG6lKE9Rbkvt+u6WBd0cYM9IYstW1KP9xiC6g8xLDNTNuWhH5kM7d/lZmDPTS3C4CKGpQntEqIaa4UsNgXX4ViC0DajZDeDcQzjhQzD7B1zzN9PrRuaidwMk17YV6SNvFbaCjMsFwBbektbLscM7CVDIye23ff6tfZ+/9nUt4MbXoyU8K3lrnpf9HRyJFM62pTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sBTLYHVY5uivYIuEx9gKPl3PE2bZh4a3CYzsVI2CLTA=; b=dQca+s+UpKtm9UNDbK1Z4LyUzB1EWnXJ0IOYIQv2QlohchX3BXx913nzS60lyJSyPzHfn9fjfKULcGUHlwFxi6u7kwEsgS7EnSNgkG6T424Jq2izXwxYTp0p+665Nf/jv4qkQ2GLIghmjr/65bxmmWmC3HMkzIpVY00nBL7/l4BlrtHndKAXUI7GkYHEaukqgge7CHurHgYZ42OCMlOsccrU4tii2F7Ki0gk3Bc42ZqDYnxPLtaMguFYfYiyH+Cv/JTZZjluwzbJNlvGPKHdktf3XSi75dJYFOgnFGn0tgCRDqdYzqHNINvx+TYXhtVHSZoafqNPsuwue6Kbn1qWjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sBTLYHVY5uivYIuEx9gKPl3PE2bZh4a3CYzsVI2CLTA=; b=ORnxll60kjXanqo9Zfz9Wl3oFnVooZkE1qKY6+J+9ZHOrdnmB28d5GUULMwJ2YEb8DzNMFPkD9YWoRbkm9Qb4Mff+fsOZrO3BboGdwaHgp2iNnLBd38dKtmrnOKVJnQvHDT0udx3GC7lpXHitXd1MBl40KpsoFz0ehior75+RlEbYkFZJueEfHTaTuqDMIbF0LmmKb3DmACxkp8ZGXQw6lgGDlwSUj0DCgGKCFS0hyT83klNm0K1JtTws6BVxXD/SYgoOo5hCjwRRklHsnwnkVAYkcyMMNym7fwfn2QMTRkBzTMaTvzucrZd9vDXHxlxux7Wkixn+B4D9VUg8dzM2w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by MW4PR12MB7031.namprd12.prod.outlook.com (2603:10b6:303:1ef::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Tue, 22 Jul 2025 19:46:53 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%6]) with mapi id 15.20.8922.037; Tue, 22 Jul 2025 19:46:53 +0000 From: Zi Yan To: Richard Chang , linux-mm@kvack.org Cc: Andrew Morton , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , David Rientjes , Martin Liu , David Hildenbrand , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, kernel test robot Subject: [PATCH] mm/page_alloc: remove trace_mm_alloc_contig_migrate_range_info() Date: Tue, 22 Jul 2025 15:46:49 -0400 Message-ID: <20250722194649.4135191-1-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BLAPR05CA0036.namprd05.prod.outlook.com (2603:10b6:208:335::17) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|MW4PR12MB7031:EE_ X-MS-Office365-Filtering-Correlation-Id: ed80f024-9049-4d34-4788-08ddc95881ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?HGkxeH7wisIIUTXey6ub+WpkSM6RujTx5BY9q3M/I8r6FM2w2xRqIS1u3j5e?= =?us-ascii?Q?JDJQCNisMcc8xJgsgYTihvxfMtDgXfBgTQC8M0RAtppS7Sy8NQbJqk2JaA0E?= =?us-ascii?Q?TzwqrRn8109KY0RHDEiMjVegAKx1x5TwGzh5XCeTaPx3YF+mN1sQ2gxoVdr5?= =?us-ascii?Q?k15RGSnnjk/5IrqXbS1PO0GNxCzaewWfS/pmQQH2auI/JK/03F8PHgVfhT4Q?= =?us-ascii?Q?Svq6uDWtsNkjiN+4QcQronjtepRzjfbHo11YPeqCLZwLLZ3I9WcSJ98xPqrF?= =?us-ascii?Q?U4K1wORBXCnmcq1t8WNdRjWkmWumObiT2SP9JndNj1rJDR2ja0GuG1bPWbUN?= =?us-ascii?Q?+Or0SVLh2Ig/+OMekA5bkp25g3+RviMP+weR/twXkYosWh0mmhbIn0h1rD9I?= =?us-ascii?Q?xNYHHwSoUCdE2LGSYvIKMi57KCePtvXL0Xzy4jgSCPXwYlKgRFu2OLlckt2P?= =?us-ascii?Q?iKrgzuH+uHrgN6ttes4QC/xsuswZiPHOkX6gV5ORVtttopRUPKkIMombv36F?= =?us-ascii?Q?gttWuSNatJSdwkJssL93AK6yfxRoMW4ZYEpGPMyB91SzC9Kb1o0lZ9kJ5dSi?= =?us-ascii?Q?YvBjAK3A3KA9KTqtIOWnQJoSyOZUpOJBPV5SGm2R/qnNEzKFOxLJM4DOwXg1?= =?us-ascii?Q?3342UtH8RwftyQGFAhmvFq5Zf/N23I7N2nKm+/mrp2v0tFS6uti3NVoTdcid?= =?us-ascii?Q?Ujv9Tn7ji6+L2yiJhAL97J42A3CgtULKuA0OxP2QXNjNMNTT2RV51+Hqemgc?= =?us-ascii?Q?iPMMiSY75oB9Dk0lKn4ca7tulzq2KWKigcT13g6a16dTyc3csE2gnnDvgZcr?= =?us-ascii?Q?uC03PdVgIWKizlJA8Tt9nWQwSKUZDwQArbbO0Mt9UZUVYkyGmDKCfKSnarkP?= =?us-ascii?Q?NwUb1j/ianRdwazegiKShvYUpMK+CZyxItEJY+SFMhTBv0UvtCKAU+PgDg6u?= =?us-ascii?Q?MIZBzK094+tfODkho9hzbHoHzWk0WZVHRFK6OsGdo1BGeEsiQaCEILz/MFk2?= =?us-ascii?Q?GoHWl+j8AnbVEG2+utlQoULQRbSYZXX8Mc84dQ495R3bpe26LFEnODqcgRVs?= =?us-ascii?Q?a9rTOnxErkMyoE+THf7XX+JdiLw5w2o8ob2X4RhimDTFWH2/WceFs24G6mi2?= =?us-ascii?Q?PZ0dyHUZr2cp7JRVawiQs2xcxalM/kfhu3oUcBzeePxMGVcDHc9V88Hxdiih?= =?us-ascii?Q?6oYVX84Ww1vl8Q8mqnRbjZ3eC5bqYQKRrJXjpXMvE2eLrr4zpS2XcY/k02An?= =?us-ascii?Q?WjmyStyxWiPaD8HDwIxQzTw2kkaFHIriQWeM6sKC1NQbukpuoqx7m503LaL/?= =?us-ascii?Q?4P798Ii7QejiEnP14KUt26kizECiK4GUah+ZMKnL9aAGf8SllyclOZ+Ok52u?= =?us-ascii?Q?DieGX1OTl7IRyfV2pN/78sSRTkWKO17qhHHPMLXQf5Krj3TN79513ZOjeBUS?= =?us-ascii?Q?WAgH3PabzlQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7UbR9Q/XgooMZ7gMFSyVafBXjQXX17B69OKkN+GR8DhjnjgeZ0JUAAWfuSPv?= =?us-ascii?Q?8iWZfkvn53jvVJi1uahfpcuA+aAH8beLKNowGfA3SRcvOhOsnOaEB3WGn35Z?= =?us-ascii?Q?NtK3axhs1MbTfMd8bTCVaTJxW0ee4KVvcFfBqUzWmsIon/nm0OaACmiSYHym?= =?us-ascii?Q?jEnxJzO+X7GOEIkxhrnP0wbxss2nlP+ZR3wnd8UfeRnROtBaJ9fnSTaej3ey?= =?us-ascii?Q?jeai55dkTmJM54/0KcLnMnx5Y+U55129ikXD+BbajsAsxbUsWL4nlXPnZmEg?= =?us-ascii?Q?UP89kP0Brh0BcO5OggNeaWGOElW34JA/BLXrwzd8JUPeHgCjbwu0/lzByHtm?= =?us-ascii?Q?PVwB5volSD/US+/esN4aE75sFNPb8Cm+5rHy381v3E1c3VzXPqxYn0uNlMic?= =?us-ascii?Q?1No3bY732wg6tMHYejnflXaI7JAheBju10HzidSnT5D4pA/JZrumcVH7kJo0?= =?us-ascii?Q?3tQXKRJKHn2tJDaIulERRaVRiK6AHvaSkxzJdFhcN1bvw/72Hqz3tucvz/qV?= =?us-ascii?Q?EnxH5utHcCi6y++bxjo3AH0ZoeBuoY8gQTMf8kDHWjSF9J07dhML9+LpvkvX?= =?us-ascii?Q?50L+x6sypCDu9GD9wKc6SyeToOD0X+XU17c7QZVLqSsBLUjnjX0ayDvfWjZn?= =?us-ascii?Q?Wfxq0UX1BZzJ+ojQFHSCTzEHXRw2UnvUuV+gBOf0sCUGV4hNO+fbSSfIbOHp?= =?us-ascii?Q?XGM3KJqXTLFvEVZZ/dzy04UMWoYAuReNrL72hj7Yh50G4VyWJaClnL1xb/Lz?= =?us-ascii?Q?WraUY1rysXElX/dwjTXGVfjhNQL5XUDBPTsJCBorlBHZaqF+gOrudfzm0l09?= =?us-ascii?Q?QBqVJng1tJeRL/YYjQy+oBeG3QGFzcyh5Coyj/FrXu2CbSxn3paGfYzyCDSR?= =?us-ascii?Q?dntRwYrDYi7AGRAad4cdHHjt8GCynHUh5iwTXXsonIaGtKL8VL3dVysjrZqm?= =?us-ascii?Q?/Vrg4uGvi+3wL5Ix02DvKR3PZWhYxaVYHJ5aKQC4BJzPxnV5J243Repxowx4?= =?us-ascii?Q?olipD/sq79KNII9AcZqS33AVT7bougOxeV8uSh+ODi+VL7hZrIeW2910PVOT?= =?us-ascii?Q?7XXB3LLmJU71hmS4lIoHib51+0Bg5Uy2w/3KYMglRHF898Sy0culqJ5pBlD6?= =?us-ascii?Q?jeptJKfntayZf286HzczZl7lov0TsCkUU7bCnkZDXaP0P9JtshxwcpPrdxHc?= =?us-ascii?Q?sOpygzTrULi9Zx1Zo7rw/D4CqnNZFw5VMG4haBHcYPRqoxSmZtj0rw3hZhtk?= =?us-ascii?Q?FQMKSE1FCkxB+J7pkOy7tM43UOZ6lYmTlZlpVK0ecgQpiApWgGwiD+D+MpUq?= =?us-ascii?Q?xnKkoB+lk8IWlKYPw5+RgzQXtPATro/HZqd/yzLLIRzcAuNSRHBJ2d1pBHkI?= =?us-ascii?Q?SZrHVI5u/u1XCgUSrSdYh/gFhjjMvC0zpNBENbl52mFTCAIFoJImUJNV+aZ1?= =?us-ascii?Q?D0lGxZUphDZ/2uN9xb4ax7PGlUbuMuJfR0RpFYfu0qFMEYJ7wfSJETDWga5e?= =?us-ascii?Q?DY2rcmhnfack9uV032TD//XcLdHcE5D2EILejyu3nbWUDdniIFldV1eHcUyc?= =?us-ascii?Q?qZe3Xr/coaoruEWbcAL5C/3lotQ3hPT/lPqVzcYS?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed80f024-9049-4d34-4788-08ddc95881ec X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2025 19:46:53.1553 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qXLv0+/IUrT5ylyLTuMNHBC/cMcU9M7nmj2uCuVh/ZfjC422qduTaeeSZBpgvMMr X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7031 Content-Type: text/plain; charset="utf-8" The trace event has not recorded the right data since it was introduced at commit c8b360031218 ("mm: add alloc_contig_migrate_range allocation statistics"). Remove it. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202507220742.P3SaKlI6-lkp@int= el.com/ Signed-off-by: Zi Yan Acked-by: David Hildenbrand Acked-by: Vlastimil Babka --- include/trace/events/kmem.h | 40 ------------------------------------- mm/page_alloc.c | 32 +++-------------------------- 2 files changed, 3 insertions(+), 69 deletions(-) diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index efffcf578217..474358773abe 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -304,46 +304,6 @@ TRACE_EVENT(mm_page_alloc_extfrag, __entry->change_ownership) ); =20 -#ifdef CONFIG_CONTIG_ALLOC -TRACE_EVENT(mm_alloc_contig_migrate_range_info, - - TP_PROTO(unsigned long start, - unsigned long end, - unsigned long nr_migrated, - unsigned long nr_reclaimed, - unsigned long nr_mapped, - acr_flags_t alloc_flags), - - TP_ARGS(start, end, nr_migrated, nr_reclaimed, nr_mapped, alloc_flags), - - TP_STRUCT__entry( - __field(unsigned long, start) - __field(unsigned long, end) - __field(unsigned long, nr_migrated) - __field(unsigned long, nr_reclaimed) - __field(unsigned long, nr_mapped) - __field(acr_flags_t, alloc_flags) - ), - - TP_fast_assign( - __entry->start =3D start; - __entry->end =3D end; - __entry->nr_migrated =3D nr_migrated; - __entry->nr_reclaimed =3D nr_reclaimed; - __entry->nr_mapped =3D nr_mapped; - __entry->alloc_flags =3D alloc_flags; - ), - - TP_printk("start=3D0x%lx end=3D0x%lx alloc_flags=3D%d nr_migrated=3D%lu n= r_reclaimed=3D%lu nr_mapped=3D%lu", - __entry->start, - __entry->end, - __entry->alloc_flags, - __entry->nr_migrated, - __entry->nr_reclaimed, - __entry->nr_mapped) -); -#endif - TRACE_EVENT(mm_setup_per_zone_wmarks, =20 TP_PROTO(struct zone *zone), diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 78ddf1d43c6c..a98c5d1f4336 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6694,14 +6694,9 @@ static void alloc_contig_dump_pages(struct list_head= *page_list) } } =20 -/* - * [start, end) must belong to a single zone. - * @alloc_flags: using acr_flags_t to filter the type of migration in - * trace_mm_alloc_contig_migrate_range_info. - */ +/* [start, end) must belong to a single zone. */ static int __alloc_contig_migrate_range(struct compact_control *cc, - unsigned long start, unsigned long end, - acr_flags_t alloc_flags) + unsigned long start, unsigned long end) { /* This function is based on compact_zone() from compaction.c. */ unsigned int nr_reclaimed; @@ -6713,10 +6708,6 @@ static int __alloc_contig_migrate_range(struct compa= ct_control *cc, .gfp_mask =3D cc->gfp_mask, .reason =3D MR_CONTIG_RANGE, }; - struct page *page; - unsigned long total_mapped =3D 0; - unsigned long total_migrated =3D 0; - unsigned long total_reclaimed =3D 0; =20 lru_cache_disable(); =20 @@ -6742,22 +6733,9 @@ static int __alloc_contig_migrate_range(struct compa= ct_control *cc, &cc->migratepages); cc->nr_migratepages -=3D nr_reclaimed; =20 - if (trace_mm_alloc_contig_migrate_range_info_enabled()) { - total_reclaimed +=3D nr_reclaimed; - list_for_each_entry(page, &cc->migratepages, lru) { - struct folio *folio =3D page_folio(page); - - total_mapped +=3D folio_mapped(folio) * - folio_nr_pages(folio); - } - } - ret =3D migrate_pages(&cc->migratepages, alloc_migration_target, NULL, (unsigned long)&mtc, cc->mode, MR_CONTIG_RANGE, NULL); =20 - if (trace_mm_alloc_contig_migrate_range_info_enabled() && !ret) - total_migrated +=3D cc->nr_migratepages; - /* * On -ENOMEM, migrate_pages() bails out right away. It is pointless * to retry again over this error, so do the same here. @@ -6773,10 +6751,6 @@ static int __alloc_contig_migrate_range(struct compa= ct_control *cc, putback_movable_pages(&cc->migratepages); } =20 - trace_mm_alloc_contig_migrate_range_info(start, end, alloc_flags, - total_migrated, - total_reclaimed, - total_mapped); return (ret < 0) ? ret : 0; } =20 @@ -6921,7 +6895,7 @@ int alloc_contig_range_noprof(unsigned long start, un= signed long end, * allocated. So, if we fall through be sure to clear ret so that * -EBUSY is not accidentally used or returned to caller. */ - ret =3D __alloc_contig_migrate_range(&cc, start, end, alloc_flags); + ret =3D __alloc_contig_migrate_range(&cc, start, end); if (ret && ret !=3D -EBUSY) goto done; =20 --=20 2.47.2