From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011026.outbound.protection.outlook.com [52.101.52.26]) (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 64D1F384233 for ; Thu, 13 Aug 2026 04:24:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.52.26 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786595086; cv=fail; b=Sj/mguBkQtbqY5rx6O0ftuAeeiy8EnXlYtQFAdxVup/4WJJNTrR1y9WUAwcinKNzsiCgcRmnWSjHbp1EKfOWx8tPwzmWx6nzhe+QQQYZLhNk89bOaDfLiR6sYL4vLQQQTWZ9LCXM4pdf4SikNseAhldlgnjKVeAlCzO2UdYC2Ek= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786595086; c=relaxed/simple; bh=XPr8YUsucdGRr57yCFjtBHp/S9a5uQAWQYAef73VHRg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=mOz3tIZOXGYwm40TLCrZUYnPcjvdrZ5whaAQeYKzKVyVbomvxZHRzU24t+sekNCB8/gTCSVUkwOCGdLHne4aKAgoNnSmONgWLQAZBJ8Ul38DgqQViYGozbhXBVxYUfRfgrvgDFFH3FsmWYiyvJBQAow6xZFIYqi1Snupuxr+B4A= 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=mnqDn7Q0; arc=fail smtp.client-ip=52.101.52.26 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="mnqDn7Q0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=moEOJ8v6aUgy+egCipR0DnZFrF6C8mz+yj/IFPim2Eie65lyhK23yQdQHtVMZNfPWsPpfEZRkh+3KAMzPY5x9W+GoGcwgMxTGrhMJa23NHb2hP92h1xPYUJvCjsiun0UYCa2vzNs8fgE3mNvAgLz8V68JPEXoF7Ag1P2YTxmoyjgdxATKQyqKTcbHNnAbAVmKUJ+FK3afZTlVf6zaTlZ3UIAqMrOzlRPTY0hALigcEmdjA5+YGWdLoqgk579sloC2W0Xo1QKOgnWaLsLBkJNOSxI0gZbaS74uF7rgzXj0fkobs0vKeZ56WL4+51OTZtcN4PBaGB7z/XyXTGo+ikQcQ== 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=ZRqRWWSb5j6yTTmBTX55vjP5pv3HsdIGpRfv7y0RJsg=; b=bVqoH3GHKg+6UFN6P1O8xlKnd58jMuqyOMF2U9usiQkboyqctO9+4weaBWWlJPofTaMFGJqLfTzbdT99jZFzPo9DOX6PewHJ6SG9HAaZz9b8MXatHy1xAlojLz2acecTgAJ7fauwfiXeyfnGKRW5qSru3NM7Fh/2zI3nbcYo7tFAMvr6NcTqlkwVpk88ZQDLvoSq6Td6u5nzJn7kQT0mBiyUylV9TY7jceatBbbXiClnkKPl2neSD/vnEqC406bJxAQbDF7Mi1wsZYUNLCBXYOWnkIPD6K9CkOIu7QHr0+UC41oSfpDzwh8hnnHPuKb43fCC/5vtsfzIfcM1/sTUuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=surriel.com 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=ZRqRWWSb5j6yTTmBTX55vjP5pv3HsdIGpRfv7y0RJsg=; b=mnqDn7Q0sylZgz05kW2C3N9JljzhEuFQQRpapsGlGkz208IRVlTVlYj83P5i5/c4ZQLQ6HiyntlP5yF6KkP9OS+e+WlkG/F2goy4hvH3tJHPm8dj665jGIdWjrrLVM0FSdbWQIo2uq36Xc/xbSUoFSKLrDeJDvYhvY+a0Mxmzcg= Received: from BN1PR12CA0024.namprd12.prod.outlook.com (2603:10b6:408:e1::29) by DS0PR12MB8070.namprd12.prod.outlook.com (2603:10b6:8:dc::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.14; Thu, 13 Aug 2026 04:24:39 +0000 Received: from BN3PEPF0000B36D.namprd21.prod.outlook.com (2603:10b6:408:e1:cafe::76) by BN1PR12CA0024.outlook.office365.com (2603:10b6:408:e1::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.315.13 via Frontend Transport; Thu, 13 Aug 2026 04:24:39 +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 BN3PEPF0000B36D.mail.protection.outlook.com (10.167.243.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.0 via Frontend Transport; Thu, 13 Aug 2026 04:24:39 +0000 Received: from [127.0.1.1] (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.45; Wed, 12 Aug 2026 23:24:31 -0500 From: Shivank Garg Date: Thu, 13 Aug 2026 04:23:16 +0000 Subject: [PATCH v2 5/7] mm/rmap: factor out migration PTE construction Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20260813-migrate-rmap-batch-v2-5-3c5424c555c7@amd.com> References: <20260813-migrate-rmap-batch-v2-0-3c5424c555c7@amd.com> In-Reply-To: <20260813-migrate-rmap-batch-v2-0-3c5424c555c7@amd.com> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Rik van Riel , "Liam R. Howlett" , Vlastimil Babka , Harry Yoo , Jann Horn , Lance Yang , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , "Alistair Popple" CC: Karim Manaouil , Frank van der Linden , Kinsey Ho , Wei Xu , Bharata B Rao , David Rientjes , Dev Jain , , , Shivank Garg X-Mailer: b4 0.15-dev-47d62 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786595034; l=3397; i=shivankg@amd.com; s=20260518; h=from:subject:message-id; bh=XPr8YUsucdGRr57yCFjtBHp/S9a5uQAWQYAef73VHRg=; b=q81NvIpe7hWML/CjPNB/HNBJcafRJrFxDfh1/7ESLRM1OrkP01YOlvJcanhOI0SgCeFJaQ5zG wV37t8RWhQWByM9dW4Z9BKaU3ke+DXV0b8J8CI9CcdVK27+aUmRnW7Y X-Developer-Key: i=shivankg@amd.com; a=ed25519; pk=2l2QGTeXuGkZTtfmx0nPQU8iFZfjYmX/ymMojitevx4= 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: BN3PEPF0000B36D:EE_|DS0PR12MB8070:EE_ X-MS-Office365-Filtering-Correlation-Id: f70c63a4-5ef5-434e-5573-08def8f2ca6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|7416014|36860700016|82310400026|1800799024|921020|56012099006|10067099003|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: rdubjEIDasCMRV/3tXRrH68mMi4Y+oJgKnPOVInXGXmJm0QajC/P/EgogpeI+GrHZDwfwpVBXzdLAvkzefcgNHRE9Y8/I0+8wTvYLq6JarYafJeo89GUsoV7vXT1QLBeDJ8vTaeGH2A+XjY3G7ONKzzQVQ1RevEPeC0QruqXIJq1Wp9iaEOeGKlst+k/b0IG/aWNlq3YWpbwdD7erUxOhYm37QOt0fk/607V5vT6HkWk9YATnXL97glzvoP1eve7k6ZCTEOsG3qFyeP51j/k23bfzhOlGltYxuPQNMqq8YB7mv9jxDC5UGEsGWZ3ugV3szDcOy2kp0GC7hvaIFVlwtcbxVaeESgCQjyYC8JX5pc+vWrkXENxD6TY8qhRBwUeUlqOO7ephrsCz9NfK86E344h9GQ/dLQdQoclSM79hJ0SDjBvbiElptfqSPV7YBOPthqdZSR5kA72rZPOI8BB4B3U3PVz9bOCiRh57yePEooBj2E84EUOM3jYpVUWSMasIqTvos8mxZs0L82dSGgULLBz5YJ0mVdZPcUm+BKuXFwC142uEcGmSKJeRYkz0Nt3Qwg7WLnLbsIYEgdn+z3xt0bPiAj+w9Z6QbsBtV6tGnWOuxx6yuwr4b3kNeA7q4rbjiQ5bCUcCW+zBvMUl6JKq1FvkUh04duWHwAqAYsKuH69RHV5SIBZ0L6ddUN6WvmubUhb82rB3h+MWVAsNzqUPL/RFfo0aUB/+xpiTZOMw6M= 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)(23010399003)(376014)(7416014)(36860700016)(82310400026)(1800799024)(921020)(56012099006)(10067099003)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UAFB79WREz4yPOCC8bYcuNHTIq88dnvbNA6kU4z+lvARH3BeytrQWIgGmSyHfRGi52I2KvRLNMB6/L+v9uq6b081lvCAKe1i/nVtrkm+zHboazck8A1Q1JNZPh7JV7XOQX6tvHC4nOSZnBkrlKn/qYWxmQFRf2UWJ6VE7Zn6AIjcWZS7j2X/meXuOAZ3cxzECRFRNW7vix0DN03oiU+sT/SKj66A5WoHSFiPQJDcpNA3fshbNdPMCeAF20uzTUs92mtjQsk/pYsESoXMXC7HdDa0FwsaC2dd3sqI+MSLJem7UYiHAnFqwUHc8pLo6yQQYpVOyJgtsxQSXqq+GY9V65GcEZ96JE0UGW7+MEYbG2ntfva7xYF2+REFwcXuqarQWK9In8VdEydHqmc62crLt7ZL3OVv6DWNHiltwFeCjmeo3q1EQ8YoorwVqPtpQLvj X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2026 04:24:39.4515 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f70c63a4-5ef5-434e-5573-08def8f2ca6a 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: BN3PEPF0000B36D.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8070 try_to_migrate_one() constructs the migration PTE that replaces a present PTE or non-present swap PTE. Factor it into make_migration_pte() which can be shared when the hugetlb migration path is separated. No functional change intended. Signed-off-by: Shivank Garg --- mm/rmap.c | 65 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0a4a0945dc65..8b89e32ae489 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2507,6 +2507,42 @@ void try_to_unmap(struct folio *folio, enum ttu_flags flags) rmap_walk(folio, &rwc); } +/* Build the migration PTE that replaces pteval for a page. */ +static pte_t make_migration_pte(struct page *page, pte_t pteval, + bool writable, bool anon_exclusive) +{ + swp_entry_t entry; + pte_t swp_pte; + + if (writable) + entry = make_writable_migration_entry(page_to_pfn(page)); + else if (anon_exclusive) + entry = make_readable_exclusive_migration_entry( + page_to_pfn(page)); + else + entry = make_readable_migration_entry(page_to_pfn(page)); + + if (likely(pte_present(pteval))) { + if (pte_young(pteval)) + entry = make_migration_entry_young(entry); + if (pte_dirty(pteval)) + entry = make_migration_entry_dirty(entry); + swp_pte = swp_entry_to_pte(entry); + if (pte_soft_dirty(pteval)) + swp_pte = pte_swp_mksoft_dirty(swp_pte); + if (pte_uffd(pteval)) + swp_pte = pte_swp_mkuffd(swp_pte); + } else { + swp_pte = swp_entry_to_pte(entry); + if (pte_swp_soft_dirty(pteval)) + swp_pte = pte_swp_mksoft_dirty(swp_pte); + if (pte_swp_uffd(pteval)) + swp_pte = pte_swp_mkuffd(swp_pte); + } + + return swp_pte; +} + /* * @arg: enum ttu_flags will be passed to this argument. * @@ -2737,7 +2773,6 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, */ dec_mm_counter(mm, mm_counter(folio)); } else { - swp_entry_t entry; pte_t swp_pte; /* @@ -2779,32 +2814,8 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, * pte. do_swap_page() will wait until the migration * pte is removed and then restart fault handling. */ - if (writable) - entry = make_writable_migration_entry( - page_to_pfn(subpage)); - else if (anon_exclusive) - entry = make_readable_exclusive_migration_entry( - page_to_pfn(subpage)); - else - entry = make_readable_migration_entry( - page_to_pfn(subpage)); - if (likely(pte_present(pteval))) { - if (pte_young(pteval)) - entry = make_migration_entry_young(entry); - if (pte_dirty(pteval)) - entry = make_migration_entry_dirty(entry); - swp_pte = swp_entry_to_pte(entry); - if (pte_soft_dirty(pteval)) - swp_pte = pte_swp_mksoft_dirty(swp_pte); - if (pte_uffd(pteval)) - swp_pte = pte_swp_mkuffd(swp_pte); - } else { - swp_pte = swp_entry_to_pte(entry); - if (pte_swp_soft_dirty(pteval)) - swp_pte = pte_swp_mksoft_dirty(swp_pte); - if (pte_swp_uffd(pteval)) - swp_pte = pte_swp_mkuffd(swp_pte); - } + swp_pte = make_migration_pte(subpage, pteval, + writable, anon_exclusive); if (folio_test_hugetlb(folio)) set_huge_pte_at(mm, address, pvmw.pte, swp_pte, hsz); -- 2.43.0