From nobody Sat Feb 7 21:15:40 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010020.outbound.protection.outlook.com [52.101.61.20]) (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 218071D5160 for ; Sun, 18 Jan 2026 19:26:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764395; cv=fail; b=Hok5vPOJElKkqBI2Z2HGYMMxVqcjIFHAqD2cxAEQbuDgW2D4d/IosKfK31+CzTMqoRfJXaGqcaJ+kfYFZGuMJ42TsYZm65sVuXu0V3dLK80XsSz4ld+T+dR2l5gKHlZH/cQFcW0MU4Si2c1TrDAdScskS+LVsz04eYETHKlEf+I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764395; c=relaxed/simple; bh=bHJzWBjMP45DMPXTvzY9nA8Lv3slbbXZn/NYDVXGO90=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RrwSJWoO/QBIXc9JrWtQc+eMwOy8EUOjg2CSDDM2px1hC6IpFxrljnaQbiXaxOs8Bau8LloX6amsILTJCx3fWe1nvfCMfC7t7lQ7paIuy1wVhOvc1boOfFe5K+Oszg6MFQvnKwJ1OO1f07I9svFlQmtrJyThxr6nkgC7Hh/6+0w= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=qUGv/T9p; arc=fail smtp.client-ip=52.101.61.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="qUGv/T9p" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CrywA6xRltQ2iQcRgMwAwIDY5qmRTK6P39zR648EB9bB+VIFPxNypbhgvxJKCDKialE73425lbgweD/E7Pxfr7Bhfk4tlsRp2YNDmL/bytr+OFsl34S3LydGfSOmZ8I2Qq45dpGklKjQBQGjyG7oaaMEDFHSfjb4rL2YrJW90tgWCmesHT78L020bUHdCLaQcD+sbAi15l8CNtMEISRqKjRkN+1vSTnlfZQ06yy0aKagpz4fVSlURgGFXRsLu1dQ78wnnPrmUsmEqsYRp9gGOEGNLUNiwUUnt8LCi45t1/bFyhpG4gp7bnuWary3yC2JuB8tyD2EfOdmvMSAgBqmtg== 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=fCKc2c/qjEjSDRw/8Qyb1Lt+GR46T99lw7jy2DPXaRk=; b=IFxMqPBfik6VZZd9J+3qR+7JC5bnl6taGVL4F2tgq/r50SF6qd3IVdgwFdBdDi1BevtwAXNv+ATPD4Oo/TdJLsz9NoKuTTIWSglqtAYMcpGApBfOOs9a2KKmbEflJ8hoDa8XSvResXkofySyKJhzRG4R950Yit5D08NY49ZN6Eri8OiKyDFulMGBS7X81o+NFVf8ckqbajhcsGqSFlmlro7oBg6nFCSCEbAmu5FF6Y/EYk1w2humCorW7oYIoal++54QtIJdj7evXz/34TApVWQPQzWkHbWeybWVrU16XjwrznEduEgD3Kq2rGyOFRF97ElKrh1KidMqxMWvDDQk6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fCKc2c/qjEjSDRw/8Qyb1Lt+GR46T99lw7jy2DPXaRk=; b=qUGv/T9pFhL2Kgv4aAwmgbICIx3V3FW6q40tWqbu9ahIcuXdSYJqZhzGES/vGMxz3I8+U0xnbemZVmfIf7wtCXabk8nsYbQ0TpLxN7LKlGVENcRoqeUXG6MoeT/SB1yCDrHiBkfRk7ja1ebY71g+2V+G/InmVwJPoJ9FlC+9Wwg= Received: from SJ0PR05CA0058.namprd05.prod.outlook.com (2603:10b6:a03:33f::33) by SA3PR12MB8762.namprd12.prod.outlook.com (2603:10b6:806:31f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.10; Sun, 18 Jan 2026 19:26:30 +0000 Received: from SJ5PEPF000001F6.namprd05.prod.outlook.com (2603:10b6:a03:33f:cafe::19) by SJ0PR05CA0058.outlook.office365.com (2603:10b6:a03:33f::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9520.2 via Frontend Transport; Sun, 18 Jan 2026 19:26:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by SJ5PEPF000001F6.mail.protection.outlook.com (10.167.242.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.4 via Frontend Transport; Sun, 18 Jan 2026 19:26:30 +0000 Received: from kaveri.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Sun, 18 Jan 2026 13:26:25 -0600 From: Shivank Garg To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes CC: Zi Yan , Baolin Wang , "Liam R . Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , , , Subject: [PATCH V3 1/5] mm/khugepaged: remove unnecessary goto 'skip' label Date: Sun, 18 Jan 2026 19:22:53 +0000 Message-ID: <20260118192253.9263-6-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118192253.9263-4-shivankg@amd.com> References: <20260118192253.9263-4-shivankg@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001F6:EE_|SA3PR12MB8762:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f78faa2-d775-4dab-3129-08de56c77b8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?60LifQSJr8AzxseqngO8CodpavTI8L0On3/apMyzwslpRCP22mgK1+5NC9nx?= =?us-ascii?Q?iqaF+cyYqyyn8mglHtlxfB6Bu/RawpUqcXsQZBzL59sbfqXbOroGbIoXRW9a?= =?us-ascii?Q?1GJZVIFhGpZMNvV2q3DpKK0tH7h3hLf8zBIKmnbdeiPpEu8Jnh5+wBAmVzSJ?= =?us-ascii?Q?qRKrxzkq6WV3qOmYEZByhWf+3v+wXkNz0XDqtCT1IR+L2nWKJ6ZpOJv5pTBu?= =?us-ascii?Q?WFLdoXt3Fsj6Q5WiSS6ZPFvGzK1vvHKdFGy4eHf4RWAdRxdf3Tczv8JfGsqR?= =?us-ascii?Q?52F9LyGl0hiYxFg7Hgfnhelfy/c/yDfLCKm14JMPlWML7l5lNLS9WhpDUuDS?= =?us-ascii?Q?vjpYDyxM6oA955pIRzJ2m5Rl0sZC2Qi1vK9cW1wqIBBpfvJBKpzd08kcjrd6?= =?us-ascii?Q?OKAS21SpKwhX2kaNBlEFOsPa3z3ZEXa1Ud92vhFX2SFS3wC7yiMhUexyFvNu?= =?us-ascii?Q?nnVGeHFaXUldII1dMpFO0uPjN1RZJiE2veo4WgJB/t7fQxT7uXfDXIh7asmV?= =?us-ascii?Q?JzB7x/gvruScRxtZF9j495+lBXDBU7EnZC6fIlFkv2vD3JoDEcWgbgnMzBRF?= =?us-ascii?Q?sd2j+lKSBZ+5sFdoURKMuxy7dnSbP022We11SYjE4XuqcRLxuL3jGDNFs6p8?= =?us-ascii?Q?NuzqZSnqpLdlFFaZ46LQHRzbvYUOzA1sumt8zH/BzJavhZ56a3njOVpPlLIy?= =?us-ascii?Q?0PJrYcfTvMKUOtox0NIcAjR0vqEPaeQEPy8JVnijquHCumsgy942hgPQsEk3?= =?us-ascii?Q?hM2OzmdHfUlecmZfQSQwE7HOj8ltw3oityKlfQxUzX/jIQV5Wlc56BcQfuwS?= =?us-ascii?Q?seTzEpmHVzgEW2OsIi0RpCMd7bO2gRoKduamWkznmF2qfPW2iZdHZEX1xcnX?= =?us-ascii?Q?MSnb6lrp9OjECbMl1lX5QcoPwPpbi4hUOC8wmYrfWmP5n7FWATYUJ+TUkhh0?= =?us-ascii?Q?AsLzZ+aKfgER1j5yOeiAbhDdultqvdsh69uUuiXZvQvpzdnTly0rCSZOnvGt?= =?us-ascii?Q?NnwuAZmKESOXb/tn8nUpj5tcOnVTXmAPrp1FcT2xrT5uc94g8zAccigi/+4u?= =?us-ascii?Q?gBP1Cp3s9L7zUQZVbT9SLO4BwirT5xdLb63sCiqujyHmFNBolNSjmkRh8W95?= =?us-ascii?Q?7kFFus+fNAs9ZA79BJE8UiJOGxlfaIzidsAnAligAR/0FwUw12tA3BvC/V2s?= =?us-ascii?Q?R1UDh08L2rMCV/h3XknUJ76W7U5fc9Anef+awSCX6/DFm5VDN+x9kEzzGTLe?= =?us-ascii?Q?OQ7DNaGs2l5nhBoyCY/WWvn4lKjDq4/7BHsFZfywyeGM/W2Xe4ygmUBWtCf0?= =?us-ascii?Q?cDmi2MBt8XKreMvPqJ93cCedLXnMr3vPVQlRuXFrCy6U9Gk+w2Ud0f8Bq6Sd?= =?us-ascii?Q?XxYwAIFGdSOnhhqtAr0y4bkMWnbsMrrOpOCX4cxeCDttz4wkdqQBas98tkYR?= =?us-ascii?Q?7OWvMU6vy6b7f8V6ZB+Xte8zfxldd5loZz5JB2lwUuBRsxdwiUqb41Ou7fxX?= =?us-ascii?Q?NVkqYCD2zswSlYjjJ5UyVb4b8ZRYGEnu/PVIN9gStKZO8HI6fdEZh9QUg76Q?= =?us-ascii?Q?jVQaerZR2z06QivMn22UNq195yileG4k98UKF6lxKwwsp2NoUYYvWSNQ58KI?= =?us-ascii?Q?v2tmwLX0UjqTWUQRpNmQf4lDVBf0slqx9MpTp23tnmJCyq0UHpwxkhRD/rMu?= =?us-ascii?Q?K1cnbQ=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2026 19:26:30.3175 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f78faa2-d775-4dab-3129-08de56c77b8e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001F6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8762 Content-Type: text/plain; charset="utf-8" Replace goto skip with actual logic for better code readability. No functional change. Reviewed-by: Liam R. Howlett Reviewed-by: Zi Yan Acked-by: David Hildenbrand (Red Hat) Reviewed-by: Lance Yang Signed-off-by: Shivank Garg Reviewed-by: Dev Jain Reviewed-by: Nico Pache Tested-by: Nico Pache --- mm/khugepaged.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 16582bdcb6ff..984294a16861 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2442,14 +2442,15 @@ static unsigned int khugepaged_scan_mm_slot(unsigne= d int pages, int *result, break; } if (!thp_vma_allowable_order(vma, vma->vm_flags, TVA_KHUGEPAGED, PMD_ORD= ER)) { -skip: progress++; continue; } hstart =3D round_up(vma->vm_start, HPAGE_PMD_SIZE); hend =3D round_down(vma->vm_end, HPAGE_PMD_SIZE); - if (khugepaged_scan.address > hend) - goto skip; + if (khugepaged_scan.address > hend) { + progress++; + continue; + } if (khugepaged_scan.address < hstart) khugepaged_scan.address =3D hstart; VM_BUG_ON(khugepaged_scan.address & ~HPAGE_PMD_MASK); --=20 2.43.0 From nobody Sat Feb 7 21:15:40 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010043.outbound.protection.outlook.com [52.101.46.43]) (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 4E4EF2737F8 for ; Sun, 18 Jan 2026 19:27:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764427; cv=fail; b=FvwsIwcmKdQP0MtGxhGoN5WhPzFRr/sTv1QtJcFTX5lfulM8dpuqqQQyFQfmUNIDs1nTp5+oBjF+DkicZRmfshgPwA6SmrI0mKIfN/sDy8ENe9FQxNbdt2kIy0fboMssd0Nr5kSBRU/BHCM+dMiRBJ2UYYQ2+PrGuLYsqZH63W8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764427; c=relaxed/simple; bh=QDK2UOH0/kvajKJGVa/5ei9+tuVKDrWSQ2M7r5mEm2I=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AaQ9cpUq15n9Bt5Hw4FDRrCnJWwEDIZ1BPs6Bn9CYpgC+u0+mTLqyuDPFvOWTG6bSVTr3+Bwjdbq/a6onrEvD3RyZBo31MxFDWGAMYWl86DhsF/31WqG7rwoqVUnpEL4nF/FndukbMll5xiEow4mBlqH7kbyYBS0OPN4BzySTZI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=bc+mMATi; arc=fail smtp.client-ip=52.101.46.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="bc+mMATi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nyQ/UKtR3KoZ51gHJiQAY9DS5f/deR+M0po7+YpI8H7xEXkSvazLOEVylA9q172j0gnwNv1o1lU74+exlAGXT3Tbl3wRA0LhV7grUY4RaWgtAmM/FheGCPU9NnDD9DfqX3fdmfc7id2jYdhYl0WIO6kzYeX5yceZjdRuS5Oa7OLG+r3a6OfmNVV2uJnhnxkGwKdBCRXztPdm0MNYUD55joHzYp1wDJTVWS4C+JvlFVFaVULArfJ7RA7Xopqloosqv5hhiOUplxQj/m3/rFDw/ZpHmi3a3vi1SAJj6cz+jgVg14cSo2mGHeDCcBRqJCSQYk5abdC3T/gubdPp79qTJA== 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=+9mkwIVOCFLqRySd16GZAq3q/7K0ukQ/gPvWr34d37E=; b=r7UMwgK/mamaeSXpcMxOG877Cyqy8ZN2Z0oJ7JNG/I2mTA+0JHQ/8/YSeqDQz3Y3ZCSxapU5UKB2USsvnHujEiV61r55+BluLtPJJOZHUqNfyN/XHPEUrIz3CB45NQTZvwq+Sqr0Ux1WrOLfG2RWkha1zBTF0LGpSexp8GL6juj28yuBY9tvpyc/f/i8ctW+pOHOxIZSBBNw1CdxaXyV4NppsEeEyhMoPXes18d87q/A6BnpFWlP/YrOhNkpJwkNeNH+FR0xhf1Bcecn2qT9SXlLBryHRG4PkLYo45PbrRZnhy0/E53OyJ6euervSnIGpyW2pk3I8aq6ofeIfIO6Ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+9mkwIVOCFLqRySd16GZAq3q/7K0ukQ/gPvWr34d37E=; b=bc+mMATi3bzoJCNL9K6IOl79OOKCDhog+T+kLUEilo8sXqJJLsjM4RcIB0MHdehdZ6BVQ3vl+YRvPPEU8fQ6nKO4gT9hgqaYlsuLQZ1/efbAfkbi5y/0uqg3FIgHlGgNKzTP7HImC34alWTm5ZnrXjU4lM2uaOG1/tK2+NpK7Gg= Received: from BY1P220CA0013.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::17) by IA1PR12MB8264.namprd12.prod.outlook.com (2603:10b6:208:3f5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.10; Sun, 18 Jan 2026 19:27:02 +0000 Received: from SJ5PEPF000001F1.namprd05.prod.outlook.com (2603:10b6:a03:59d:cafe::84) by BY1P220CA0013.outlook.office365.com (2603:10b6:a03:59d::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9520.11 via Frontend Transport; Sun, 18 Jan 2026 19:27:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by SJ5PEPF000001F1.mail.protection.outlook.com (10.167.242.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.4 via Frontend Transport; Sun, 18 Jan 2026 19:27:01 +0000 Received: from kaveri.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Sun, 18 Jan 2026 13:26:56 -0600 From: Shivank Garg To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes CC: Zi Yan , Baolin Wang , "Liam R . Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , , , , Wei Yang Subject: [PATCH V3 2/5] mm/khugepaged: count small VMAs towards scan limit Date: Sun, 18 Jan 2026 19:22:55 +0000 Message-ID: <20260118192253.9263-8-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118192253.9263-4-shivankg@amd.com> References: <20260118192253.9263-4-shivankg@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001F1:EE_|IA1PR12MB8264:EE_ X-MS-Office365-Filtering-Correlation-Id: f1b92ba7-342f-46b4-4723-08de56c78e19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|376014|1800799024|82310400026|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1sZC4w6QGfhrz0qgbK/qtFpU2HNnS4hWPyNNsz7OJt4/w9nXnotsok081eOm?= =?us-ascii?Q?b4GWYYMy1xxXuyuORkA4m6x5yRK5R42Yqs7wRjNYSwlQfJLhExqREz47/gcw?= =?us-ascii?Q?9gKb1oUvtTrBHMkpTr170lqUMsru1o+cTjUr0gC1IBFxxzu/+QyvlzT7HZnT?= =?us-ascii?Q?ypETWVV2H5UXPH1G0tPpWNqTvrwBNGoB50UmzyOt293IiJedUMOvcjJidDxO?= =?us-ascii?Q?4MwZwovVGviQjnf/0WeiOKagkVo0qtGVBj7CB5PTiXtrYY29/xDdccEClQ6j?= =?us-ascii?Q?jSROBSBBobekYJKUvyVqY9XuwgjIGBetCKSjYL7nXBCIN5xOtizwRc992z1a?= =?us-ascii?Q?5b+VprTMs5LU8CVpJSdBfa+mxFrmnEIIQlMwYA47ULNBmEZA86y0z8jCkjhF?= =?us-ascii?Q?+IbXN9baakExlmPRwcYxhS8OJQAaRymsTK559wlzAt4lBwZGG/8yeC0jfIlD?= =?us-ascii?Q?Ec0o3iGe99ysAXZAAn4Ij9FL3vU81TpZ7wPfE5nD2HdpPSAQRSGtMN4OqpUU?= =?us-ascii?Q?wkCJkXaI9g77wUdvTj8rr9r5Ko2fmL7/qtdITgQjqMpqAPFjYZBf5nMMBW4/?= =?us-ascii?Q?cc75cyfNAAbIH0L3RtUGny4QzuHD4isiOGa6Ds0Ie06fWEo8ekulZRxK574E?= =?us-ascii?Q?eMfmSVyuMF3ihRwCFqgRsc4pj7tmQQLf9rloXTnromZ89pMZR/RLjWmCkymS?= =?us-ascii?Q?1sYdKpgeyrm55uLzRfzJlbhbOnAFdcYViPHM8X1v1t5NPSacISqGWT5X7xYB?= =?us-ascii?Q?ZLQCFXCQ1adVj1wVfx6yK/sVP5nMYkYHnrzLp7+jc9eYLs7ZgS8Y81Ldxlem?= =?us-ascii?Q?6Ve1P8aimjwYKyPZKHrjEb+IAxV/T1YmVaawNrCwBPZMMUGfE/MfYIM4AD3s?= =?us-ascii?Q?0GLedBtf9wbG2yUGpM3P1i87t5Ieob8l+j7WvrG0RfwOjOilQR2Xm1YDaHIh?= =?us-ascii?Q?uKPv3wZ3IUaLfN+gI1oDJLxsF2m1/Im5FoOmb5h02GFGy8SgzwkBZVqXQxvy?= =?us-ascii?Q?vo+r0NlxZf7hc1hrg/Sq8nLSQ98cG9SoYLzFXlmn9y9YI+lfFIITuEjAtdVy?= =?us-ascii?Q?+nE6jDUGsBaXinW+XyR6IrwGhU8nAPrBa9OchdrUwwjJDk6IeZ0cdh8pREHp?= =?us-ascii?Q?s9tINHQPN+732YVN0FOnc7cMU+LnAVnrNP5yqmRv/BjEoNgoMV/LZkx+BS/N?= =?us-ascii?Q?kMi5WwuoOWomDr/7rrFmCNckR50rz+F0m99cGETdbOfuFU7rAnLsJ6Jc1Drh?= =?us-ascii?Q?h26duLtberb/Y3gPA9XOPCujDHnyn1AT4u026WIeuWTbjOQzugE0w0Z0QLRm?= =?us-ascii?Q?98KNWjvRd/4b/AKBUKKmQRfOlhb87e1RZhJK6WWNhANKormTwZGctT3EvnfQ?= =?us-ascii?Q?lI6I2Q/0Ttw7L9pLJs7qacyzctXVb/XGvINkcmUU2IgihhVrKDcrPaNva9KD?= =?us-ascii?Q?laxV//15wyu6K0EPKFgHvCGzZw5cx1LqcsMegES5gwLcX21VVkOB6zW3WGMq?= =?us-ascii?Q?q09K+7G7xuUM1uzENE7ee1UrYtgFgo3Vcfg9ziVHpt/5OSbwKP3EZdUN2Lgl?= =?us-ascii?Q?aCUX5XiarETNauQ32+RClpri0OclSv7KoNffDQaR0LjFN/sNRcRNkWC/W7cm?= =?us-ascii?Q?L6EuqB9fC4yuOeOUrXRmPTK4mGLjBKKKYeg+lQTCAhdxry7nd/jaqrnRv9wg?= =?us-ascii?Q?xNgrgw=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(376014)(1800799024)(82310400026)(13003099007);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2026 19:27:01.4358 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f1b92ba7-342f-46b4-4723-08de56c78e19 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001F1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8264 Content-Type: text/plain; charset="utf-8" The khugepaged_scan_mm_slot() uses a 'progress' counter to limit the amount of work performed and consists of three components: 1. Transitioning to a new mm (+1). 2. Skipping an unsuitable VMA (+1). 3. Scanning a PMD-sized range (+HPAGE_PMD_NR). Consider a 1MB VMA sitting between two 2MB alignment boundaries: vma1 vma2 vma3 +----------+------+----------+ |2M |1M |2M | +----------+------+----------+ ^ ^ start end ^ hstart,hend In this case, for vma2: hstart =3D round_up(start, HPAGE_PMD_SIZE) -> Next 2MB alignment hend =3D round_down(end, HPAGE_PMD_SIZE) -> Prev 2MB alignment Currently, since `hend <=3D hstart`, VMAs that are too small or unaligned to contain a hugepage are skipped without incrementing 'progress'. A process containing a large number of such small VMAs will unfairly consume more CPU cycles before yielding compared to a process with fewer, larger, or aligned VMAs. Fix this by incrementing progress when the `hend <=3D hstart` condition is met. Additionally, change 'progress' type to `unsigned int` to match both the 'pages' type and the function return value. Suggested-by: Wei Yang Reviewed-by: Wei Yang Reviewed-by: Lance Yang Signed-off-by: Shivank Garg --- Incorporate comment feedback from Lance: https://lore.kernel.org/linux-mm/6b408736-978a-4d40-adfc-97819951c3a6@linux= .dev mm/khugepaged.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 984294a16861..93ce39915f4a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2403,7 +2403,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, int *result, struct mm_slot *slot; struct mm_struct *mm; struct vm_area_struct *vma; - int progress =3D 0; + unsigned int progress =3D 0; =20 VM_BUG_ON(!pages); lockdep_assert_held(&khugepaged_mm_lock); @@ -2447,7 +2447,8 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, int *result, } hstart =3D round_up(vma->vm_start, HPAGE_PMD_SIZE); hend =3D round_down(vma->vm_end, HPAGE_PMD_SIZE); - if (khugepaged_scan.address > hend) { + if (khugepaged_scan.address > hend || hend <=3D hstart) { + /* VMA already scanned or too small/unaligned for hugepage. */ progress++; continue; } --=20 2.43.0 From nobody Sat Feb 7 21:15:41 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010023.outbound.protection.outlook.com [52.101.85.23]) (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 98C811D5160 for ; Sun, 18 Jan 2026 19:28:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.23 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764516; cv=fail; b=J6OEJTzW+aNvS93C0jiDx9RkqalcvSNzzppEQ3Cs6t2kdOpMvdvYLtul8dQsjamqRPOS25Hl7kaU9G6CHXC02f3KfXvJ5WynIrYcKBadh6XmuZeaUSJZBIQ1H0/ABmiMgv9avO8UILBGPq6rkkm/2hj6hOiQ1EFIT8UVb6YgS9g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764516; c=relaxed/simple; bh=gmP5uAfMXPnpWOrfJybp7g90SQ9YSwJCRe40MluBAf8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=k2ZnH9eSlxhDeo84xIDwf3LRlZS81qEf3epiYDsv1INSblYrcOXEMotVmP8wmaCkBy+DIYgtW0mfFBgv/Ff6rDjxB6hOca4BerXNslTjLtY9j0aD6MIOjPKcMelIlsMRAUlDj5O1dNu5oRMtGrwsZKhRtBeDMUb51XDMWcPivno= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=E8N4P4lr; arc=fail smtp.client-ip=52.101.85.23 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="E8N4P4lr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RKsWt6w2FSUZWufZj7xUtdjeKKpZQ45eDIgaDMHzc0/IIQJir5lChonwg7/zji2nh932YJr/licN36t0C4tMz8WxiUJ20mA/Zvh8EREMPYLo1qahWd1pTpI1gXUZ+GrLcxHZyF2ddFEGTndi/EAmUR6KdkIoH65TAsVIviYKV8Wcgy0UsDqSTISq5OojxTvOwZA3eELz9JjDSIKA/vLv5SHqd8XLj7/4EU88vJgoFMO18reDZoOzZgOq0nlnuN6PZ+sGtQIy4hpiAMyV6ac9f+oAzSKkSSxpkyoatlUkPVAZdwRoK+4KHKyRr2CbshYT8xUXwNPO7ohldJWlEYH0MA== 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=Tnmm/BRTiGWEHKmEQZ87F1BwRfj8ccS66N40A1jkvCk=; b=fuUmvHZztIovZsqP/8f3nL3hn9jiViYjiOtjNZNfXO+CB5wJCc3bp7I/z8wIj9WpgFQNTN8Bkg4N66F77hC++twHSZH5W8fkVe7pEA/2ywyXBC88uNlmUKl++BtxandMvS4a+2pd53+56arY2hZz2no5+KIeh8KpZaLyt13J05LDulp2AX1kJC6RAx/hX5Zid24bljflf+EC8VBr+ly6z3guBq24eXOFFfTJXB9HDwnK1AqYYa42qe/HejricsaS9RHk6fqPpFtTHLKCyQPU5XSlV5oygGjtpRhmAPcIs9mwyjhMvZE5/DbXRxZ+a4zJBGF3FThOXQgSA3mjuE/Q5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tnmm/BRTiGWEHKmEQZ87F1BwRfj8ccS66N40A1jkvCk=; b=E8N4P4lrGvIvxYFJD+iqR2QDbCpHRYo9QdmvwcWR+deUmOgsrY17tC42MSWbYu9I6TWyVeANqv1r747CQKubywgzZPK+mCmUBKR9Bt9MKUgsMIw8JWFTMXpAXg+p39CFdMgwq8z+ZJsP9aaAdu4rOVslmVtHSv8/yjKS82mPMPc= Received: from CY5PR15CA0219.namprd15.prod.outlook.com (2603:10b6:930:88::18) by BY5PR12MB4036.namprd12.prod.outlook.com (2603:10b6:a03:210::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.11; Sun, 18 Jan 2026 19:28:30 +0000 Received: from CY4PEPF0000FCC2.namprd03.prod.outlook.com (2603:10b6:930:88:cafe::61) by CY5PR15CA0219.outlook.office365.com (2603:10b6:930:88::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9520.11 via Frontend Transport; Sun, 18 Jan 2026 19:28:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000FCC2.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.4 via Frontend Transport; Sun, 18 Jan 2026 19:28:29 +0000 Received: from kaveri.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Sun, 18 Jan 2026 13:28:25 -0600 From: Shivank Garg To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes CC: Zi Yan , Baolin Wang , "Liam R . Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , , , Subject: [PATCH V3 3/5] mm/khugepaged: change collapse_pte_mapped_thp() to return void Date: Sun, 18 Jan 2026 19:22:57 +0000 Message-ID: <20260118192253.9263-10-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118192253.9263-4-shivankg@amd.com> References: <20260118192253.9263-4-shivankg@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC2:EE_|BY5PR12MB4036:EE_ X-MS-Office365-Filtering-Correlation-Id: 209ec9a7-981c-4959-f59c-08de56c7c2b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dMdc3+lKIw3Ru/SlIHGKkJvgGYGzZNp0JX8BW1fZ5PN/Af6q3Q0MvFjcKzlM?= =?us-ascii?Q?5pcD1zgQMZtTw7Iy4K4EkxwFV5AsGFo64K+yOoLRM6RpyMvMZ4eelsQ/CDnB?= =?us-ascii?Q?GOBKQvfx8+osoebJYvdjCgNbu8Y/u7yJBKBaF2N92Gmt/n1UDhU4mG+S8v3C?= =?us-ascii?Q?1xu7QZ5/uA4KDIB790vSv94bHCnmt3oM4GhczfKr8yxv7JA3ii8FnSB4Yv9n?= =?us-ascii?Q?kFZDQwOCzU4TkvbrpNJklhK6YPJ6TYXt0QQ/7SBfvZAy+UBpkrUSp5RDvAf2?= =?us-ascii?Q?W+nnRMy02mAXpksnMuYoGWd8AjYKXgrdPoRbBPc8iMEpjFEhhHZUNABM1JlK?= =?us-ascii?Q?FWoAUxHj/OepWAypy/BfnLL23ZWPEcs7vq1epBoqrGuBbJHR80s1YoWL6BZO?= =?us-ascii?Q?Lew857hhuacUz/dtIFI/95FdE32lez69ZJdgK1pruJVVGvF6EKKvjypLbKuP?= =?us-ascii?Q?0m9EuOuZeob9BulQ/y2ocpPnCw0dKVE/fujXKJan0ZbUYULAC8Co5q6PsMik?= =?us-ascii?Q?x0NZ3zoHzOaffIFwvPDX7TRiNG+8z6G8M6WCDyGzmBC8twB33Y5Tdg7HL3M3?= =?us-ascii?Q?HN24tncHEje8EFSOg8mELhaCGRrACPrP/WfAY7O405v+mnHmzAMdMCfy3pyL?= =?us-ascii?Q?eaMZOdgg8gaODunKmq/MjxnrnZAoYyVHg+lsVNcBYmPd4ogQ6PfR6aUt9k5v?= =?us-ascii?Q?GZ7Q6MCPecJt/AjsO0M3v6gE/y8YTeSbKay/YmBzdAAcywxTKgO2u93DCyPe?= =?us-ascii?Q?eUqxvYhufo47L1cfKHK2TnMR9K8M/13fnBz2wQBzyZg//ce85jNBQYkck1UM?= =?us-ascii?Q?tyQ4RoPTcQ5TEJm5d2tX9i8vsQMefpo+DfA6Vp7v5/E+GzkEvdfCqb/LTYSr?= =?us-ascii?Q?TJNv2rw3YW66/BE+q+8JL5BcAlBHnnwWUbvDZDKIdrAb5X0cKGJD5EAT73Cm?= =?us-ascii?Q?kq3uT/KATDXET20wA1d21fWeyIbh/OTLB0F8cTRZ49E0hBpQNF+PMAQvHPKG?= =?us-ascii?Q?PswcGuWMElySCKVk899LJ8WnM5kyHN7Huvea/CUln0EnfWCPCUQmCP01VMX+?= =?us-ascii?Q?yTIhbz5LBr7qGUJx7BE8DRwAjzR6UUtcrX7l5zQukrQ/n82vkgXnSi+cbWVT?= =?us-ascii?Q?SR7W5ajwJzMRv6/Kq+qEPMTSB3VxUotp+vses7rEFqUpHWvaCqcZgte7PbrD?= =?us-ascii?Q?UtYI+nvZ95Tpx/hTEwbj9BYKnGrsaI5cWZqov8A1VWF0WFwgFRSmALEFHFJX?= =?us-ascii?Q?HYuQYfUReEeeV4FK8Fj0FUb3j3Bye9+aBOv32ojk5n8EhpYyMIoAmT7d9qLx?= =?us-ascii?Q?1ua1c43x1j57GupX5wtsFKfxfNoPR5v8D6H4j/Wof3Zeq2S9+1Z3rN2Yxugg?= =?us-ascii?Q?YGWJVoCUtNFYmY+eSFtDkzHbaazOcLVaxBHyqW2B5knKu8xzC9jJQ2FBEWmO?= =?us-ascii?Q?+p7HaCQasSoYxKyD18zmP9jFyGMUr4WpPmESAHu9tekoyPz7UHbDwzZ1Kn/I?= =?us-ascii?Q?1JdLZr9aF3p8HdxwIXAFjzwrRh8SnPzwDMRM4j13r2a5TYDb7Q6JqUpCqN7L?= =?us-ascii?Q?IhA0Dfe1QjKVhccbPyBdapFEcz7WMpU2eGFcLH4kiqVXuZkAX1x/s7wXVrs+?= =?us-ascii?Q?OSp5+iDwyop8tsMfqPFqwgUWX2t2DuwOQYlxDJCz+juv?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(7416014)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2026 19:28:29.7252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 209ec9a7-981c-4959-f59c-08de56c7c2b1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC2.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4036 Content-Type: text/plain; charset="utf-8" The only external caller of collapse_pte_mapped_thp() is uprobe, which ignores the return value. Change the external API to return void to simplify the interface. Introduce try_collapse_pte_mapped_thp() for internal use that preserves the return value. This prepares for future patch that will convert the return type to use enum scan_result. Suggested-by: David Hildenbrand (Red Hat) Acked-by: Lance Yang Acked-by: David Hildenbrand (Red Hat) Reviewed-by: Zi Yan Signed-off-by: Shivank Garg Reviewed-by: Nico Pache Tested-by: Nico Pache --- include/linux/khugepaged.h | 9 ++++----- mm/khugepaged.c | 40 ++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h index eb1946a70cff..d7a9053ff4fe 100644 --- a/include/linux/khugepaged.h +++ b/include/linux/khugepaged.h @@ -17,8 +17,8 @@ extern void khugepaged_enter_vma(struct vm_area_struct *v= ma, vm_flags_t vm_flags); extern void khugepaged_min_free_kbytes_update(void); extern bool current_is_khugepaged(void); -extern int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long add= r, - bool install_pmd); +void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, + bool install_pmd); =20 static inline void khugepaged_fork(struct mm_struct *mm, struct mm_struct = *oldmm) { @@ -42,10 +42,9 @@ static inline void khugepaged_enter_vma(struct vm_area_s= truct *vma, vm_flags_t vm_flags) { } -static inline int collapse_pte_mapped_thp(struct mm_struct *mm, - unsigned long addr, bool install_pmd) +static inline void collapse_pte_mapped_thp(struct mm_struct *mm, + unsigned long addr, bool install_pmd) { - return 0; } =20 static inline void khugepaged_min_free_kbytes_update(void) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 93ce39915f4a..17f3f0043368 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1477,20 +1477,8 @@ static int set_huge_pmd(struct vm_area_struct *vma, = unsigned long addr, return SCAN_SUCCEED; } =20 -/** - * collapse_pte_mapped_thp - Try to collapse a pte-mapped THP for mm at - * address haddr. - * - * @mm: process address space where collapse happens - * @addr: THP collapse address - * @install_pmd: If a huge PMD should be installed - * - * This function checks whether all the PTEs in the PMD are pointing to the - * right THP. If so, retract the page table so the THP can refault in with - * as pmd-mapped. Possibly install a huge PMD mapping the THP. - */ -int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, - bool install_pmd) +static int try_collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long= addr, + bool install_pmd) { int nr_mapped_ptes =3D 0, result =3D SCAN_FAIL; unsigned int nr_batch_ptes; @@ -1711,6 +1699,24 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, un= signed long addr, return result; } =20 +/** + * collapse_pte_mapped_thp - Try to collapse a pte-mapped THP for mm at + * address haddr. + * + * @mm: process address space where collapse happens + * @addr: THP collapse address + * @install_pmd: If a huge PMD should be installed + * + * This function checks whether all the PTEs in the PMD are pointing to the + * right THP. If so, retract the page table so the THP can refault in with + * as pmd-mapped. Possibly install a huge PMD mapping the THP. + */ +void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, + bool install_pmd) +{ + try_collapse_pte_mapped_thp(mm, addr, install_pmd); +} + /* Can we retract page tables for this file-backed VMA? */ static bool file_backed_vma_is_retractable(struct vm_area_struct *vma) { @@ -2227,7 +2233,7 @@ static int collapse_file(struct mm_struct *mm, unsign= ed long addr, =20 /* * Remove pte page tables, so we can re-fault the page as huge. - * If MADV_COLLAPSE, adjust result to call collapse_pte_mapped_thp(). + * If MADV_COLLAPSE, adjust result to call try_collapse_pte_mapped_thp(). */ retract_page_tables(mapping, start); if (cc && !cc->is_khugepaged) @@ -2480,7 +2486,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, int *result, mmap_read_lock(mm); if (hpage_collapse_test_exit_or_disable(mm)) goto breakouterloop; - *result =3D collapse_pte_mapped_thp(mm, + *result =3D try_collapse_pte_mapped_thp(mm, khugepaged_scan.address, false); if (*result =3D=3D SCAN_PMD_MAPPED) *result =3D SCAN_SUCCEED; @@ -2845,7 +2851,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, case SCAN_PTE_MAPPED_HUGEPAGE: BUG_ON(mmap_locked); mmap_read_lock(mm); - result =3D collapse_pte_mapped_thp(mm, addr, true); + result =3D try_collapse_pte_mapped_thp(mm, addr, true); mmap_read_unlock(mm); goto handle_result; /* Whitelisted set of results where continuing OK */ --=20 2.43.0 From nobody Sat Feb 7 21:15:41 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011018.outbound.protection.outlook.com [52.101.62.18]) (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 BC484156237 for ; Sun, 18 Jan 2026 19:31:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764664; cv=fail; b=KXXWh8Al82ciEuiYSd2pUnL4Gv23TKSYXSmckF9e7KiWqmPsCi2/yQB1KESRGxU3Ttn1YmOazchZZ1aYOrReHBh2KNJS0fDL7G5ai5z+FQCifVCBMrKxhEyFvUHlAyU5SJrMVDzcPSGkQlCaKAPZF9UWBL8Dr9VOsA1GmQC5Bio= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764664; c=relaxed/simple; bh=Fsoxw6JWAjJma5wdJ1OROMMXF1YhchRZpP1bNK3jzAo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u8qczSCJfyxFgwPLnuu+6IDBNPoPRsed4Ka6a3HKXgCFepi9pODTIWkW1mClXfhWRwdr8K+r1yF/6j2F53e+18xcA0CM+xUleDHzCk3Os0r/WTz0/ME69LMbTp1fXbr3UMYG0mpS4UoQ3bp16pqSIGOKkN3+Sdg6aybAvQaicpU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=a/Y33uXM; arc=fail smtp.client-ip=52.101.62.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="a/Y33uXM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=j97Tx63N5OWaUiSM/eGqKIWxAejwrdIw7mQ6/8JqEW0d2lUJ7u9grLjPg/ojgcM5ilIKSV+eAyMCDxM4bpR6RvHgFFNg6B1umUaZDFYopXw7HwlmA5V3g1skkEBCxOrjpQTMB8nwmXLUxFDl3JHHfntEA/16OHqqkY8kP8T7UkpvquQXHB7Ohc0Z05PEEbTeWodSIn/oqusgZ2diWtdnG+3dsAnUGOenylUwh9x9qNVzFyXwqqojb3LjQvQm1cGtGdEKHwvjEaLXltmuj5srQN0N3zf77otQl4nYi2Ssn7AEKERMNFq3bNrL+HT/9zu/j/EinlaRXtyys3IwkS2FCg== 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=75vKb2HAnO05miIZrAZYWDTsuKH2uNpe30vJLBcwzDw=; b=FQmNx1T9Eruo+Cvi5b8rY92AcNBXUUQRW0eL0cIxJlBLGrsE68W3Jc/nywo+kkk3qADtAcm6NSJJSzJocawMXho6JXvPbIfLLe1/gGwmyZnUA7b9lHexG7LXV/sLtW6s60uKFjbUZAG/M3bn2VeB8PWXWSDmFIxAMeaxrgceSMz9FNSD+gTzvr2B+/GsmexkzplzajLGVc+j9J6CdlWLkw4TgzJWjJcfqTWJL1VjzHWl93mmMKyOX5NuNa0Ie+PsT33X06Yvb8m79GB6tm0DMluYNB9u9qhsg2qyFw+SFD0mjaS5kwcTIQyhN528Pbo5PyrZGHpof1B+yRKlgnek+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=75vKb2HAnO05miIZrAZYWDTsuKH2uNpe30vJLBcwzDw=; b=a/Y33uXMdQX7X6fMA0ukYFZjPXkG5CXmKHumJYGeEc6bQWCcDveQcCAy9CVesIuluU1LKnzKZE0zQaFJ6uC+74ChDXM9ArYa9c0uEmBAFAdDuaGOKdiFDNEbRvCdHs0pPYBQTNSG16T9301LIlLKwnEyS5PCHB9RhiVqZiT8V6I= Received: from PH7P220CA0036.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::35) by MN2PR12MB4125.namprd12.prod.outlook.com (2603:10b6:208:1d9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.4; Sun, 18 Jan 2026 19:30:58 +0000 Received: from CY4PEPF0000FCBE.namprd03.prod.outlook.com (2603:10b6:510:32b:cafe::1c) by PH7P220CA0036.outlook.office365.com (2603:10b6:510:32b::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9520.11 via Frontend Transport; Sun, 18 Jan 2026 19:30:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000FCBE.mail.protection.outlook.com (10.167.242.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.4 via Frontend Transport; Sun, 18 Jan 2026 19:30:57 +0000 Received: from kaveri.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Sun, 18 Jan 2026 13:30:52 -0600 From: Shivank Garg To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes CC: Zi Yan , Baolin Wang , "Liam R . Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , , , Subject: [PATCH V3 4/5] mm/khugepaged: use enum scan_result for result variables and return types Date: Sun, 18 Jan 2026 19:22:59 +0000 Message-ID: <20260118192253.9263-12-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118192253.9263-4-shivankg@amd.com> References: <20260118192253.9263-4-shivankg@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCBE:EE_|MN2PR12MB4125:EE_ X-MS-Office365-Filtering-Correlation-Id: dcd91452-72ab-472d-422d-08de56c81a94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|7416014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VNa5zFidoCfuezz6QWwjYEo0nE/T3VpPzZQCdBz78qwrDBsy+MycSmFxBiaU?= =?us-ascii?Q?Q92sxQBCOkxHz77V8PhVCe+KbWRwO4qF1hKlG+pGLrrZEM0npviAEerNZUcs?= =?us-ascii?Q?skysF0T94rF+P62FJy1JRd1h5St3o3y/1sLh5Nv0Fv8RnUpxnDoVdcWAVhms?= =?us-ascii?Q?c+Fq8FNhpJ87Yq2iyR7zB8zHfnH/YPVNjEVukohMAEmni2n1Iq/4oH4l5O+s?= =?us-ascii?Q?uSUgPGyojPnDDh4g8RM5zPlQFHoN7WN1UbNDZjX0dGQW411RQw4wnhOZBoRZ?= =?us-ascii?Q?EILmz3DbHjRbA0u/hUlDuSDjFvuYNmbEtf81tZMr5a7AKPUH2A1/mQOjY9aT?= =?us-ascii?Q?3v8YlyDfLsuZ7mxxwQXeQuPehkEsECRiOauHWNYx67ER8pfIoXNS7yDIaDYc?= =?us-ascii?Q?1RdTugGcp56Fvwn8yxeMAQRRHnx+Gl6tdUoMLb4pdxWDuVreiW1FFL4fCYem?= =?us-ascii?Q?p5Xj8jSurPlnAw82XO05wXit69GDJikh2Dnp5lK1YsuhC4ZVK/SSV44GpIEF?= =?us-ascii?Q?u88rJmWt0ZrIRXAev1YRl5Q4gJP2UyqTRxCvcxjKeag14rPlFAlIMS/cqFCC?= =?us-ascii?Q?8r9QD/vzhAz1GevNhLF9x2oc97OdadW8gCd++obsKC3LLiSZIIX4BmEcamjg?= =?us-ascii?Q?KajfbBQ3IbVAIQql7O1fq0z2uYaUokntIDXtvEBXw+vuMS581kKZODfwKReM?= =?us-ascii?Q?7k2WrXS5s/+NUULSV9DcnEHOja2Fuw+3T58MpXvUzpzzWNqTg79NTolH8ju5?= =?us-ascii?Q?qwWkP9CeB/wW2v2RG+nhAxMl+cIe6mS1wyGMjDlkulDzs+Tv8lMIW32eLWjy?= =?us-ascii?Q?1TP5mZb+oR+wXmd+UP8KHFzqMhjVAGOWgIYrImq0k87/5Ft3y5FXPqWnrBbs?= =?us-ascii?Q?C+m2M1jiiVA4GiBopsHBPqU40vCh0cSBbCCGBiVQ1B0xbX+sIRGXnBbBUqP9?= =?us-ascii?Q?daezjY1nlKqUB7kcRlD59Z4FNZw3YQNNd510PPP1+yE1yrSSfXluEbYsIqTm?= =?us-ascii?Q?JNPQAes9A70KC4Mj++kqa9gmIdLLXeS08Q3uOaIqPV2GqzPcQUVNeY6PmvsS?= =?us-ascii?Q?4xb/aKDs5R5+i0UR9OIa6Jc3qNRLaBjUwB3Y0uucnGg2ueoZJLb8RvjRcbAD?= =?us-ascii?Q?mSRrFbtBjyyAgiutZTi6nfqvcfujyANGP+a6ShygvrffEtSykm8yKwz8IUZo?= =?us-ascii?Q?a/zzv27bckAofoT0uqD1xzvRUz/k7fxV1Cm/4LjimpwEMETEzKd8h4QbpJoZ?= =?us-ascii?Q?ntU2rv6UBo2Wu0wUs4qEieJnr9V8ciA/3qodC1ZL658QcuKd05Yu82sbWuRk?= =?us-ascii?Q?2xxZIh3ZJ68ivLpu/uPVLCfm3TFjXklLa2/OlwnDsu9Lye5Ylp+MJCX+hp1b?= =?us-ascii?Q?zTlsY/sIm0+gQF0uW4umhyddjSSHqFBg2oeY7TnkmrtiHoyxam2us8rzYdX3?= =?us-ascii?Q?mnTiWi19ApGdeIXAgGa1T/OnSK1zZ2pJwZRCJpPUSQXFm/hBLgkgeVrurxTL?= =?us-ascii?Q?kQzN+suKHOIPwfup4dhJfws3zz3aHScHMFbOn7bxSPaEcb0Tdj6ZJp6K5AwF?= =?us-ascii?Q?26NaOefRJEV0IWOwsFg5XVZoQLrvr6MxY5JVAyImaDkoGNBMwYhSfG5S+wmM?= =?us-ascii?Q?Wvf3miBridpmZ/bTWSR3WlLQQi20ACEuhEtSTSCRCLm9?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(7416014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2026 19:30:57.1702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dcd91452-72ab-472d-422d-08de56c81a94 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCBE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4125 Content-Type: text/plain; charset="utf-8" Convert result variables and return types from int to enum scan_result throughout khugepaged code. This improves type safety and code clarity by making the intent explicit. No functional change. Reviewed-by: Zi Yan Signed-off-by: Shivank Garg Acked-by: David Hildenbrand (Red Hat) Reviewed-by: Dev Jain Reviewed-by: Nico Pache Tested-by: Nico Pache --- mm/khugepaged.c | 99 +++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 17f3f0043368..1667abae6d8d 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -537,17 +537,16 @@ static void release_pte_pages(pte_t *pte, pte_t *_pte, } } =20 -static int __collapse_huge_page_isolate(struct vm_area_struct *vma, - unsigned long start_addr, - pte_t *pte, - struct collapse_control *cc, - struct list_head *compound_pagelist) +static enum scan_result __collapse_huge_page_isolate(struct vm_area_struct= *vma, + unsigned long start_addr, pte_t *pte, struct collapse_control *cc, + struct list_head *compound_pagelist) { struct page *page =3D NULL; struct folio *folio =3D NULL; unsigned long addr =3D start_addr; pte_t *_pte; - int none_or_zero =3D 0, shared =3D 0, result =3D SCAN_FAIL, referenced = =3D 0; + int none_or_zero =3D 0, shared =3D 0, referenced =3D 0; + enum scan_result result =3D SCAN_FAIL; =20 for (_pte =3D pte; _pte < pte + HPAGE_PMD_NR; _pte++, addr +=3D PAGE_SIZE) { @@ -780,13 +779,13 @@ static void __collapse_huge_page_copy_failed(pte_t *p= te, * @ptl: lock on raw pages' PTEs * @compound_pagelist: list that stores compound pages */ -static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, +static enum scan_result __collapse_huge_page_copy(pte_t *pte, struct folio= *folio, pmd_t *pmd, pmd_t orig_pmd, struct vm_area_struct *vma, unsigned long address, spinlock_t *ptl, struct list_head *compound_pagelist) { unsigned int i; - int result =3D SCAN_SUCCEED; + enum scan_result result =3D SCAN_SUCCEED; =20 /* * Copying pages' contents is subject to memory poison at any iteration. @@ -898,10 +897,8 @@ static int hpage_collapse_find_target_node(struct coll= apse_control *cc) * Returns enum scan_result value. */ =20 -static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long add= ress, - bool expect_anon, - struct vm_area_struct **vmap, - struct collapse_control *cc) +static enum scan_result hugepage_vma_revalidate(struct mm_struct *mm, unsi= gned long address, + bool expect_anon, struct vm_area_struct **vmap, struct collapse_control = *cc) { struct vm_area_struct *vma; enum tva_type type =3D cc->is_khugepaged ? TVA_KHUGEPAGED : @@ -930,7 +927,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm= , unsigned long address, return SCAN_SUCCEED; } =20 -static inline int check_pmd_state(pmd_t *pmd) +static inline enum scan_result check_pmd_state(pmd_t *pmd) { pmd_t pmde =3D pmdp_get_lockless(pmd); =20 @@ -953,9 +950,8 @@ static inline int check_pmd_state(pmd_t *pmd) return SCAN_SUCCEED; } =20 -static int find_pmd_or_thp_or_none(struct mm_struct *mm, - unsigned long address, - pmd_t **pmd) +static enum scan_result find_pmd_or_thp_or_none(struct mm_struct *mm, + unsigned long address, pmd_t **pmd) { *pmd =3D mm_find_pmd(mm, address); if (!*pmd) @@ -964,12 +960,11 @@ static int find_pmd_or_thp_or_none(struct mm_struct *= mm, return check_pmd_state(*pmd); } =20 -static int check_pmd_still_valid(struct mm_struct *mm, - unsigned long address, - pmd_t *pmd) +static enum scan_result check_pmd_still_valid(struct mm_struct *mm, + unsigned long address, pmd_t *pmd) { pmd_t *new_pmd; - int result =3D find_pmd_or_thp_or_none(mm, address, &new_pmd); + enum scan_result result =3D find_pmd_or_thp_or_none(mm, address, &new_pmd= ); =20 if (result !=3D SCAN_SUCCEED) return result; @@ -985,15 +980,14 @@ static int check_pmd_still_valid(struct mm_struct *mm, * Called and returns without pte mapped or spinlocks held. * Returns result: if not SCAN_SUCCEED, mmap_lock has been released. */ -static int __collapse_huge_page_swapin(struct mm_struct *mm, - struct vm_area_struct *vma, - unsigned long start_addr, pmd_t *pmd, - int referenced) +static enum scan_result __collapse_huge_page_swapin(struct mm_struct *mm, + struct vm_area_struct *vma, unsigned long start_addr, pmd_t *pmd, + int referenced) { int swapped_in =3D 0; vm_fault_t ret =3D 0; unsigned long addr, end =3D start_addr + (HPAGE_PMD_NR * PAGE_SIZE); - int result; + enum scan_result result; pte_t *pte =3D NULL; spinlock_t *ptl; =20 @@ -1062,8 +1056,8 @@ static int __collapse_huge_page_swapin(struct mm_stru= ct *mm, return result; } =20 -static int alloc_charge_folio(struct folio **foliop, struct mm_struct *mm, - struct collapse_control *cc) +static enum scan_result alloc_charge_folio(struct folio **foliop, struct m= m_struct *mm, + struct collapse_control *cc) { gfp_t gfp =3D (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : GFP_TRANSHUGE); @@ -1090,9 +1084,8 @@ static int alloc_charge_folio(struct folio **foliop, = struct mm_struct *mm, return SCAN_SUCCEED; } =20 -static int collapse_huge_page(struct mm_struct *mm, unsigned long address, - int referenced, int unmapped, - struct collapse_control *cc) +static enum scan_result collapse_huge_page(struct mm_struct *mm, unsigned = long address, + int referenced, int unmapped, struct collapse_control *cc) { LIST_HEAD(compound_pagelist); pmd_t *pmd, _pmd; @@ -1100,7 +1093,7 @@ static int collapse_huge_page(struct mm_struct *mm, u= nsigned long address, pgtable_t pgtable; struct folio *folio; spinlock_t *pmd_ptl, *pte_ptl; - int result =3D SCAN_FAIL; + enum scan_result result =3D SCAN_FAIL; struct vm_area_struct *vma; struct mmu_notifier_range range; =20 @@ -1246,15 +1239,14 @@ static int collapse_huge_page(struct mm_struct *mm,= unsigned long address, return result; } =20 -static int hpage_collapse_scan_pmd(struct mm_struct *mm, - struct vm_area_struct *vma, - unsigned long start_addr, bool *mmap_locked, - struct collapse_control *cc) +static enum scan_result hpage_collapse_scan_pmd(struct mm_struct *mm, + struct vm_area_struct *vma, unsigned long start_addr, bool *mmap_locked, + struct collapse_control *cc) { pmd_t *pmd; pte_t *pte, *_pte; - int result =3D SCAN_FAIL, referenced =3D 0; - int none_or_zero =3D 0, shared =3D 0; + int none_or_zero =3D 0, shared =3D 0, referenced =3D 0; + enum scan_result result =3D SCAN_FAIL; struct page *page =3D NULL; struct folio *folio =3D NULL; unsigned long addr; @@ -1441,8 +1433,8 @@ static void collect_mm_slot(struct mm_slot *slot) } =20 /* folio must be locked, and mmap_lock must be held */ -static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, - pmd_t *pmdp, struct folio *folio, struct page *page) +static enum scan_result set_huge_pmd(struct vm_area_struct *vma, unsigned = long addr, + pmd_t *pmdp, struct folio *folio, struct page *page) { struct mm_struct *mm =3D vma->vm_mm; struct vm_fault vmf =3D { @@ -1477,10 +1469,11 @@ static int set_huge_pmd(struct vm_area_struct *vma,= unsigned long addr, return SCAN_SUCCEED; } =20 -static int try_collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long= addr, +static enum scan_result try_collapse_pte_mapped_thp(struct mm_struct *mm, = unsigned long addr, bool install_pmd) { - int nr_mapped_ptes =3D 0, result =3D SCAN_FAIL; + enum scan_result result =3D SCAN_FAIL; + int nr_mapped_ptes =3D 0; unsigned int nr_batch_ptes; struct mmu_notifier_range range; bool notified =3D false; @@ -1862,9 +1855,8 @@ static void retract_page_tables(struct address_space = *mapping, pgoff_t pgoff) * + unlock old pages * + unlock and free huge page; */ -static int collapse_file(struct mm_struct *mm, unsigned long addr, - struct file *file, pgoff_t start, - struct collapse_control *cc) +static enum scan_result collapse_file(struct mm_struct *mm, unsigned long = addr, + struct file *file, pgoff_t start, struct collapse_control *cc) { struct address_space *mapping =3D file->f_mapping; struct page *dst; @@ -1872,7 +1864,8 @@ static int collapse_file(struct mm_struct *mm, unsign= ed long addr, pgoff_t index =3D 0, end =3D start + HPAGE_PMD_NR; LIST_HEAD(pagelist); XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER); - int nr_none =3D 0, result =3D SCAN_SUCCEED; + enum scan_result result =3D SCAN_SUCCEED; + int nr_none =3D 0; bool is_shmem =3D shmem_file(file); =20 VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem); @@ -2293,16 +2286,15 @@ static int collapse_file(struct mm_struct *mm, unsi= gned long addr, return result; } =20 -static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long ad= dr, - struct file *file, pgoff_t start, - struct collapse_control *cc) +static enum scan_result hpage_collapse_scan_file(struct mm_struct *mm, uns= igned long addr, + struct file *file, pgoff_t start, struct collapse_control *cc) { struct folio *folio =3D NULL; struct address_space *mapping =3D file->f_mapping; XA_STATE(xas, &mapping->i_pages, start); int present, swap; int node =3D NUMA_NO_NODE; - int result =3D SCAN_SUCCEED; + enum scan_result result =3D SCAN_SUCCEED; =20 present =3D 0; swap =3D 0; @@ -2400,7 +2392,7 @@ static int hpage_collapse_scan_file(struct mm_struct = *mm, unsigned long addr, return result; } =20 -static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *resul= t, +static unsigned int khugepaged_scan_mm_slot(unsigned int pages, enum scan_= result *result, struct collapse_control *cc) __releases(&khugepaged_mm_lock) __acquires(&khugepaged_mm_lock) @@ -2562,7 +2554,7 @@ static void khugepaged_do_scan(struct collapse_contro= l *cc) unsigned int progress =3D 0, pass_through_head =3D 0; unsigned int pages =3D READ_ONCE(khugepaged_pages_to_scan); bool wait =3D true; - int result =3D SCAN_SUCCEED; + enum scan_result result =3D SCAN_SUCCEED; =20 lru_add_drain_all(); =20 @@ -2775,7 +2767,8 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, struct collapse_control *cc; struct mm_struct *mm =3D vma->vm_mm; unsigned long hstart, hend, addr; - int thps =3D 0, last_fail =3D SCAN_FAIL; + enum scan_result last_fail =3D SCAN_FAIL; + int thps =3D 0; bool mmap_locked =3D true; =20 BUG_ON(vma->vm_start > start); @@ -2796,7 +2789,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, hend =3D end & HPAGE_PMD_MASK; =20 for (addr =3D hstart; addr < hend; addr +=3D HPAGE_PMD_SIZE) { - int result =3D SCAN_FAIL; + enum scan_result result =3D SCAN_FAIL; bool triggered_wb =3D false; =20 retry: --=20 2.43.0 From nobody Sat Feb 7 21:15:41 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013060.outbound.protection.outlook.com [40.93.201.60]) (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 D387E381AF for ; Sun, 18 Jan 2026 19:31:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764678; cv=fail; b=BTTVbUlNdv6WBOEEPQDupab+Sgr6VkuHZCCCOG+tUHgZsZWsMLJJ9rSvvwCISkurKxRZnyx/7au3viiMP6oRVTtIu1NDA1paoDq9RapXHdNqB67sfYzEsh7cxHkKN2dYijqjyQMmeGsSuMIHLFLYskwy7qQIaQLbiLh207ghL0Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768764678; c=relaxed/simple; bh=U8dC2C8d8inAO33QTN7lx9lTSzZoAyzMfU3dEWmbKh0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Oyk1uwM+exP0T2duouYEJvRush8d0jXh6hqFogV8OE6EDAktBy/RnOdCKjIzHtsqdA//Fzv9bGmQlZ7uiX/vtAenD60IlxazNhYGR1bAb0roDjzT2bYtrrFangmb0B3Wtuh6wodBnnsdqLIthZh93SUwf+aqh89WcgGD7ZwW89Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=DAq2ZTvy; arc=fail smtp.client-ip=40.93.201.60 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="DAq2ZTvy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cZ/11MQ70d1udlqaUkueGadPNKVapo3RrRu1xm493PNluOi1ia8vNYU9fe6Pe9lGDJb702Id/S7OpjR5DYvi4bOwskfTnrfWTsaG7zGUTXKBbnMrKSbZEu7r01oDQAU9Ch6c+cgIeJyMxpwDuZ0Tq3z9XHfpCdKJI4xI2l4SVWjOcnSpCUBvrRGnGtio6lzAK/pCabjlJbuGos3RHxxsBr++snWv93EDJVWYfiYgG9p4Udar/WXODm6RSZ7snoEfmbHoWTTfSNT2Itk99o7cSURjvgflf/K9XFBx056Xfvl+blTQuis/xgAXrS+kaoE9Y7YECNSFXjpHmGW1v+z9IQ== 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=bhKndgB+2YCEncz/d989f3/rBWwS27yqGOzKom4Suj0=; b=CESFSdJA8FSOaQR/TlO2lGFqDC0GgprT8zpwgWaENybzCVcXMO4xFAvnatgryBp0xt8aP9/dCBq7HoSdAOkNdJN+wR0Ob1YivEVQPc3AgIuemrKoiYxnf91KJu0byDTR2NMasyBiQlJfzOChQcs6KRm3giF7w0KYpYBXMcxuulbgvCZtn5hLh5mnqw5ZfJFnfaa/cMTUUaFM/CjsWYNjwHQwvhAQeMJePDnga3uHlnYeRYkV2gyDJYmd2hCSXZSOjOrjRBq5MmfjtmWgaWH2t8rK+v96Akxk70L2ajrBJ7alMP0aAEJpuyIRH6Q5bSPUN/hlR62v/7NY/TCpzLrDSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bhKndgB+2YCEncz/d989f3/rBWwS27yqGOzKom4Suj0=; b=DAq2ZTvyh4Kln8T1PfAXtrLjFogP910cAvrZykrjxMJ4bB9Y4KwA2/06e0rgZ4J4OY+gRmQpbI52M/c9y0PugnXxL+z09tR/ociAw+AZCCdcYjl8CWQ/5SmZbcIIzolW5b+eJusxl/exBODmGwAIPwmBjpN4OQgo3C3DV+255ik= Received: from DS7PR03CA0235.namprd03.prod.outlook.com (2603:10b6:5:3ba::30) by CH3PR12MB8904.namprd12.prod.outlook.com (2603:10b6:610:167::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.5; Sun, 18 Jan 2026 19:31:12 +0000 Received: from CY4PEPF0000FCC1.namprd03.prod.outlook.com (2603:10b6:5:3ba:cafe::ce) by DS7PR03CA0235.outlook.office365.com (2603:10b6:5:3ba::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9520.11 via Frontend Transport; Sun, 18 Jan 2026 19:30:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000FCC1.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.4 via Frontend Transport; Sun, 18 Jan 2026 19:31:11 +0000 Received: from kaveri.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Sun, 18 Jan 2026 13:31:07 -0600 From: Shivank Garg To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes CC: Zi Yan , Baolin Wang , "Liam R . Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , , , , Wei Yang , Anshuman Khandual Subject: [PATCH V3 5/5] mm/khugepaged: make khugepaged_collapse_control static Date: Sun, 18 Jan 2026 19:23:01 +0000 Message-ID: <20260118192253.9263-14-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118192253.9263-4-shivankg@amd.com> References: <20260118192253.9263-4-shivankg@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC1:EE_|CH3PR12MB8904:EE_ X-MS-Office365-Filtering-Correlation-Id: 63fd5d04-11db-45b3-4b07-08de56c82357 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?k8T9gjlXjXTQIyCbp7/JonWnq+NiKY0IqBoqE41uq7J/sOho0rANycyJj7zo?= =?us-ascii?Q?GG7DjzTILM+BN32qLOxaGb+y+UEfCdZEVz4xzTAZpagyoF0SAChZxDpfru+5?= =?us-ascii?Q?2vsvz2wmdVxPEsadFNFKfyfgomaygrMZbeV44z+HZJvcf0Nf7eXbZVQbRoHj?= =?us-ascii?Q?0CAzkf+wLwo2oHWGQyxwtK28agL27jQIMHtaaFcchWcEjAH+0Ei5A2qnXRtO?= =?us-ascii?Q?BJKiMSZZlQ8iSsZNGQeVmzKMSFbeTuIKae8DYw54RFEerSkkYgWy9xXxyYni?= =?us-ascii?Q?3ZcMoF9lqWs2s8Nxu47KlZ4Pr7LSwDIpCpFZoNBh++R7xcZ8RX4UW1w7u1Uc?= =?us-ascii?Q?e1jgCaPWVW59ge++DD3GetD+F9kbkvom67myQ+ZqkCxDJtp3BcT/zPAQWYps?= =?us-ascii?Q?HdX0zrmmi3vsynVbxpz/L4Ndg3OLDEqSdzcXbfZ3X1huvYSqYDVpwhPz+EIB?= =?us-ascii?Q?ZM2HVU1UIbtl6aoHyxjPrrrnzZ6YmyucEO3Ia8+Xx7AODs1IDiB1X/ru7I9/?= =?us-ascii?Q?cFHSl3jpgdA2capR3VVEpG40zWv83Ea7GqmObeLKiUePOisdN1j4a2h5LZNo?= =?us-ascii?Q?4EOJUfgBGdvNpnNj0fmNGxX9yJn8tzwdfaKGVlOzWGJx2bqbIq3s0iojdAlB?= =?us-ascii?Q?U7v4FWSZBs8rVGDSS5g1+3Prl6JmazPR3eCT1YII6iTD5d3OlC6+nHHQ/Feg?= =?us-ascii?Q?uo6ENmA5+xg4ZXtnJdBV2FZyUj9RBKEJsKxi4OI6iJgeLPX7y0Tl5TfvDQ1b?= =?us-ascii?Q?WgGgCdHdj99ZdScPrTcNScFkwdk9t6YuLmjrYFA2wNPtRkifqhDcHDHvFnYs?= =?us-ascii?Q?amJQ2B6bOExbr93Oa7ho2OCSqeGvg4tp5IEWkwY5YkoS0ZuBTtIMC48zY3rh?= =?us-ascii?Q?6in5ovM4gNRWx+imJwhFoSme7JiTGBaCMDfEcymbpVV9MMZo1Nmxbb4RB4xo?= =?us-ascii?Q?EtwYETgGJH8yNtXh+9+C/tvdPUoYuYn7g1ZVBXCCxyJRnT+tlcFOPJLKkRjz?= =?us-ascii?Q?a3yP65L6+GFss+lpNU1fteSdsFTFLZ+QJcI3IkIkipKZBEwEnaLt57fAB0vK?= =?us-ascii?Q?el4s6D6TtgrQesWzbQZr/WDS//yuCtybRnT7I+DHKsaDLYF2L46hkzh2hez3?= =?us-ascii?Q?27YMEAYzAA9x1cj73V+gZwPu+J5516u0V74EcFscJZHsGE/AB0WWQUMTjr1j?= =?us-ascii?Q?RUhKD7ZL2R0zOt0d19mv5jQKWpL+aoYaHATFyQW7A1kK/ZK+OAkc2VsJ9e+8?= =?us-ascii?Q?zbdyyPR0tLGGV1Gr3j21xv8ls0lA9L8P5U0q3/n2RvOGzz1LpQgMG2t9b8XV?= =?us-ascii?Q?s8Fl140bDZxuLnqRwcYhgKkR5gOyaUULeIJ/nEiFpH8Hly5XptgsmmZSMT46?= =?us-ascii?Q?TD4B98534M0srrf94YiU2abBfzC5iJDBP4DPj4JUeggEpaowvcearv+TODTU?= =?us-ascii?Q?hGF3kKwvmC7/gO7+b6Fo3bZfJoaHktX27WqZZmvec+uqdZy1WFILffjV9ftk?= =?us-ascii?Q?dag2/OgYRfZg29Idq2LrTkyat3yiZm4OHYjX+9TlPHbJfoRuzTQv3HkDTcXA?= =?us-ascii?Q?n4a1pVxMskHgZ784AXci29TmSs/ZIVa1ZkfX08CRySoAXcOtBwL00IY7ayFa?= =?us-ascii?Q?q1DLkGGyxAX8vaqwffwSVWWg7PrmZbOhMUdOrahiqxNGZ2xhvJk2qmYX2K7b?= =?us-ascii?Q?rnNTug=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2026 19:31:11.8663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 63fd5d04-11db-45b3-4b07-08de56c82357 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8904 Content-Type: text/plain; charset="utf-8" The global variable 'khugepaged_collapse_control' is not used outside of mm/khugepaged.c. Make it static to limit its scope. Reviewed-by: Wei Yang Reviewed-by: Zi Yan Acked-by: David Hildenbrand (Red Hat) Reviewed-by: Anshuman Khandual Signed-off-by: Shivank Garg Reviewed-by: Dev Jain Suggested-by: Dev Jain --- mm/khugepaged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 1667abae6d8d..fba6aea5bea6 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -827,7 +827,7 @@ static void khugepaged_alloc_sleep(void) remove_wait_queue(&khugepaged_wait, &wait); } =20 -struct collapse_control khugepaged_collapse_control =3D { +static struct collapse_control khugepaged_collapse_control =3D { .is_khugepaged =3D true, }; =20 --=20 2.43.0