From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012070.outbound.protection.outlook.com [40.107.209.70]) (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 A84AB373BF1 for ; Wed, 15 Jul 2026 05:14:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.70 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784092503; cv=fail; b=DuQKs/t8OJ6jsHFxkHmbe6MJZnVaW//w7BxEVT97pGV/HnXgrm+YywKAZ9C754T8GMeq8a5Ez/iife26YOjhd1o0ePHD5oGft3eBOr67QOka9rePzH2lMT8BHsleaTeRhL5NKvPnN1gEzRZJWrJUkRHeKXM26sIwYXtCRl1SnaY= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784092503; c=relaxed/simple; bh=+tuZBdF+pu0jnFIWox5EYuekpUHuYPnkwABJ79DNPfQ=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=g8pkubK8TRyCbSU3k3U6vVrZUvO+QmVKiqrrnrgAKWMJAaxnSTz3LmijUdRhMLeMlu8EKuCuwrqvcJ2oby7yy8C9ySuhyjCpUrRrP4yMEH/aWpxewaL4B3UG95ehqCU1sc9CzK4ueILgADK0V8kf1aE2kvhpWsYNSpN5VaLd8vU= 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=x02gbIO9; arc=fail smtp.client-ip=40.107.209.70 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="x02gbIO9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IYuTfzV32/aMNqGnTVqWq/IEYrIGa13vR5t5S9Ov9fXYPIjrSEf4pkgoO3o3uhhkKEfXXTZpZ1f8Gyv1dn3445UVH4sm33FUHzmu6TChSBUysQY3WmKnudlnJ4a42VJGsqslOGw8fWdq0sAutTip2P5eUX09qQG17kbGC3q7r/OBtApA/1U4/7gWL5UCVD9xwRT/T2WggHZjQDIVjcUDg4gXOkYUdt+CajpPiByYK8/MdPlr5JWqEkybV32mHoLhQFH+0/c/XxnorwJoFnf+TiJWzyU2Ab700IBlccY59i4gMx6oXRJIvMhzfeVHU4qnZnEbt9ImbJgapedJPpDKCg== 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=QjB3NJheqqKLN9XlD1OrIrZTfGTM4n68oGtNfCuYE74=; b=CKQajcwEitPx0lKd/9QG86an8xpXwRnoq+GiQsKqpiRA5gUdHT6qizI7Z7qi1Fxg1P31sU58bNADhouqweq8otZ74lJAt2P4aqo/wgyWJzmCg5O9g2lwM9GivMgCrtSaHfPyqScWWz/35MuOv9RwVIh7+GonId96EyP5jbuM/NVqFz2fN1yuSqb6ae4uYhpw/SI2oKSKuNpE1RjIsCqeVrxd4F9U0wloaX9oNWncjEeCqw+spyUUPgWwPV1wUhMUk7cEBQ+J9STNMzZ2P1bazV3ywousB5CTlR9OjCK+QOyTbPxYezq16J/vaWnFryU2IbNg6S1tI/+00zRD13Y6wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.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=QjB3NJheqqKLN9XlD1OrIrZTfGTM4n68oGtNfCuYE74=; b=x02gbIO9sqTXmOytcDOMWkeVaui3bgWkUyUNz5S2joGjIuxoAO3U7EKzBXQ12EGAwURARGeR8+Hrw4qMZSGQVYg53zAEn2IjBkzkf2Ojt3qf2L+caKdzDenBH0fogk7kgmyScTDBG69TyoC5h5o6PqYhwsrXCVWOzi3eTNnl4z4= Received: from CH0PR13CA0002.namprd13.prod.outlook.com (2603:10b6:610:b1::7) by BL1PR12MB5946.namprd12.prod.outlook.com (2603:10b6:208:399::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.10; Wed, 15 Jul 2026 05:14:55 +0000 Received: from DS2PEPF00003441.namprd04.prod.outlook.com (2603:10b6:610:b1:cafe::5b) by CH0PR13CA0002.outlook.office365.com (2603:10b6:610:b1::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.223.10 via Frontend Transport; Wed, 15 Jul 2026 05:14:55 +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 DS2PEPF00003441.mail.protection.outlook.com (10.167.17.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.9 via Frontend Transport; Wed, 15 Jul 2026 05:14:55 +0000 Received: from [10.128.124.134] (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.41; Wed, 15 Jul 2026 00:14:46 -0500 Message-ID: <707dbfda-baa0-4ad4-b718-5857b2844bd0@amd.com> Date: Wed, 15 Jul 2026 10:44:45 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/6] mm/migrate: split remove_migration_pte_hugetlb() out of remove_migration_pte() To: "David Hildenbrand (Arm)" , Andrew Morton , 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 , , References: <20260712-migrate-rmap-batch-v1-0-872a734431d1@amd.com> <20260712-migrate-rmap-batch-v1-3-872a734431d1@amd.com> Content-Language: en-US From: "Garg, Shivank" In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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: DS2PEPF00003441:EE_|BL1PR12MB5946:EE_ X-MS-Office365-Filtering-Correlation-Id: cc8e7369-fb3e-4d77-65a8-08dee23001fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|82310400026|7416014|36860700016|376014|921020|18002099003|22082099003|11063799006|56012099006|4143699003; X-Microsoft-Antispam-Message-Info: TK+P2WMM3QwjcsXL+YTiEVRHest91kLFbZeSNXhlXUrSxV1GkUz8+71ouJlnK++aI6aD+Oqh9HEapWIvnIaCroI1FHbNvRdDq6RhKu/+wXFa3RS05AggkartxgZeH9rs2UIgvhvF8fvu8UJLe1mhmqyE7+G1Dm25JEP8V/bXkLBKxkKYXlLuOW+0ED/TunQB/4eOAbAhTWRCo2qfFEu8fzJ+EkW5wXhROLUMaBLoECWe7mOlzdZGXgIgZiy1tZBc0Dk7+uhYI4iIL3kQeHMh3pXsTixyUukvBQkvoz3H88DEDFT0vfGwMK1F+iucTsgehdQkxGg4iQOVecJZ4f2Ad22Xxwfqtq0KwrcNXJWI0y2hlT/UfKsZ+kqF0zWvJ3CsEzNwRRP4Yy2Ph9v3pxIs0mZjM9eQrAaumLdqopZCRxVwSHjaCPg5yP4OZGk66Z+nvdLJqT+X39Dsdaa54tm836I3iJYXuPNbE/XQxymopZ/2k2LBKPh82h2w61u/QnAZeNAcQzEzDPeGyOUjk8DE6y+zwzT91GEEZwNTwQ00o05y43S4l04GTcyIMVerCUz+NWa9GRX3A55EEaFdVNtZ0DHf3Bpx5tknn7Gqjz/rQ6eevrmc758zQenYiBaaAkfTxyAqn6FTO4SeMJwAMJbkSCb+cHVR/mZN/P97k7Ci8+QMKazl+dAGQ0XCn0cDHGxxV+E6SYdmRddm59p/IvH/cxJB9Colq9dmHxbcMci9QO5mkE8MFUMTzWxL41OlwR/v 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)(1800799024)(82310400026)(7416014)(36860700016)(376014)(921020)(18002099003)(22082099003)(11063799006)(56012099006)(4143699003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MB7mbopuo/mdzYQlr0NrUXqWtxbxkbrA4ODaa6vNTwVSOUJLJGKBVQq/XcmsH7RjLPZZgKwwc3ugEj68RuOmkG5Wt3AIbBf9akDW1/FgXuOz2EcZ1HmFwCX/U8xA3fSKpQ8HNDLjP1W+hkpGjx6V0Sgoq9JhvyT5VVpAcNDsUkK4TwHCXm9xvuPshWNguKVOOSLUM2jKK7/gY1vPhL8byS9U8yNUM3/ac4XB6o/Bo2WqY8dlCBc2312fUdvxAa6UJ/SCLNCVhccURa0A+0kPA9ZKLFjUIYZuDyYZkw/aD4ly77bS4OKDIcyoWt98r3LzJOyNgUWzgzSYlCgESg3xuDXGGRZp7Eg/PzRJIsj9ofptPGlI20Gy0u1Qn2pYJV9eELnAUjtork/HgM/tiUYJNhaKSsMQLWIIFH4ERKaQ7OD3cpAUKRhZE4RlwzMMmCgB X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2026 05:14:55.2089 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc8e7369-fb3e-4d77-65a8-08dee23001fd 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: DS2PEPF00003441.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5946 On 7/14/2026 6:10 PM, David Hildenbrand (Arm) wrote: > On 7/12/26 09:38, Shivank Garg wrote: >> remove_migration_pte() interleaves the regular folio path with the >> hugetlb path via folio_test_hugetlb() and CONFIG_HUGETLB_PAGE >> special cases. Simplify this by seprating the hugetlb handling into >> remove_migration_pte_hugetlb(). >> >> Factor out working-PTE construction from migration entry into >> migration_softleaf_entry_to_pte(), used by both paths. >> >> While here, convert the VM_BUG_ON_FOLIO() to VM_WARN_ON_ONCE_FOLIO(). >> >> No functional change intended. >> >> Signed-off-by: Shivank Garg >> --- >> mm/migrate.c | 153 ++++++++++++++++++++++++++++++++++++++--------------------- >> 1 file changed, 98 insertions(+), 55 deletions(-) >> >> diff --git a/mm/migrate.c b/mm/migrate.c >> index 222c8c15f782..8a098402b8c9 100644 >> --- a/mm/migrate.c >> +++ b/mm/migrate.c >> @@ -345,6 +345,89 @@ struct rmap_walk_arg { >> bool map_unused_to_zeropage; >> }; >> >> +static pte_t migration_softleaf_entry_to_pte(struct folio *folio, struct page *new, > > "migration_entry" should be sufficient, right? It implies "softleaf". sure > >> + softleaf_t entry, pte_t old_pte, struct vm_area_struct *vma, >> + rmap_t *rmap_flags) >> +{ >> + pte_t pte = mk_pte(new, READ_ONCE(vma->vm_page_prot)); >> + >> + if (!softleaf_is_migration_young(entry)) >> + pte = pte_mkold(pte); >> + if (folio_test_dirty(folio) && softleaf_is_migration_dirty(entry)) >> + pte = pte_mkdirty(pte); >> + if (pte_swp_soft_dirty(old_pte)) >> + pte = pte_mksoft_dirty(pte); >> + else >> + pte = pte_clear_soft_dirty(pte); >> + >> + if (softleaf_is_migration_write(entry)) >> + pte = pte_mkwrite(pte, vma); >> + else if (pte_swp_uffd(old_pte)) >> + pte = pte_mkuffd(pte); >> + >> + /* See do_swap_page(): restore PAGE_NONE for RWP */ >> + if (pte_swp_uffd(old_pte) && userfaultfd_rwp(vma)) >> + pte = pte_modify(pte, PAGE_NONE); >> + >> + if (folio_test_anon(folio) && !softleaf_is_migration_read(entry)) >> + *rmap_flags |= RMAP_EXCLUSIVE; >> + >> + return pte; >> +} > > Can you move splitting that out into a separate patch? IIUC you can do that even > without messing with the hugetlb stuff. > yes, will move migration_entry_to_pte() into separate patch. Thanks, Shivank