From nobody Mon Feb 9 03:12:04 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013011.outbound.protection.outlook.com [40.107.201.11]) (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 5D6A0257AEC; Tue, 16 Dec 2025 11:13:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.11 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765883618; cv=fail; b=DT2RXFZSYX8qyuZaISUhNHV3Zo8IEPZA2PGTVVezzKALZseHppz5H4P0AfEWreZeW8kCz1kTYHSmQunhzhPCGXG/Zvhlg3EmW2GulbXMGybegkew7ugp4kg88TZp3lfgjVn4myRFTUgONgwyR7Ee1Gp9sTGoDpykIWOvLNWFAO4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765883618; c=relaxed/simple; bh=vvy/k8W20ej95lfgZW5lgta50dhia3oj/QLnm58EFhg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JsMwZu8dZXx5SVR++klsFxqDuyEv4nwPyjGjXk4/hsc5o6RvamkIgdfb+35lyaAP33EiZ7qNDDCfz5/eg6Vod7W9RDopAo5e62953xlyoLeN2+1z6mfiz7OJr0X5jd9sjv/iMCrkWT6f36TC2tPtNWvxr9Kxde6Bquo/GqNk+/A= 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=kTTws/gz; arc=fail smtp.client-ip=40.107.201.11 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="kTTws/gz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CKa+lLggi7sYI/3HrEdvXsXwIm0XHMwCbyo/j5Axy7qaJifnIho8UBeT921l2+rZ8ubuKLebH/7AL9wCpW0DT/gzWVRdQ8ndJH5G80hymbhLNIPAF2knALTdQybPTt1begaZ/u578/1V2U64oteOSqAoXadA91lCFbZ3IKnvLRhLkTJ0hhG3PbyDYu2FsRLjaujhlcjwrVSiRyY5JsC8hqMannT39iKkabtvsWoJoSI+Bu6AGo8ScGpglMZh/jmLHbnC/+3GTvpjN2eDC9fIds1W2JXFoL75bGU6VKaPdgOaSq9qsAZUYLwvBf9I+Jslq5JO8gNWYHq1vDXTSQfrnw== 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=3Od07SrpSk9z7pVU6vFIY7WiVnzz1TFNJ4cTAtJ+hyU=; b=lmEfilcg3ztk33rwVM6ZbysGXpzyTyZ4ALpdKEy8omtFYZyy2ttitkF8mCf1p8aGekBxsb9xS6zMVgx4B6ewwfp3ofEdxRrDSZZtZKTjqZCOiCnFdvYzWx4Tcw1Ck4ufmTWzOhlLc3iap31qU4zKZ3jGTfoWjjlDFUyirJD6unCk3C7R3F/C8v1X/bt8+TEQJZmZq9C7bvI5dMDHNFe2g4cwkSlqlRKiMt9UL14r0LO9QtHxyBiwtR6r3OrhrbUm2RVwmYCvJBk5HN9IJJgW/B1Mqhx/wosxmWI6QPFVn7e/ptZ2jMGFA1Nsr/LaRo17NW/yrYyLzPC0tnaBQlIh2w== 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=3Od07SrpSk9z7pVU6vFIY7WiVnzz1TFNJ4cTAtJ+hyU=; b=kTTws/gz/qJw7godAvfQOwXr0EbZLNjyT93HU5+DsfYj92nCK4NtdK7xJdcrsGgn2kMOE7L57M2vHse/PTRK81RgSgKqZwqZO0zAHvzLCZR6VTIWY3Qfdn62vpjw3Y+HSNJmKAxgbIlDLcbbNwOgm+aph+fu/aYJWczd/U+6C4M= Received: from BYAPR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:40::19) by MN2PR12MB4272.namprd12.prod.outlook.com (2603:10b6:208:1de::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9412.13; Tue, 16 Dec 2025 11:13:32 +0000 Received: from SJ1PEPF00002316.namprd03.prod.outlook.com (2603:10b6:a03:40:cafe::11) by BYAPR04CA0006.outlook.office365.com (2603:10b6:a03:40::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.6 via Frontend Transport; Tue, 16 Dec 2025 11:13:32 +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 SJ1PEPF00002316.mail.protection.outlook.com (10.167.242.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6 via Frontend Transport; Tue, 16 Dec 2025 11:13:32 +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; Tue, 16 Dec 2025 05:13:27 -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 2/3] mm/khugepaged: use enum scan_result for result variables Date: Tue, 16 Dec 2025 11:11:40 +0000 Message-ID: <20251216111139.95438-6-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251216111139.95438-2-shivankg@amd.com> References: <20251216111139.95438-2-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: SJ1PEPF00002316:EE_|MN2PR12MB4272:EE_ X-MS-Office365-Filtering-Correlation-Id: a2fa92f9-4e4d-46d3-ae15-08de3c9425df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ds97ZhIFJadeUvrNPVq5cyMaRqP+PVr9l2IH5DY39fZaC0n8eNYHO8ZV2y18?= =?us-ascii?Q?K+zhVZd33qxje/PttLQOKNogX2n1QjfQ3fD2AvPb0HuKPPEP5weeFGKMk/Mi?= =?us-ascii?Q?CbsWLg7WrPFWWoze9RKefijzcIeDnKajCF+Lzpgep5YCDZgSqlzN4x75VhT7?= =?us-ascii?Q?Mq1XE7ooSZN38NQPvGxnVr7W7MOQfCG2aGfoBAJtCujtZQ2CfM3d/YpXXUGz?= =?us-ascii?Q?GGAeyHGsuVo7bCHPiCrPcwpgdKTkh7QJrx9tIBzvsi78Hmo7I0zYPaeh+nRc?= =?us-ascii?Q?BAp60LsYm0rwdYzYOjRD4+uWrw9FLn0Oz9sr+gMHqkKZRFZxALyRxC+aDnUN?= =?us-ascii?Q?/e/jeUSccCHjX3FXm0XdLyCI83w6R/5nTsN+kj7kMKMwAhsubBXAk7xfxJp7?= =?us-ascii?Q?e17y+HwJBq/fUwPHZyw5NYkzb4kewzmpvRw/LZJ5uQcgAsBfd+6HCT5ntmNf?= =?us-ascii?Q?+OfK41JUQAXda46qYvGZWH2flaekdgG3Oi1UR8TKR+thT5bJCPcNsLBTq1hk?= =?us-ascii?Q?TndbyPaSkpbKTvq3iMA1QQX8Rx+PWK/AVYcEVfEH4CbY6eQMbyn9LOgAHOtQ?= =?us-ascii?Q?f5trtcEhN7in/JFqa0NVt4HyDMdI31uVF+XHdukVCwmq/06q2jp1ak4Kcstl?= =?us-ascii?Q?oFzvUVzl5DK5LlmJZ9I2J0+Iv27n9XrA9+52LVzKDcGDE5C5oFeYq/Av815x?= =?us-ascii?Q?xhVK/yxZqngIhwWPeYbMP+xxozC0FqUTFivQuGuL8kRrGc/RdZphx015UFjG?= =?us-ascii?Q?EBw4SACzHZhbXmFKZHE7KC/V+j8PI5wLUi4Yxnj3rNO/8h9dRtROdUSXx6hn?= =?us-ascii?Q?aYNoHvjfAqjGFxUO0LFtia2NqsYv5H9t2kF6PoaAzO5ExhJXd1KLRR01jwac?= =?us-ascii?Q?M5zb3anHwDqxOgCNlaeeihNrvrWu68U/Nddng29g6u2gUWCA3hiPEC+n2J0s?= =?us-ascii?Q?UCu2axoDSeyrjsLiNnIcW461yVRSCdEsCdhmWkoALOHef22U2IlX3Ert7OfO?= =?us-ascii?Q?cqvB2H7CP7fMmdMCvEowNqV/9SCdF89UC1i0oiFp+UbVWD51oKka5eSqsF96?= =?us-ascii?Q?lQ6GwiBquRLxTe576iwcvDfKuGYXZEET6E8TY1SbBy1qM8bqdKgUohTERgBV?= =?us-ascii?Q?loREkYMuCo0fZDqY1nXEa3NOPcPzelJxenFPFuNlI2/LCOXx4ZD/ZMS420wJ?= =?us-ascii?Q?uVNRTOZxMQIOMhe9Dvgp4oSVdvAEaobhZnqB67Uxq7ocLzeVLOVKq246GGqS?= =?us-ascii?Q?ynaAbqI8enRKMyy2xWPVjN67+vzuChoqcMcLd9q3C9+2qo1F+TwwDF4aleTS?= =?us-ascii?Q?77iY2izo3XbRaR1mmCee1vPN0VSC8jo1FsE9QK+8Ot+7IYUrC8ncOMLXKGds?= =?us-ascii?Q?c2Q4imVSrtAv/6W2/209QEGofmARuiPZrWhOxD2Gn2lauxRDlCt8hjjUvJ9j?= =?us-ascii?Q?iQMxJBq/B5KgBacEYdxYioyH8ZmIYx+iBC9t09KKnutHwozPAxWjPSVBtHwE?= =?us-ascii?Q?txMElr6FRGTKYlSUXMs1g+t8tfNK86jBvqqUXmMsoElHr+LYFWPzJBjRHJCt?= =?us-ascii?Q?0fTYwL7QCzvHyNQiazg=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)(1800799024)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2025 11:13:32.0090 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2fa92f9-4e4d-46d3-ae15-08de3c9425df 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: SJ1PEPF00002316.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4272 Content-Type: text/plain; charset="utf-8" Use enum scan_result for local variables and the result pointer in khugepaged_scan_mm_slot(), instead of plain int. This improves code readability and clarifies intent, No functional change. Signed-off-by: Shivank Garg --- mm/khugepaged.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 107146f012b1..65b1b778378a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -547,7 +547,8 @@ static int __collapse_huge_page_isolate(struct vm_area_= struct *vma, 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) { @@ -786,7 +787,7 @@ static int __collapse_huge_page_copy(pte_t *pte, struct= folio *folio, 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. @@ -969,7 +970,7 @@ static int check_pmd_still_valid(struct mm_struct *mm, 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; @@ -993,7 +994,7 @@ static int __collapse_huge_page_swapin(struct mm_struct= *mm, 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 @@ -1100,7 +1101,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 @@ -1253,8 +1254,8 @@ static int hpage_collapse_scan_pmd(struct mm_struct *= mm, { 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; @@ -1492,7 +1493,8 @@ static int set_huge_pmd(struct vm_area_struct *vma, u= nsigned long addr, int 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; @@ -1866,7 +1868,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); @@ -2296,7 +2299,7 @@ static int hpage_collapse_scan_file(struct mm_struct = *mm, unsigned long addr, 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; @@ -2394,7 +2397,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) @@ -2555,7 +2558,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 @@ -2790,7 +2793,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