From nobody Mon Mar 23 19:50:50 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011061.outbound.protection.outlook.com [52.101.62.61]) (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 439483ACA68 for ; Mon, 23 Mar 2026 14:21:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.61 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774275673; cv=fail; b=obbBVfRqj70zeDNt2ur1DjdUy/EpgZIKJKBJ1pC7jBRpX9YJCvQxSWJ6jCtKfuUWbTNhdQOtdSWfIB+0lwR2kPtqhFKhxiUB/ddrhaiB1S50D/MJLp3kcdgWZJTRqJVK5uusRPPEJ1Ty/3Vd6fJFEGsEUUOhQI1wLu7/J8iwKGk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774275673; c=relaxed/simple; bh=dM1ho3K1pM1ep1hrRS1McrX7X+5cXAHAdK2XAZU3dXo=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=MWTnzSOCrsEPYgLdSObmsnkMyR1vhMsXpCTgj9QliGyuT78CCt3/uYQ5n/QGEzY2y0NiykpFNRvKPts98UEHh0/m3zTP4eXlp5tZHaOCode/pGxkwALAbaxazIzkjStrNJ2Jwop+k9v9FKowXWHl87QnJRq5WPwmpCZCL63FSqY= 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=XaiO6of9; arc=fail smtp.client-ip=52.101.62.61 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="XaiO6of9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=O3KgN9NpwWeedxdGmegm2IYE7lQFXSqb5wYLMaisbEPcCDIFUlyprZObeGumAF43euYXAHSHlE4tugUx1l6i/zUT0rBJN9LncOYAaG8i7B6vBBMrdBI80HBCoegW9lo5xFXlgZJ4BlMfEGTLWbdBN1d4jS/3TUPdxmXfvg9Q7/DRiON2qWxkDKzTT5KshK5ok4i/CWzCAvTM7gDLR/NsEBQcXkcWfui0L6hfquGUzG7bjqeFg/fLcLvv/w1mNZ8qwDijtOO/jiZb2FvbDtf0+1BcRw8JgT5D75v5+zgIzXcXOsEKSj9OIsgcw5OvkkCWrgcWHnRqmE1VCizovI+1Ng== 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=8rknWpS4LgoYZHECnLHruXdkXFO8hDSXhTHGjL15WXM=; b=JWICfU0bYgOzxucbAUp6qa1ACC/JCkAYO/4V25F0uOcanJU7BnUxxWGUbNUGfd8ZyE6e9LPDRouGP6jdJJML1I7HTYxorfY6I43b8nNOsUk0AG8Qn8Vn+5PmZxtZaVB5r4Ca67c6kuokrADOH2YU9sueX7QxsOeUAXFGjEcwT21Nk4Biy3R5Gr7R8aTIh5ldVf4fAC/M1Jk56Nk07dDmRCDxnGPhSt8bq/BTSgE3N3yHWxUKLTXef1rJFfKv/G1ed7mCRofgflyHFdPo31rcZwKvt87ui0alem24GEo7R7outcJAy+Usy1BaOivICDvek7sFdgh+i7w1IAvlqPmUdQ== 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=8rknWpS4LgoYZHECnLHruXdkXFO8hDSXhTHGjL15WXM=; b=XaiO6of9mpxwSPG3ZjXzLzGjDvxC3SPZnI//p1WTfT6zDTpwT5qiHZMmemP2w++0FG/ndsxbf9N9nbOy2z4xVhJTvVBYqdnfF9zSYwf1y0yf8eR9ILsn/YHSnBk3LwDjTxs2rz+xB/N40a3bCv8Z3PcwI28Dg9T8e3dEzYRf7iw= Received: from SJ0PR03CA0299.namprd03.prod.outlook.com (2603:10b6:a03:39e::34) by BL1PR12MB5732.namprd12.prod.outlook.com (2603:10b6:208:387::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9745.20; Mon, 23 Mar 2026 14:21:06 +0000 Received: from SJ1PEPF000023CD.namprd02.prod.outlook.com (2603:10b6:a03:39e:cafe::af) by SJ0PR03CA0299.outlook.office365.com (2603:10b6:a03:39e::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9723.31 via Frontend Transport; Mon, 23 Mar 2026 14:21:02 +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 SJ1PEPF000023CD.mail.protection.outlook.com (10.167.244.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.19 via Frontend Transport; Mon, 23 Mar 2026 14:21:05 +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; Mon, 23 Mar 2026 09:21:01 -0500 From: Shivank Garg To: Andrew Morton , David Hildenbrand CC: Zi Yan , Matthew Brost , "Joshua Hahn" , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , , , Shivank Garg Subject: [PATCH] mm/migrate: rename PAGE_ migration flags to FOLIO_MF_ Date: Mon, 23 Mar 2026 14:19:37 +0000 Message-ID: <20260323141935.389232-3-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 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: SJ1PEPF000023CD:EE_|BL1PR12MB5732:EE_ X-MS-Office365-Filtering-Correlation-Id: be3e17bf-9dd7-4a26-53fa-08de88e76b9e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700016|376014|7416014|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: 7FwyeJLph9nwhYj0v2XguVPrGKlUK9wrCd6loEFQqBZl49nqhQTeeLKDlhUmQl/JdbMMHCd+66VaNku+ugI9QY9lmmONVufOZQ/LS2PGz63Kdzw/4YW3/sTHd+AvjHpUmoRWsCfB4wzi9gVNOCZd4FE64C1c5/drNNLx45qx6gWaYWSK/dvwWSK7BIPFuHCk/NEdwihVOqinKgBWkkJLIZgL8rSyjlyAdwsB6Jm+fPNkoKSyH5idNqhlp1LmoKzqfublo2oYdfyKVy8o/HMizp8/N962l5asvxhumeLXKByHqM89EnzAp0J/dCL04tCdfqW5aqWNYI7aRxVL/+C5oXFXnc+t/TdBhCn5zzd8EqzGjOut3FdzqczsBo1GWmXfj2L6Wlyi1GgpckJaSVvcvhIHdFfeV1Z82DAQtG/g+1xiLDTVR6uNNPHejZ7CMCF3HHnU2BPYnyvVUVM6I/gR5XrKM89GnRtO847W4wvWDeVyhqe9ZWbVxwbRsi3eBuk7WQiMBlJ3YkajiXY6hmlGWnuyahuQYiKLurjjH+RhQHoKI4oA5r7wey5RlCFTnuj+0kJA/CsWmj32wYuNq/J2qCngdY/Gm25VOIc4PFMALQrO/302z981TFNhycF/MDRg+bEECDciZ2kfqvVgLIwkT8ZbQCLFxdu2wSkHJF9jZmA9QKYRcCw3Z5IvmnqMV89nkWPCOzTBKRvY2co/uOTEiW7o5VIuwyW6XqR+7CMblrk= 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)(82310400026)(36860700016)(376014)(7416014)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TOMtPtEKT5EMfx8o7A+T5amwCFfztj24feKgki0AAU3/xlJOfH5a3bPqW2hqtWmN224lrlPW//aSxbQ0YCjRPG/11jD1TfejXVNpbvVoisVvhhfYXf85nfQKxKfTTQBgsL+WXHddgySg7M2dGz4U6E24Yywk30ydyzchWvE053iP6mZEjOVGAf69omNnVK2M0sd0kFckbNWkoRl3VRhwkmhoerJY7J2jqJ5SjTzyBUpnJyGQaOhW0uUm1Tdcpo75nlIZKnl/He7kcBhAcpWwvnG2mQ+xlj8ZvUAhmDhXr+Rf3xGA9kMb8oAOWciN3bx0rY7v8GWlpEVOuSGXG1zyHqkRIO2xcZU4/lLskf5cd2d8QcBW1P58LUxanf09jprmIXWOc4eQuN+qxEx2PKNqOGbWgDZ7RUC72EbrXzb+ShwORb1NVgujGcAyDGfUiFfF X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2026 14:21:05.6207 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be3e17bf-9dd7-4a26-53fa-08de88e76b9e 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: SJ1PEPF000023CD.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5732 Content-Type: text/plain; charset="utf-8" These flags only track folio-specific state during migration and are not used for movable_ops pages. Rename the enum values and the old_page_state variable to match. No functional change. Suggested-by: David Hildenbrand Signed-off-by: Shivank Garg --- Applies cleanly on mm-new Ref: https://lore.kernel.org/linux-mm/4bfec2c1-9747-49d2-a490-87ab204cec1c@= kernel.org mm/migrate.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 05cb408846f2..a1856321ae27 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1135,26 +1135,26 @@ static int move_to_new_folio(struct folio *dst, str= uct folio *src, * This is safe because nobody is using it except us. */ enum { - PAGE_WAS_MAPPED =3D BIT(0), - PAGE_WAS_MLOCKED =3D BIT(1), - PAGE_OLD_STATES =3D PAGE_WAS_MAPPED | PAGE_WAS_MLOCKED, + FOLIO_MF_WAS_MAPPED =3D BIT(0), + FOLIO_MF_WAS_MLOCKED =3D BIT(1), + FOLIO_MF_OLD_STATES =3D FOLIO_MF_WAS_MAPPED | FOLIO_MF_WAS_MLOCKED, }; =20 static void __migrate_folio_record(struct folio *dst, - int old_page_state, + int old_folio_state, struct anon_vma *anon_vma) { - dst->private =3D (void *)anon_vma + old_page_state; + dst->private =3D (void *)anon_vma + old_folio_state; } =20 static void __migrate_folio_extract(struct folio *dst, - int *old_page_state, + int *old_folio_state, struct anon_vma **anon_vmap) { unsigned long private =3D (unsigned long)dst->private; =20 - *anon_vmap =3D (struct anon_vma *)(private & ~PAGE_OLD_STATES); - *old_page_state =3D private & PAGE_OLD_STATES; + *anon_vmap =3D (struct anon_vma *)(private & ~FOLIO_MF_OLD_STATES); + *old_folio_state =3D private & FOLIO_MF_OLD_STATES; dst->private =3D NULL; } =20 @@ -1209,7 +1209,7 @@ static int migrate_folio_unmap(new_folio_t get_new_fo= lio, { struct folio *dst; int rc =3D -EAGAIN; - int old_page_state =3D 0; + int old_folio_state =3D 0; struct anon_vma *anon_vma =3D NULL; bool locked =3D false; bool dst_locked =3D false; @@ -1253,7 +1253,7 @@ static int migrate_folio_unmap(new_folio_t get_new_fo= lio, } locked =3D true; if (folio_test_mlocked(src)) - old_page_state |=3D PAGE_WAS_MLOCKED; + old_folio_state |=3D FOLIO_MF_WAS_MLOCKED; =20 if (folio_test_writeback(src)) { /* @@ -1302,7 +1302,7 @@ static int migrate_folio_unmap(new_folio_t get_new_fo= lio, dst_locked =3D true; =20 if (unlikely(page_has_movable_ops(&src->page))) { - __migrate_folio_record(dst, old_page_state, anon_vma); + __migrate_folio_record(dst, old_folio_state, anon_vma); return 0; } =20 @@ -1328,11 +1328,11 @@ static int migrate_folio_unmap(new_folio_t get_new_= folio, VM_BUG_ON_FOLIO(folio_test_anon(src) && !folio_test_ksm(src) && !anon_vma, src); try_to_migrate(src, mode =3D=3D MIGRATE_ASYNC ? TTU_BATCH_FLUSH : 0); - old_page_state |=3D PAGE_WAS_MAPPED; + old_folio_state |=3D FOLIO_MF_WAS_MAPPED; } =20 if (!folio_mapped(src)) { - __migrate_folio_record(dst, old_page_state, anon_vma); + __migrate_folio_record(dst, old_folio_state, anon_vma); return 0; } =20 @@ -1344,7 +1344,7 @@ static int migrate_folio_unmap(new_folio_t get_new_fo= lio, if (rc =3D=3D -EAGAIN) ret =3D NULL; =20 - migrate_folio_undo_src(src, old_page_state & PAGE_WAS_MAPPED, + migrate_folio_undo_src(src, old_folio_state & FOLIO_MF_WAS_MAPPED, anon_vma, locked, ret); migrate_folio_undo_dst(dst, dst_locked, put_new_folio, private); =20 @@ -1358,13 +1358,13 @@ static int migrate_folio_move(free_folio_t put_new_= folio, unsigned long private, struct list_head *ret) { int rc; - int old_page_state =3D 0; + int old_folio_state =3D 0; struct anon_vma *anon_vma =3D NULL; bool src_deferred_split =3D false; bool src_partially_mapped =3D false; struct list_head *prev; =20 - __migrate_folio_extract(dst, &old_page_state, &anon_vma); + __migrate_folio_extract(dst, &old_folio_state, &anon_vma); prev =3D dst->lru.prev; list_del(&dst->lru); =20 @@ -1395,10 +1395,10 @@ static int migrate_folio_move(free_folio_t put_new_= folio, unsigned long private, * isolated from the unevictable LRU: but this case is the easiest. */ folio_add_lru(dst); - if (old_page_state & PAGE_WAS_MLOCKED) + if (old_folio_state & FOLIO_MF_WAS_MLOCKED) lru_add_drain(); =20 - if (old_page_state & PAGE_WAS_MAPPED) + if (old_folio_state & FOLIO_MF_WAS_MAPPED) remove_migration_ptes(src, dst, 0); =20 /* @@ -1439,11 +1439,11 @@ static int migrate_folio_move(free_folio_t put_new_= folio, unsigned long private, */ if (rc =3D=3D -EAGAIN) { list_add(&dst->lru, prev); - __migrate_folio_record(dst, old_page_state, anon_vma); + __migrate_folio_record(dst, old_folio_state, anon_vma); return rc; } =20 - migrate_folio_undo_src(src, old_page_state & PAGE_WAS_MAPPED, + migrate_folio_undo_src(src, old_folio_state & FOLIO_MF_WAS_MAPPED, anon_vma, true, ret); migrate_folio_undo_dst(dst, true, put_new_folio, private); =20 @@ -1777,11 +1777,11 @@ static void migrate_folios_undo(struct list_head *s= rc_folios, dst =3D list_first_entry(dst_folios, struct folio, lru); dst2 =3D list_next_entry(dst, lru); list_for_each_entry_safe(folio, folio2, src_folios, lru) { - int old_page_state =3D 0; + int old_folio_state =3D 0; struct anon_vma *anon_vma =3D NULL; =20 - __migrate_folio_extract(dst, &old_page_state, &anon_vma); - migrate_folio_undo_src(folio, old_page_state & PAGE_WAS_MAPPED, + __migrate_folio_extract(dst, &old_folio_state, &anon_vma); + migrate_folio_undo_src(folio, old_folio_state & FOLIO_MF_WAS_MAPPED, anon_vma, true, ret_folios); list_del(&dst->lru); migrate_folio_undo_dst(dst, true, put_new_folio, private); --=20 2.43.0