From nobody Sun Feb 8 04:33:48 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010048.outbound.protection.outlook.com [52.101.193.48]) (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 ED1AF42049 for ; Wed, 24 Dec 2025 11:17:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575063; cv=fail; b=CsqZQPujGjFPq0XHzQqqYQPQnMbdz1idgGFDdyiNs/+xW780AVjNdnWZcJsOM2/qrjGo+sl2A2Rq2LheUpDvv9qawnyeVYnKU9qMpbLwOF0qLpGFKtst6WC+8MMHAcWquUs8pR7M6l9LQFGJt1A5/Cohr/KESff6iv6+h4qW4So= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575063; c=relaxed/simple; bh=oyRyIoOgchVPiNY4kBrGxJ3PLJ8bBD+cvqyvfQ2PMRk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uqLoGB0NNzVJ1Kq2/jMqc0j+eLW+fBedJzOjzeQpqXHwrOmdlwRgH4Lbh6hvS1GPUGKmPimbeYM7bNvprmQq7b+EJhiFjd2kBmWN1Ii870X/ukViDiUKjzL7x+28XkjkmVmVTEDPhCRamwTGqNivVTo7RSe2JAtWAz2lDE825/4= 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=dwM4QIAy; arc=fail smtp.client-ip=52.101.193.48 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="dwM4QIAy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gZhCjoCdsiaT29h0vt0xpfABytd1xexGnVEQ+I88pB2gBRgBHgCUAudrmq5E29yfGgclEJfs2xVno24xscmQQ/ZgOkdLsVzxI4turySW7SGN6EVW9+VFS1Jr95tv2X9A34uQspplW9DxZUf8ghFYb4SjgpZG7gCwqQh6Rw3MrGaQXF86NI5CoEq0jwLqr/ViwVGCRcI2QiQWWrGSOtV7t/sbeqmWO+TnwF03Q1mO5kmKVkd+81NZE5RzWjCf3RC0yXyyRLoS4/vxYWkmAKZipZOKOGl7Peg0CaE30U8IlQ84gz5b8SjhZg7c5qUzW6goDDCto2PyWPc4njGMkgaohA== 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=4p4M65WNV3MGQ/hdJ44kNFLUHDXDMxnmZb+UKaKV+uA=; b=kkCfng5MW1x2AjM2rG2CiSbTbuKz60TJcuGwIfTY+7TChxbr9jLDna49faZTYsv9ItpyUR9wrEj4FxSzv/PL6shk2OHJDbttHUrGAbaRbqSfuxf+ILm7zh/rfzeEZJjp+NdH9bw5GAf0wvpsNQfZ6hfJBHe6KO+qAXEQlU3LQmCpsYNAVpZWvNtkEzZ4zRHlaVZDNaNpxz2JNHwCf3aU8TU0KRHK1XJm0NE+rdtn13jy+sh3JNjUOd/t4Sxcp4O+1xFAOM7RnpIXWZ2bD//BlN1nhnc/I4ZuNiVlquTN45gjSMKKW8boYurz1Vn3EBl0Nwn0J3Kf3mg+aLUI0/3ysg== 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=4p4M65WNV3MGQ/hdJ44kNFLUHDXDMxnmZb+UKaKV+uA=; b=dwM4QIAyRpTfrgsDlH2tY9GAQ7UCotklcKJHrdVMtdvgiRT2MayrGxxNQ7f74s+blpXz7AdUhELUpE8tp/owjK+vJRvG5j/alptTHB1Xxw//jCF1DvtjFnasQt9QnFX94808Kh1eHh+Yt71e7tkicNHKUutbTNG4NMIso7DqyS4= Received: from BY3PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:39a::14) by CYXPR12MB9277.namprd12.prod.outlook.com (2603:10b6:930:d8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Wed, 24 Dec 2025 11:16:11 +0000 Received: from SJ1PEPF0000231F.namprd03.prod.outlook.com (2603:10b6:a03:39a:cafe::7e) by BY3PR03CA0009.outlook.office365.com (2603:10b6:a03:39a::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.11 via Frontend Transport; Wed, 24 Dec 2025 11:16:11 +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 SJ1PEPF0000231F.mail.protection.outlook.com (10.167.242.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Wed, 24 Dec 2025 11:16: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; Wed, 24 Dec 2025 05:16: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 , , , Subject: [PATCH V2 1/5] mm/khugepaged: remove unnecessary goto 'skip' label Date: Wed, 24 Dec 2025 11:13:51 +0000 Message-ID: <20251224111351.41042-6-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251224111351.41042-4-shivankg@amd.com> References: <20251224111351.41042-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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF0000231F:EE_|CYXPR12MB9277:EE_ X-MS-Office365-Filtering-Correlation-Id: 8294ba60-7d2a-42a9-35c7-08de42ddd83d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SzB7ZcCEY7g3IAbz/Gbubz2o0EZUEOXHZeYz8L1hgbAl1YUgEaroy2RxQUAI?= =?us-ascii?Q?H9m7kXGNWmkfn9NGJLRP4uFHcs7xNrOpufychN7Mnn6IJyj/we8ugsaft8Kw?= =?us-ascii?Q?POXGz1Ud8LdLF/GVwR1Debs/GYD3lcQYNdZvkpY7jnI4bjOaa/aIjBitAM4v?= =?us-ascii?Q?CIW+GhmBRZ1esmiBwqIuTC4BVq3AEop1fD5KReMAxUHcXZeAes/kNPo7rnxh?= =?us-ascii?Q?UMa0a0G5i5tl31OW2TXu/E/XvZtOUyzJnCu+CrEUBBCJ1teC54cq3KtL2juU?= =?us-ascii?Q?LhepjOyOCrftbCwWrBVHcWAlLFv05z4XZ+zCDI9FUe9MBbB7UWsfFFkiqTcQ?= =?us-ascii?Q?554Es9LP4UFvqaf3ZmTYYh4c7dBHwQ5nOeJfwT8Zn3wejdzscN8PDnx6NMVa?= =?us-ascii?Q?n/iEVe9W563J9It3vVAk61ZrzdCqVgYpnJKGs8j9eWvjY0YZHVtKoewQrtuf?= =?us-ascii?Q?7ughCiWi+xrEDugeZ+LoDPkhgm7GnkbdLpH+VQGnFaqhX8UBrv9It9MGaaXe?= =?us-ascii?Q?DKTiZlcKoh4gUukDcxorVKEtp74OdvLEGII9qFRE8cHXd3gQWYTLtspxKDxi?= =?us-ascii?Q?L1McgArOT1SjZDRJbK0A4ZZVUQuYTcKTRso4CGlUD7t2xsMusxLA4zuPJLkt?= =?us-ascii?Q?rim19tj1KkRQUEFifubIg7k7yQMhOUyQ3yipXTrts66kUeyUaVryyO4MFZpe?= =?us-ascii?Q?QZAnMI3yUoEvXIF2PBsEC2CwpJrXKAFkH8BFgUNE/afT9aOxKCFQDDdA7njD?= =?us-ascii?Q?/2T7e17WVYWKko39V6lso0v5+pETwsEJ+jRUL9S8iiC92d09V2DSmahL9clp?= =?us-ascii?Q?Q9Qma3qIUCoWRiCF7+6KPS+64JAv2yCHxBy85SX2pXgWO8ZWm2b/IIrB88XL?= =?us-ascii?Q?Q2+fXN8KlKUT6SYbqDEHrWSSGTYWUvPp7tHdu1kDKHKyNjDU6CYUejcdLQQ0?= =?us-ascii?Q?6Jr8RCyFjauGuwanca9sMZibNszBEb2seVxX8SioCKmaty7j/QQyIJIklD4E?= =?us-ascii?Q?8jLD+kUyw1hdRRqUNAyPG0N0VDdcK6uCAx3MYl3Ar6DEzZmsuhpj6z3Tidvk?= =?us-ascii?Q?Ve9kALE6IpP3BWkiopyHORENahN2wymNwDpvm+mzDgtcWickWDwdh/acXAD/?= =?us-ascii?Q?EdjoHWy9G5ZZwdMhqd0GwRqiXfGW0Xg+o+2LYf8OBHdwMNBICtR2Dqp/ifz3?= =?us-ascii?Q?QTpyIIclpxMTctpAxnuzV/CI8uT2bp+VR9KBXMybB1aGbKOBxwFk+22tNOBI?= =?us-ascii?Q?b9b7q/+EvSVjftXowfC2+2f/2Cr93fAGB9fMGR8THE6fEqCIP/lkmoNNBFT7?= =?us-ascii?Q?EO9am837XzS6WPkmVmR/oFVtWP2/Sjm2od1lOFhGWvx4hUgV+JK+Mma8sFuK?= =?us-ascii?Q?ifAfxw77lWrwby2zRo1T0ZMw9UKbkLe+IKwKzhSh+V8B3b97AG5m4qCRukZ6?= =?us-ascii?Q?R+6VdbgYncsfpHmofpSQ/NNvIepDPylR3M8diw7tH478cM8gv85+0QMVWmgi?= =?us-ascii?Q?F+rNyqAgGJG5RjzlztRwyNTeA31WkXw3NrAH8Ye/V3odd0DHB1lwFz3LlaPk?= =?us-ascii?Q?+SS/I0UeMvOenYHdkY0=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)(7416014)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2025 11:16:11.5555 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8294ba60-7d2a-42a9-35c7-08de42ddd83d 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: SJ1PEPF0000231F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9277 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) Signed-off-by: Shivank Garg Reviewed-by: Lance Yang --- mm/khugepaged.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 6c8c35d3e0c9..107146f012b1 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 Sun Feb 8 04:33:48 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010007.outbound.protection.outlook.com [52.101.193.7]) (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 822F030E83E for ; Wed, 24 Dec 2025 11:18:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.7 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575087; cv=fail; b=A79QLKpbOcw6CF8zV9+kZO/Wdoslrx7gmtVGtujVlYXw5Foyn9JY15SV+qUScHpJmxHoMD3I32inzzlcd2LsIUHZ5QhfTlYI1xUVdlhZ9iSJBFg1LPwrvpt4quIP2/zhU4dZ1z+pBNd1AxW6EZ9OMQkXKS2pzxL5h1jx1RR2k24= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575087; c=relaxed/simple; bh=nP6bvJHicGXkgWIToSmTIGm7bQsqeOBB+CpabCX8ewE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tarB6u0NPK2qd2mKNS9f5d/FzFFvqm2sfql4pxa2Sc7+Aoa4n1tn9CyRfzrZ2dgtT6BBO5m55jsG5xOxPkBTcLYtBUlnJhhReY+rlk2IFaQYjBlq8bZgY6YTvUR61yCh9Qw2UHjqb5YYYp3N8rH2ncp2Pu/4yz959YRFVbYrreM= 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=NY8J8u8Y; arc=fail smtp.client-ip=52.101.193.7 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="NY8J8u8Y" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C4q44w8YE5R613S83MClXUAg6QxkbT0JM88WIbm+TqxFvIJxAVsS/bb4aTgFdLIwRRXMqN5VsteNekZqVsYWpBlXv5Q+dgp7q9Oh1a4pyAzuonTBx2fK2qItYZI56GrejIWOywvUlC3Q0XkoRMTFXFqPJtg1xG7ymJk2J1rs+Kn2Jco/7r/IDU9jviu9EhrL/eALDkrvvFa21Sz91/Zi6Au7dOwZU1qLhoRSwAcnlgcJ9IbSu3FqkiKBZFtzX7kCRoprH9r2n5oCYcmLGCUnllX5rm5MZUnT9iQOD+OB+WVQV2hyLfrb1Nvz+7fp+vJ8AzmzNOCWrIxAXoDf56lHrw== 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=mg5DqstHA9Qey8Eses9NLRZENqO2j/haqqIgUaLJSRc=; b=hkMil6ZYq7zLvKLaGB2d9BKEVDZif4qZGPv+jb2EeYmkS5CykQ3D7x24GFT01vzO6PeluhxXEs1cf2FeZWPoe0W88K9zCu9yugO17k7zT7spKjlgYG/48S+AYx6K82NjzNCBMb4Vpxoal373AHIIAuC1/fx/OCqmYtahxlWK3sXTRrj5pC/7J+szaX/j2uDCITrENjZQPe8pEHJHF/i4SEoAH+/92kNsEZaBqMQohIq89/f1Shg86ZjpM7qLE3IFQs3f3oSAcKeYx1ky9ceSM7wifNF91LIjtM1oM2J45mgY/N3RMfeliveIH6lkxzBeILuj5L8WXqjSHVvEJEmuVw== 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=mg5DqstHA9Qey8Eses9NLRZENqO2j/haqqIgUaLJSRc=; b=NY8J8u8YfBnypLlwm+MR9PUbz8C2MqXEeLLuaR8zi2VpkQsShx4dBh5SWfg1a50xvWKwEOCE02MW4a520x/JcB6kLvrBkYFJBQc+ZHOQppoTemuxAgE41za3MnWTfVGp4HtLc0mk4fYY1rqx2A5O+dL/P8arsDpIBkDpcE55rrk= Received: from SJ0PR03CA0153.namprd03.prod.outlook.com (2603:10b6:a03:338::8) by SA1PR12MB999108.namprd12.prod.outlook.com (2603:10b6:806:4a2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Wed, 24 Dec 2025 11:18:01 +0000 Received: from SJ1PEPF0000231B.namprd03.prod.outlook.com (2603:10b6:a03:338:cafe::18) by SJ0PR03CA0153.outlook.office365.com (2603:10b6:a03:338::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.11 via Frontend Transport; Wed, 24 Dec 2025 11:18:01 +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 SJ1PEPF0000231B.mail.protection.outlook.com (10.167.242.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Wed, 24 Dec 2025 11:18: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; Wed, 24 Dec 2025 05:17: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 V2 2/5] mm/khugepaged: count small VMAs towards scan limit Date: Wed, 24 Dec 2025 11:13:53 +0000 Message-ID: <20251224111351.41042-8-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251224111351.41042-4-shivankg@amd.com> References: <20251224111351.41042-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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF0000231B:EE_|SA1PR12MB999108:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b86a8ce-eead-4834-9a4d-08de42de1990 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?7KAYoRfGQGXZMhbORO4bon/xjjlC/x7oWMrIkP5IHUDryUo2ZHE/vZX5VvsG?= =?us-ascii?Q?xZrbUj8ncHajHfg/guohj6m9FZIMC+peUoiixebgtrH96AlhicUyWA2nl+JF?= =?us-ascii?Q?3AJ33zMo1ykKc9H/naEU3OPCIDtOQ/8RoLmbCBodrZ5Jp7uaS9rrXR3Wk8yP?= =?us-ascii?Q?Y8t66BAa1kDiM9aWEWoVJGRaXeUtU3tlySIfyYV/ZQ6jH8qV2w6skL6+dUU8?= =?us-ascii?Q?QrLKzJrYXMll/mpwtYCGqMK/GTpygbv2Jypd7IhFjcGbt9O5L3MthbDti7k7?= =?us-ascii?Q?zTyGSsVODdvl7yO7M1ZI0mgkYHOBpvsJW67hbjDs34m0eBW/ysCYGt+Nx7we?= =?us-ascii?Q?L6jceT2hNOS22yjgZD54ek2OBm1hA87Vy9BtV5eNQj7wWOcuEUxieQv39s15?= =?us-ascii?Q?Kr4KHyMPn49Ox0AZKsjgArrDptpMVaTPfIjd9TAFxGqd0YqU1EnrZrpBrZ+/?= =?us-ascii?Q?PZ7rd4R0mx+7cQ1q+W0zQD699vNjM0WcCdARfDFJSQCtt+bwBPw4LqhKRIt8?= =?us-ascii?Q?wdOeyYHjGqNGqsI1XEtuuW5+7eOEap5SUK0GWzb4fEUMa55gl3RO8PVCLLuL?= =?us-ascii?Q?Hwhzyix/AVl1eTpGtjz2BTxncviJU2LB69zBmwAw00Q6ckPlrAIr/k3UBg+w?= =?us-ascii?Q?esM011IL6j7AAIBQoe1XrQoMah7qaWpyFjx4h71Iyakhha1eSgMBVlnDqASK?= =?us-ascii?Q?a3r5kYP1dAc6Ed0J+7GVnKdKzuZD+Rc4yKY0wBtHNct/RxEyWyJ9FJCqC4Ga?= =?us-ascii?Q?AXAgIroaziaWCjXP0dBdOHO8Zkq1muhs8dcuCi+wHfRCEIptTyC1pKDVnQM1?= =?us-ascii?Q?aZEGOIqruMuGvXPGYxbM3YUj6ufBSfqSEzZ8MLlcinQrWV0obVsDdP+3/ZVz?= =?us-ascii?Q?D2O5uTsSJKMLITsAfQb/bVjAN48xCLpi9NrIUaOVlNJQ1LZ/p95N5qEzEVpj?= =?us-ascii?Q?TwLc/mKMkR/J0dFgz6qlIJi5FFlucyUNzhZ5fz46iwod/flNWmFekQSciPt0?= =?us-ascii?Q?nfcNddtnrEc/KbSU6PHmsqrTR48W9Z/XbGrR1XPFQSe0T3sk+aLHJxNG4kJj?= =?us-ascii?Q?yQGwVUF3wiB0mrRXQsTwuBPwG6mYt/ljW2lKMPCLz88Yd3xzYZfg4yQa6Sem?= =?us-ascii?Q?hQyOfCWnA58V0VaGzZjVER8PeVMdIsAZrwtej2E8BeIdsjh/RtnxAzNNUFAj?= =?us-ascii?Q?Xy8Yv8gCH64wG5cA5Hzgxa+Y/VXW+yv9JTM+FXp8EKrhiJQKwt/Dn7BaSAoi?= =?us-ascii?Q?g8s8KAzGeasGeU1TvJ1n357zq0a0k50myq9dCI1iABygyfdvplRSv4DolKzh?= =?us-ascii?Q?8J9PNDFg0xcCfkuDMbm9Bxm3DycIln5iAGCI/VjEsJFOy+B3UhdQ00I/hgJ0?= =?us-ascii?Q?GNQ2IpeJqLe882dz4Z2PifUsdb49dpGLxo7bUgMcQ+POYlRZ1iWOCB6RqpTU?= =?us-ascii?Q?MmXxbMe7ArDf52o9P56ORIpjwXBsgnunBonl5AhBDp4FMIt1ThS40EE4Is+m?= =?us-ascii?Q?yNOvTljY30n9p2AbDeJp8yR9v0GbCG5FOWo5ZobFdLkI713Skl8hzMOv8UJa?= =?us-ascii?Q?1DNXvPqCsKVGCMFaU8w=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)(1800799024)(376014)(82310400026)(36860700013)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2025 11:18:01.1522 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b86a8ce-eead-4834-9a4d-08de42de1990 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: SJ1PEPF0000231B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB999108 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 Signed-off-by: Shivank Garg Reviewed-by: Lance Yang Reviewed-by: Wei Yang --- mm/khugepaged.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 107146f012b1..0b549c3250f9 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,7 @@ 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) { progress++; continue; } --=20 2.43.0 From nobody Sun Feb 8 04:33:48 2026 Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011004.outbound.protection.outlook.com [52.101.52.4]) (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 039F97082D for ; Wed, 24 Dec 2025 11:20:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.52.4 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575221; cv=fail; b=pq617ZwCd74gsQIwp2mtcrooedJ91wiX4E9BbVGqwDECAPZCwjUOSF917rUqzPubJ1U+VfQZi8ZeYmiKlVSWZ7bhWTfc1upIPKLWoEr2zpioL5/O69rzZhlSSc4TbnDdYquM24Sc7/2c1Or5lV6Lu8D+vcT7m2PgZOa240Qp4dM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575221; c=relaxed/simple; bh=iJNqYhWWJDf813B7PtFSOYlxLjnP766rMIXXf2Xz1+Q=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VQJ/X5zwSgHT7qoGtiDM0KNHLxQ2xM86l++EtyCUIw365J5nguVYp/Jri2us4eII0e45MYqFUdQe8bXj0kCBxaUR1C7/WoRyysCTpESX2isUCMUQyTUS3cSIAJ4ofwt905GQrRBH8OHQ8jcpuFNtl58ltptumbXQJLQvigG4I88= 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=C/5sXta2; arc=fail smtp.client-ip=52.101.52.4 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="C/5sXta2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HFOXCqr4Lw/tTh8ELrWmobipOHsJ3ZiP1I/VgIqjnuKKoejIs+1PUUHb2NaRPwXiZtt8z4hk5Tm3ZLMASOgfe4eY+EhL1KI6zZVpbxmL4AX4dhE96ZhAOHAyHREOle2QxenqLd642UzwDSMsukUTfJMwBJqch7Qby3wEq1bWfOZUl8seCdGOuoRvFWogoMvKkxxEYpvplQnEJeNDxHruJEdGXsD6aqwMuPUdi+TM8olVUL6KNyik2ckA6xcWFO8vLbqBX/Ej4l+tPhIprjLM0mNrs2a0GSHNfkzisjx2X2G2wsj9wplGyG01q4N5ApJu4m/jv4M/haPAGpH0s19H6Q== 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=HcD1OcYA2MmW7Eytftz0VSG1J++S1TspRHCN6WkoyR4=; b=HeVuufyEtwtKBgVDpsbZrcc6PPD31zh9f2rdwYyDAx0GS7CdDEC+7u8u1/c9f0zRJeLKv7JxjbdBAN/u+Qj4stJhrtE5sxpHZduyECKZtoax050ZMIMRzrpNXbKGq+8JaTU7D9OZ19Xoj0I1W7toCVA7sWmh7xdRYJn/9nOIYIktvow7/PaUoi4/IBjWTxXM8FTr8tP8mNEBSRy0AETWqfHNq1X14xPxPhhNQRL6JfuqxG/fuksNSjQiMh22EG4jUElbNA+t6jYTh+muCl4rlftqkmKo7qkAOjlWKAQgWbi0KVsXqwrpa8GRjp0vKZinPNBB4/B/Un8Okd6IAtq3YQ== 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=HcD1OcYA2MmW7Eytftz0VSG1J++S1TspRHCN6WkoyR4=; b=C/5sXta25wNCzlTovdhHVHI+yw0w5qFt16h18w4aREa8jfg6X8bCFovyL1bHKayTB7/fKHCNdTou3mkHqGmeFUFEMb1KGYPwKe5Rc8EOjqk8HBL8e6+23qY3OLFEO/lWlQvJ7DJmLzzsf5uIdJgBm2vt5mR34DqTeYQ8pBwbJLk= Received: from SJ0PR13CA0019.namprd13.prod.outlook.com (2603:10b6:a03:2c0::24) by DM4PR12MB7597.namprd12.prod.outlook.com (2603:10b6:8:10b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Wed, 24 Dec 2025 11:20:13 +0000 Received: from SJ1PEPF0000231A.namprd03.prod.outlook.com (2603:10b6:a03:2c0:cafe::d4) by SJ0PR13CA0019.outlook.office365.com (2603:10b6:a03:2c0::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9478.2 via Frontend Transport; Wed, 24 Dec 2025 11:20:13 +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 SJ1PEPF0000231A.mail.protection.outlook.com (10.167.242.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Wed, 24 Dec 2025 11:20:13 +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; Wed, 24 Dec 2025 05:20:05 -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 V2 3/5] mm/khugepaged: change collapse_pte_mapped_thp() to return void Date: Wed, 24 Dec 2025 11:13:55 +0000 Message-ID: <20251224111351.41042-10-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251224111351.41042-4-shivankg@amd.com> References: <20251224111351.41042-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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF0000231A:EE_|DM4PR12MB7597:EE_ X-MS-Office365-Filtering-Correlation-Id: ba72d208-6b71-45f9-e83c-08de42de685e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DT2AsonanOT5uRMr+D5TumWFzavYaRDuq3W2/7RLm5SSNySERGKL80IilOuk?= =?us-ascii?Q?ZNvNhWrAN+kC9TAexrPskNsFmoPkcBnizy4A4UownOhQYe+YxeS/f2WtHJJG?= =?us-ascii?Q?c3qwW/jlWKLPRDjQFcmNApBkmiNV4eOnz9iVtbByoz5j3afRaj0G7fhw/D3U?= =?us-ascii?Q?plkxR40VUeyuHbn5A0hDn9eit3lyAbKR1xOPpGOPe6PyDkxNn4j+jYXHe6uR?= =?us-ascii?Q?tMDSwJ2cQ5gns6kZRFhMjZ+DMgfrv1nnhx9cO+TlKPKNm2rrKY5lIAKuhrty?= =?us-ascii?Q?ZMI3kRvmOiz94iHJumO+ajrKlSg/87ErXdkExr90YlLtuyGZcFJ1Z//PpeuE?= =?us-ascii?Q?mOrl6DDqTfKiy7yOfcRD/TyOLtqQxVls9+kZJL9blxSUeepodlNDeJ9qxQMH?= =?us-ascii?Q?PNQcwbdcixvgFA79xWjnpmz9+kwlYFqEC5MbV8lvYdsp4VgoV6J04K5YFsPq?= =?us-ascii?Q?JMc/09tgm0WR3DGTeLfBNcV/TyOdvabmWOvGBcdh/hfAkVnugL5qdhgkYj0/?= =?us-ascii?Q?x0jwV+sHJUoobFAnuYfucwew4leyf0WOwJvpnO9RvUfOhwouUG1WTxmmzysG?= =?us-ascii?Q?GXbN2Z62oYVcMXYALN82DlZ/OUD3VM8ZnfrhcaB6g0q5fGABksVymAiJcS89?= =?us-ascii?Q?1jQ8C2VxpqRAr1zOWuIdRIhnn92+1I0y0H/yg96fhkHhaRb1ko4VfUhabd8G?= =?us-ascii?Q?ZkdsmLHY3/PSPKT9ZpLG9z8EQtEQf16lUqVqx0AuXPA+bH74Gl6xxF16QUvG?= =?us-ascii?Q?YWPDF08hJ4JXpAHoubVjJqVLpiWiyAkvsiYdvcXsMP2tfSrKBtsS6Sn4OQav?= =?us-ascii?Q?bsMpksiEnULGzRxxAL7Lbqm9XJB+nsjMZGvp4gTeM+3dwdO6QWvgKrEUa/6M?= =?us-ascii?Q?euOzGYlnfiBfONRExn6M6Nk27hS98MVFH0Q+ErmQN0Ped7v4uxWUDw872dL9?= =?us-ascii?Q?spRepbHB18eEAj3RDYxDFWXG4KU8uceAaXACQT51WqAjLXrkLe7b8GGXvn56?= =?us-ascii?Q?GYDFZRBCc58OuwjUdolRRwunuC2+/mZxaEh3NR+PIrBBna40JJoIjr0b1KhF?= =?us-ascii?Q?ITRpIGeFvBPMlSLh/wppXf55pChPC7YRB6ZexaYk04VGNICKheGNvwsgWxuE?= =?us-ascii?Q?IpFtJj36GbU0Xe3nRHN/L1BmsAwsChREI19mxXz1vo+NCXB2FGznxuHm9aa1?= =?us-ascii?Q?2vzRMmMRb32pdVzJTiMSsmLpAg3bI1gONSMV2Ny4oS2QC6x+7Tmc3eesnrZ+?= =?us-ascii?Q?OOQEnJWrTWO9+/DQUKJMN9CV6igEsrIZXw1ZFpI47pm7zvWY+tjDxwQJrawU?= =?us-ascii?Q?nOBpUZBEYyIMDF73ioLRok9KOBVuNAEjmdNJsAwEk2c0hCy+nGn6bW9xO2y5?= =?us-ascii?Q?y3gclCnHnu+ZIo/JBtorrVhyvJjNlQTDSFQDjOoTlugsRWYGPekKjO6xhA1n?= =?us-ascii?Q?Dcv+d0D5SB21KXP+Xy9P075sVqo3JPQntnNB2YFISdM/BtRKhGuLCzvv4ucy?= =?us-ascii?Q?ZcQ37XRsXL53gU74lXqk4jjRGiG3mSQYMoo58OmNHPGsrHIGXd53pAYzpQ?= =?us-ascii?Q?=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)(7416014)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2025 11:20:13.3067 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba72d208-6b71-45f9-e83c-08de42de685e 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: SJ1PEPF0000231A.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7597 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) Signed-off-by: Shivank Garg Acked-by: David Hildenbrand (Red Hat) Acked-by: Lance Yang Reviewed-by: Zi Yan --- 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..37b992b22bba 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); +extern void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long ad= dr, + 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 0b549c3250f9..04ff0730c9a1 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) @@ -2479,7 +2485,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; @@ -2869,7 +2875,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 Sun Feb 8 04:33:48 2026 Received: from SA9PR02CU001.outbound.protection.outlook.com (mail-southcentralusazon11013029.outbound.protection.outlook.com [40.93.196.29]) (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 2EE2A32825B for ; Wed, 24 Dec 2025 11:21:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.196.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575296; cv=fail; b=SXKaGb+rtGXibGidXWS1E/+MZ8BCs1DxE3PZYu4yBZzY5BVYWy+8UPqnsMkDrxQdX3/Jipsamz611LgtrDLuVny9UossoE0two+xud50/dCpYyJbJgxxBDHuGMZELHcE/XuVh7fZNZsArAZnDZWOXdGu5GnzehPe0Un9/aad1pk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575296; c=relaxed/simple; bh=8srrG3TJiXVBT3BYZZ84bRzRT9Yw5h5+cJU2u56oz/U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EdzC1/wR4OoHaRUjDPRBIzDIy1D55Bck9tbmpYBAXzFnuN6CeIjE8bMO0FpiViItN9Gn0OYZNZMzXIG2K2MQgT7JmE83j/7rCl+/NoGiAvTxrWM/+7hIwLh0Fi400N4Duna6jyJoeNKpUXUJSeIoc03LbDabIlhjGsTUX53OwBo= 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=CkF1hId4; arc=fail smtp.client-ip=40.93.196.29 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="CkF1hId4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oDS5IpmPTbfKOs4auYWOBueg5akgjkR13EsnBsb1UXR7E4JAvkS65VHbWc2iHw3rtfOxkyBRVrxIYOcl17dn/dGBjimimEdizR1YoNffJxHD2HLJZeQVLHymkpev4KqaDX7ctH2PXviF2QCuVjTbE9D0djSsOHFayuuU+esbO+1ql29YZl6o95e6IgnOEUuUClXW/NA/+TixdnLCeeFz6XrrqqoiGWDgi0/ap7/kkC6/RHcddHO+K/vDdSiXAHatMJpMiAJHJw7tBs+HZVC17X0d6MO0SO7g/etD0x64wmjdLNSQxf6m5Pa3/wqcryLcEnP/T1N37GfcaCLNvs4FJw== 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=L+XCQmbTtTpVGHq/Y77lT5EOkvPBu1bacPRFVKsUP+s=; b=lh2TpU1Qtvd4zRYAmTDJHcckHsOFgdbRtgBJ11Lwfc6ful/Ka73mv1vBkNiXsw3Whj6NH8b6zt4EV9bM8KsBF+XxBH1Vqdnxyfxwi+yYxBSFfCk9s4SBrxvCffhk74toa+2ANfmnndctFLi3+wJ/1dZoyR3E6rq7YXtB95GVqT0wfrv0oePeIheZATj1eK7tT2oqTp77hYjwrkk4CWDxG4bO8XuHQ8Z/2B+8JCrtaBcOwivNK7/Wyzj6V4NdDtvpJZxaSq6oac3gZUwdW0vJ4JzvcRIJLo0WZwkp0Phob+aL6v2YsJBnEmnkU1S1ug1vgObZAraa/hReVO55j/BRGQ== 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=L+XCQmbTtTpVGHq/Y77lT5EOkvPBu1bacPRFVKsUP+s=; b=CkF1hId4fyMnmOb13rnt38pyFD4lqQrUO5oeKGmIyVrkv71fUU8/W5aOUn99w/mE7OegPq3297ICWZFCei1KkEqkzTepsbExEcNQdat7uZ44x5gWEGaoEqD8RNdkXUJLWPTuHJ2yHEwA0H83f2VZ8bHjiggBZvXGSRiRgb+CfV4= Received: from BL1PR13CA0088.namprd13.prod.outlook.com (2603:10b6:208:2b8::33) by SA1PR12MB9247.namprd12.prod.outlook.com (2603:10b6:806:3af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.10; Wed, 24 Dec 2025 11:21:29 +0000 Received: from BL6PEPF0001AB55.namprd02.prod.outlook.com (2603:10b6:208:2b8:cafe::ff) by BL1PR13CA0088.outlook.office365.com (2603:10b6:208:2b8::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9478.2 via Frontend Transport; Wed, 24 Dec 2025 11:21:29 +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 BL6PEPF0001AB55.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Wed, 24 Dec 2025 11:21: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; Wed, 24 Dec 2025 05:21: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 V2 4/5] mm/khugepaged: use enum scan_result for result variables and return types Date: Wed, 24 Dec 2025 11:13:57 +0000 Message-ID: <20251224111351.41042-12-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251224111351.41042-4-shivankg@amd.com> References: <20251224111351.41042-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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB55:EE_|SA1PR12MB9247:EE_ X-MS-Office365-Filtering-Correlation-Id: 44f92967-e8d4-4b0a-1b1c-08de42de95b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?yZjeuE3GwdAQNW6019A7wGcsJaaJD0jxuIZmPLKuXKOM2U5Ywx2Gszs1RLxY?= =?us-ascii?Q?9TUADDJ/lrRmVgGJA9jfFExGFkje+NxJNDhQjEJZeVbsKUvFUHIh/nKYmxbH?= =?us-ascii?Q?waAVH9AxIBpDV0k76ALng4bWOreCiPaUM8LOgEqm0z0e2FozaXMN/Uzd66/9?= =?us-ascii?Q?pO1U003RcjpA1PgzdlY1wG7Efbgj3kiU5Au5f32bwmW9v5XgeJkrGJPiR1+u?= =?us-ascii?Q?KEFeGwoSv5l8nu1hjmIbF+qWn+LAcnOT0pf9hd8yP3XJKlIl1XGoRpW2c8Iv?= =?us-ascii?Q?SgO1hIpJddt788xMAz43B7jatN803gsjFrieUoKbtUMW5aOClHKdkCbBCbot?= =?us-ascii?Q?aO9k8Z2zvFtURCd06zE+326Axq/iE0Av6U+Kxpr1o4GdOC99mexOwSyGFvAl?= =?us-ascii?Q?WXnxc4NqhHrxLwC+GIHoaeQTq3tNQ1veTnG7eHgEXsaAZbhYZCslKVonjH+9?= =?us-ascii?Q?yo7a/QmbUGRpH9OKj0WFDIfUvkd+opkeOBpTkKJAnX7/NRqhUszByZajRk89?= =?us-ascii?Q?O9e8pp7NvMQx16E3lWg/679yZ1SdbmvtN0KcSKfc29V3gabr2i3HNqKEDXm2?= =?us-ascii?Q?NPo6FugvhNoZZcD+aWpbXB5wLZgQZHUc+88dlAzL/x6J3l+uNvPcve/eEuXG?= =?us-ascii?Q?AUSr8+kXRkejDJ75w72dIRWl5BHgD07+Cob1GNfktK5uT6Vf30doPMTT5S6A?= =?us-ascii?Q?sGycw0J8TXHlRfvL03/psq4t6NEGjMo5ZCAG5BT4SatBDFvDkRH7CA4Eatn+?= =?us-ascii?Q?poSYKb3aYgWBsMCdP9WyUicOJ/RzoWd2s5+7cyHwEKjss3def4Lavm2Yfflx?= =?us-ascii?Q?nLRF8uctxX2Q8EdGyJ1jBNfTHbrPe2tP7doQjSLXr3Uxl36ST/UyTa9S56xW?= =?us-ascii?Q?Rus5EIIroRajjiRSfjuLuXyyq4nMjdxgx1OSXVLYskYwUtadbzwikSi4Lyqo?= =?us-ascii?Q?32hJWe5FlqSYwq9dfHNQ7k9pz0S4vj9l3EttDKAijXwOsrI2D/HKcS1JmzXT?= =?us-ascii?Q?XtV/dH3zWHeRtYNsIvUSZErSkIPoW9rcdCU6brF0WpMCDQ8qgeBETd1ehJFs?= =?us-ascii?Q?KuSXAP8mqeIO6tEJbKBJrJ6LG26SVJyEHQhfutw0MeItn3Zs1IjDCJXsihsN?= =?us-ascii?Q?6Lr3x1qR2dytbBa9Ib47pbw/BdTVVmPV2/86THOIgUEYjpk+LKog4oz3LQXk?= =?us-ascii?Q?prNRA6AsN2iPbygM/WzbQqMZ2lyDi0ghXlLkK56txqA2W4JuwM6s4Mk/Xbob?= =?us-ascii?Q?es4WDOZJ2dVndA7EhAnkZL+GHzVcanylgeyj4ZyjW1VzxAatPbCONm/QJ9+Z?= =?us-ascii?Q?4THdLlj3XnldPsT1GlnmaH0LHJ4EPNNl6v2mV+kX0Sw3KbaGxIDiypq83+yn?= =?us-ascii?Q?IFEpCdIguvgVxviZ5doCy7YcjI8TtDJkzmCPKG/RAGCRS7n5DNADo3ySWXV4?= =?us-ascii?Q?Jf1KdU3uvhg5W+y8E5J8c95CPt+qD0cgiWfKlYrES2eP/03JJooD5iDoLdoS?= =?us-ascii?Q?n/AJyUTVNlWkSdvfdKOwyIYTgHBzXmLqhwqkVAyPzjpfJZH58MzH3SXjOA?= =?us-ascii?Q?=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)(376014)(7416014)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2025 11:21:29.4775 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44f92967-e8d4-4b0a-1b1c-08de42de95b8 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: BL6PEPF0001AB55.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB9247 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. Signed-off-by: Shivank Garg Reviewed-by: Zi Yan --- mm/khugepaged.c | 111 +++++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 04ff0730c9a1..6892b23d6fc4 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -537,17 +537,18 @@ 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 +781,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 +899,9 @@ 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 +930,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 +953,9 @@ 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 +964,12 @@ 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 +985,15 @@ 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 +1062,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 +1090,9 @@ 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 +1100,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 +1246,15 @@ 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 +1441,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 +1477,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, - bool install_pmd) +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 +1863,9 @@ 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 +1873,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 +2295,16 @@ 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 +2402,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) @@ -2561,7 +2563,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 @@ -2774,7 +2776,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 +2799,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, =20 for (addr =3D hstart; addr < hend; addr +=3D HPAGE_PMD_SIZE) { bool retried =3D false; - int result =3D SCAN_FAIL; + enum scan_result result =3D SCAN_FAIL; =20 if (!mmap_locked) { retry: --=20 2.43.0 From nobody Sun Feb 8 04:33:48 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012068.outbound.protection.outlook.com [52.101.43.68]) (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 BD6AE30E83E for ; Wed, 24 Dec 2025 11:21:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575322; cv=fail; b=lSyA8F14LGEJpvEHcdvNbgIoQ2fG5r8bnlaj9fS2wEkhKyrxvd5lfA8Ct3fgJtRKgJpMRXDvYVFwAnDPtmlUVlct2pyHsgXD3XWaECupEwn8sV/OzHMBA+Vccy4AjlpaxcBJmisxVvraV6yETFvKbg9MOVlywNe1ZnTBlkm/zKE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766575322; c=relaxed/simple; bh=ePU8d8BvRR/CEGkBg2QGoxRbn08UY4y1OAi805pxu3I=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MLGVKbViuLxTeYzeaX+BgkSajdaJrliPriMzrAjUC26bkpyC/bdkEpLH6j0U9TrWZF095o1sXBPZZDCCT5nLpn//Q8yS1kj3QJqG4/s19OqD7D2OngZJ8T53+MW6AgIGmLB0RZv4XT+DFPbIeElKH/BFWuq8lx2yQrclokEWaIU= 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=SaG2NdiT; arc=fail smtp.client-ip=52.101.43.68 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="SaG2NdiT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wDx6oePvt1Bdb+JNpgaB8zXF/ck/NU56incSEngUwVnUqcFfyYlL8EIpuApeaNQjew7N+mT2RcICGfWyH5nFKwWBCfMpMXKNEAvaJlUTCxl/9/aOTl27j/e6pjhZulrUmV0nOsXcWQzfHuq8O02th2SnSq+y9CANthxG01tDgT2ctu56x/sfQlzcYWqEiBuXKnUfypG7hspodu8kw7ASQO+MtAyTJ95Dx7UQTqgWhDppJd79CvzO/j9dMx96pwoGv9REckUabytJE9BF1ECtf17s1YDygZf+SlHN33ti5ifgCwSgJiq0sUWAYmOoXgeJSYRxbF3Ius2VgfFl7/edWg== 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=Y5bp/4n3puD63bteY1+XLaL+c/x969GrvD6TMhLh3B0=; b=Q9Lsa44fzZUdkkorD4l5WADvjRGuBAbT66BB7qyJFoWljCSiyy/OcC0G8ljBbGJm8Zv6bEd+LDI9tm9/1bMMLd9ihlvwE0IJRdESl9BC8lvIo5M8ovqIFfPtoqPBUUCTe3rNXh38bnTXvp2+3//BNAaDCRwtbMso7ThfcHsT7zHhJcnZFWBIH8EyO+1X8RLHXUq5Xl0twOMSgFOCERhQiZl33o0QjinwCtnUQHZ20ft9KOKtDjxYug32+kKbBIkbeGUN3WPJvls7ABROBbnIJYMBweZXqL2330bxz3y30VPtyJKC1U2sag7qwfM4Ceh9txzkPXy24D5EWdfwEyYH2Q== 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=Y5bp/4n3puD63bteY1+XLaL+c/x969GrvD6TMhLh3B0=; b=SaG2NdiTfZD/7Wq9XiLII8lMM3GWBjEx6ymDyhM4JW0p1bFPs+l1s+9+Pqq5EJI0sFMkt4T5RfpmLF0N4atVODjD0mGcHhEIpe2DuV3z9To4cmNW7BR4R86rAuyC4M4Y7OJEclfeCujkjERyljVySGSQ6mcdoR+Q9/v5j9gYtYI= Received: from MN2PR08CA0028.namprd08.prod.outlook.com (2603:10b6:208:239::33) by MW4PR12MB6899.namprd12.prod.outlook.com (2603:10b6:303:208::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Wed, 24 Dec 2025 11:21:56 +0000 Received: from BL6PEPF0001AB58.namprd02.prod.outlook.com (2603:10b6:208:239:cafe::cc) by MN2PR08CA0028.outlook.office365.com (2603:10b6:208:239::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Wed, 24 Dec 2025 11:21:49 +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 BL6PEPF0001AB58.mail.protection.outlook.com (10.167.241.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Wed, 24 Dec 2025 11:21:56 +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; Wed, 24 Dec 2025 05:21:51 -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 V2 5/5] mm/khugepaged: make khugepaged_collapse_control static Date: Wed, 24 Dec 2025 11:13:59 +0000 Message-ID: <20251224111351.41042-14-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251224111351.41042-4-shivankg@amd.com> References: <20251224111351.41042-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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB58:EE_|MW4PR12MB6899:EE_ X-MS-Office365-Filtering-Correlation-Id: 111818ff-ee15-4e91-3523-08de42dea599 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?yplQsdY6bGhkrAWtqhdRYbrH3PkcF7KVC8ogTHeIVNa6UJCTUfNrE6lITfX+?= =?us-ascii?Q?HcuNgOMxWrytDdhBiQjajQnApOIep1/7smV51JVl2x/dx/B3Kz/ef8kwOzkl?= =?us-ascii?Q?uxBFUiEttrAqqOwu+p5cDHyx1L6AzbPt7lcvMJUTJP7MptuqmVuNAs9wFEOs?= =?us-ascii?Q?iLRoiD2Yw2/srJZuY2ukqMD21YxvaqM30jHGLrOpbqJwVetvmXXY2tkypHNk?= =?us-ascii?Q?J4BfIqFrESzya7VLEORog+/7z0Wpi/e0YAwXckw/KPtW4wVBFbQPm7bqsBIX?= =?us-ascii?Q?X+b4Hk1BWCUpZCi21g16u9N4VTwNVJOKaRbasx4pU2EFN075YRdtFx8fO0ir?= =?us-ascii?Q?i+0JPW8R4Afpf5GFR5+TWYvthf2lSuxSXuEBPhjcmLrBC4zdL9z2uBRhmC60?= =?us-ascii?Q?Wb7g3kvQPGg9hyAFt0VZFNtnKZuxo/kvObo9Exb/e+1jyFUfuHq++0pHJGuy?= =?us-ascii?Q?8Iyt9knKUPswmXyMo/J0WdSpA+2dn/xbxHKAb+rP1jvmEgNfnRvPnByM/jDS?= =?us-ascii?Q?JBGtqI1dw9YLMlmQ00z2eC2nSvEB34thMCluZO1DLZZYn7pTO+D9bBjlSC/6?= =?us-ascii?Q?jkz8fEWBzKgwhEuqQHFgBLXg4hik2T9OcXqve6kXb5p5yxIaG6dxxq287ZiH?= =?us-ascii?Q?gQzkOXn1FtiKCz2NXhKYl4ZPwxl3c5WlGsi2CGHeeOXi9ZyNP6mG6fOI5kw1?= =?us-ascii?Q?lwzPIA9r7j08FmfBNnLIJ+VSbgr8xX8hZxuWU7sAAaq9Irz4H3e930KjvK/z?= =?us-ascii?Q?PDSDHvwDJKsFqtd8nYnwgid/r6Fsgnmu4QCCTM9yExCNPvQBK8vhYbYTnfbh?= =?us-ascii?Q?C7RmAwFgCks+Cj7X51TNwF3ycDxRXXrf4DdWV6rTv9gb8mqzdcCH2bgbqsaZ?= =?us-ascii?Q?/4JUf/ecVDdRy8YnSNSH6NnCAxqdIAa+J1njuyuEmw9MHAo4SB1yUlWYndKa?= =?us-ascii?Q?Pmni9G5KGEoq8oFQj8I5ulcrcVgZLwrre3rB8qzEDXBMMQ3bLJpTkOhidRmL?= =?us-ascii?Q?a2RaujPzd94QwNWO+MzO3WYzEbLCRKstZyIO4Z8h1HA/F5hPY/RQTBCaMtbu?= =?us-ascii?Q?RVedtGSXEd9zultHU5JB0l0P828TT++nARzwg/xws3JeId/NELQvGTAU18Up?= =?us-ascii?Q?S7ySH02QZJdcIauyyBHDeHB3WTQArsyVwL5vYMMIMf7uTGnbwrroRadI4bIb?= =?us-ascii?Q?3TqKsDetWaox/3uBa6m3vcCFVJZvtSkrdxIgO41oQv8ZE4LyVvIq66X48O56?= =?us-ascii?Q?/0AXnkynUlsGhOygV1ls0Sxit27bCGOcJyqrOZta5jNYfZiOwk7D3jqwIvr5?= =?us-ascii?Q?1ORn2XsZmdXzWe66OrSHJtQa7tN1P8v4jMeED/D7M0MkGs2D73lx0WOdnUqW?= =?us-ascii?Q?s95XuOYmzwZoT++gyHfURiFmUXQw0pHErL5OWMKfuZ7dhpF2Yyc6HrggYM7c?= =?us-ascii?Q?4bBJOKWbXZFoIzqhCDOwyDRAwczGzjn22WAXnu3rOlJKI72BJyNGA+vC9ro0?= =?us-ascii?Q?H8FeEY1mlq2FGujWWUmZEdWAbF0tDMvVCI00x6Qtg3mC7ErDLzKncV3YeLdP?= =?us-ascii?Q?BS4J2nIZWDGGZAfH88U=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)(376014)(7416014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2025 11:21:56.1211 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 111818ff-ee15-4e91-3523-08de42dea599 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: BL6PEPF0001AB58.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6899 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) Signed-off-by: Shivank Garg --- mm/khugepaged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 6892b23d6fc4..4df480a87a74 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -829,7 +829,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