From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.48.46 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1795072356; b=xxRB6fKPdib4RtwQkEkE8mhMSkEl+jFh2ajeg3lj6cskgKI7AasGruTCMKxyPyoF7q0t s9jU4CfwH03vsmpsIZqz1ENDb7MOA4+BHSiYeH78PHpzmFI6lEZIF56TBN7gvb8+cecu6 RFhnEZ/DCNS2O8bF+9KMzN1FoIBqvfrL1bcq1DGeoLBE3OpwlW4AEVNhORGcdPy9W+C5E rr14zJdhha31ZMGZ90/5nmK2fdFnd84kk8igyD2OWgDqYxxi/1aLh+z/qLCAYjeEHf3CW sNFTj+beAF+5S80lRBnDF7GSEs9AqVOxXI8ZoTlZR9MINCj21ArMU/l22WIvn/B7nSQ== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795072356; h=DMARC-Filter:DKIM-Signature:Received:Received: X-MS-Exchange-Authentication-Results:Received-SPF:Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-ID:References:In-Reply-To:To:CC:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Originating-IP: X-ClientProxiedBy:X-EOPAttributedMessage:X-MS-PublicTrafficType: X-MS-TrafficTypeDiagnostic:X-MS-Office365-Filtering-Correlation-Id: X-MS-Exchange-SenderADCheck:X-MS-Exchange-AntiSpam-Relay: X-Microsoft-Antispam:X-Microsoft-Antispam-Message-Info: X-Forefront-Antispam-Report: X-MS-Exchange-AntiSpam-MessageData-ChunkCount: X-MS-Exchange-AntiSpam-MessageData-0:X-OriginatorOrg: X-MS-Exchange-CrossTenant-OriginalArrivalTime: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-Id: X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: X-MS-Exchange-CrossTenant-AuthSource:X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-FromEntityHeader: X-MS-Exchange-Transport-CrossTenantHeadersStamped; bh=ti6Q8NwU6rLxuKZmbpETuA7l6PGp3sE+983E4kQfl/g=; b=sQWb59L1EVvl8Y4YFwAGYBFJ/cSaoGYugqI3xESqALsF/2UfSBnN5rlmGfgXSf1jNEH/ qBx2e00Zrt47nN3MkhpwPSGI4WsztxrdYHZtKIa3hYrxDl5eYc+Zzzb5BN1HRuXQetOum t4mfAUL4+bgpafr9PxdKPu2vEwOiIAqdCXHbn6Ox+rkxpDxPy7FsPQgF53B7RaXB5WG9x fa9xpKrf0X/EhU59pmq0GqaMhWjkSiZeACbn2qIG3Ete0uvQIhh1ieYDed0fCUnb5pG2b e8kBo/LFGtgoTwuvc1z5LXhhu9RtNtrKChp61OdTsA4mkRXZT244dXmFOBUz0LlahAw== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=0EWDYCWu; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.48.46 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012046.outbound.protection.outlook.com [52.101.48.46]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (secp384r1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A42DA606A324 for ; Thu, 19 Nov 2026 07:12:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A42DA606A324 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, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=0EWDYCWu ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IRa94FUBGRzu5PmNhEyCYs6tRRv7Gk4NmG+m0ag0e9h72dLbLKiDpXvbO91m9qbGXd0wQ5ws1gR96olq2bo/mkKbaWUEdMBnsSGMfJR2wiLZPCRO+DvdMRd1viccYakVjectAHen0CHkRGRws70eHDxWKNI7SUbZx/13WdpueaT+QNj5z1+QLsb9WyaSUsR9iWyDATn0VaePaHnLA4rBtEnxKloyAW+ATbHOILD7G8kyjKHLv0NyrNx4loHD3aQYBpJ8Oh8IIvqTLw79anZOKDHB0QQP0xH8BkDFnh8OwIWEEDm95d+s6L/KDXbFiX5tjM3Rw8GCkxyGGzFTY4dK/g== 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=ti6Q8NwU6rLxuKZmbpETuA7l6PGp3sE+983E4kQfl/g=; b=Ff7HhaiJzKjKA4EWo82fLvmpkRMFncY8v9KWFIa1buQhRNBLECNeLP9oPvcJ/fBa85/frbc2/UY/i5GOeBIp8U4q+QcWpCJn1zkhINdAwML/DtUlktNtNlp0yK++8guxcMJiwZdiyphglJpft/sYsOX2srC3EGY4OjnECtr/gxi69X6u2TELVPqM7IK+v9/LQgYFPFKZXvdT0tjfhS1CV2z8zYijEWXlZFdukrjFa4Js8j7Nf7QwoiQUTIXTtSrxamtMhLLOs/i47uU0jB2ibYybLDPrVEv3hzftV7cL2E3BziYNgtz1SxD5E+WL37Ycso6vpnO94+vcF2PLImL6zA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.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=ti6Q8NwU6rLxuKZmbpETuA7l6PGp3sE+983E4kQfl/g=; b=0EWDYCWunYvzIjuhwm1NGznsen2udZKNVTEwdiz61E27JcGBeOwkZufVLF/YUxI1QHMWR/1zTbotXC5DwsIF7uRAWS3jyT28ujUg5+nYhYQUY4I75neFIMr1WsbY1MVC/w6PUbdIQVtqFmdNN+hbS0Fton+M6qsmXTX3b5ics/4= Received: from SJ2P220CA0013.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:5da::16) by DSWPR12MB999129.namprd12.prod.outlook.com (2603:10b6:8:36d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.639.10; Thu, 19 Nov 2026 07:12:29 +0000 Received: from SJ5PEPF000001EE.namprd05.prod.outlook.com (2603:10b6:a03:5da::4) by SJ2P220CA0013.outlook.office365.com (2603:10b6:a03:5da::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.14 via Frontend Transport; Thu, 19 Nov 2026 07:12:29 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; 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 SJ5PEPF000001EE.mail.protection.outlook.com (10.167.242.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.639.5 via Frontend Transport; Thu, 19 Nov 2026 07:12:29 +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.57; Thu, 19 Nov 2026 01:12:21 -0600 From: Shivank Garg Date: Thu, 19 Nov 2026 07:11:58 +0000 Subject: [PATCH v2 3/8] mm/migrate: factor out folio splitting on allocation failure X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20261119-migrate-refactor-shivank-v2-3-f4535bd0bc52@amd.com> References: <20261119-migrate-refactor-shivank-v2-0-f4535bd0bc52@amd.com> In-Reply-To: <20261119-migrate-refactor-shivank-v2-0-f4535bd0bc52@amd.com> To: Andrew Morton , David Hildenbrand , Zi Yan , Matthew Brost , Joshua Hahn , "Byungchul Park" , Gregory Price , Ying Huang , Alistair Popple , "Lorenzo Stoakes" , Muchun Song , Oscar Salvador , Yiannis Nikolakopoulos , "Bharata B Rao" , David Rientjes , Huan Nguyen , Baolin Wang , "Matthew Wilcox" , Hugh Dickins , "Vlastimil Babka" CC: , , Shivank Garg X-Mailer: b4 0.15-dev-47d62 X-Developer-Signature: v=1; a=ed25519-sha256; t=1795072323; l=3612; i=shivankg@amd.com; s=20260518; h=from:subject:message-id; bh=hnVcpC/MtHq9UiUQFoSjmi3Q3XV6n8NHdNn2Djo6ei4=; b=6sCR2895mdNlhvXOARhcTzdR1O3qwrBJw5Y7Jgwy2Qm53czi/itPSCdJo5qZDTNOLVWgjHGMJ ZDD4FbSbdu7CDIlJ5n9WUT96Dp3mGhppzFqKBOfm55umglQoMovtmSZ 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: SJ5PEPF000001EE:EE_|DSWPR12MB999129:EE_ X-MS-Office365-Filtering-Correlation-Id: a617aeed-2c98-4ad1-d2a7-08df460c7902 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700016|1800799024|23010399003|82310400026|921020|10067099003|11063799006|56012099006|261021123027099003|261021121427099003|261009223027099003|261102123227099003|261022105027099003|261022075727099003|261026140227099003|261026121527099003|261028144727099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: TzC+xkA5Adpz3WZnYFaHINOaZLJeUd7zsgM/hx3grrvhCVEgceCBUTncOSUp5iLeyAoKJK9yy89FOFfP/T4285fjPt7SkZPxoMKe41dPPFXPv3F+csOkxXG/iom+lfYAAlqLkGd+3cJgO0V5jE+6PwLxBGFXqF6BIVDaknPnTdKfeKvFsbJHp/ZvMWyroPP8QFVLiJ/LHnragR9kRPCWqLi3gy9aIEj4/I2FXFzomV2V5lEyZ7cCBxrYNnMHI+ojK4v94RoGK8EZCeAC7kHu8z3wK4skat7GKlDre44HTAZ6F9rVZyc2TvwNUibmIt9qzK8zWzacjQ7dpj8o1cotutKbF3m7+AUcpWjFMpRXQVfHAaAFV34ELFzDDwCNJNEnBl6fifaichoeNVQYax0xJpJ29vV7KwoaX0jh8RmeicIMOko9RPnKUBFB0TvR9b6aibkSkmXzQL2oxzTftoLJ6IY0A5rGgncIsID22Af02oVATTr8onQozvebtdssY7RGMhH6EdFEvxAiR8AyZgpyw0j0ZSKt7iuM2mw+5Fd7xYyZACSRW+MLzV2Nvy6jfv+hwTsJr2RKJLFgOieaellACXLvvjDudVjw24MA0eiMYwWYxZxxE5ZKBrF0/H77yADptO5F65odV27EQfCVtjEGB3xDhgHB5/DsazaQDLlMQn4XW6Ehh5OjMertLb/2qI5xvWqgxoBVBq4CqcG7+7earscqx2OnoSaog1aomEHdT74NAbOPUfZtsMh/z6YtRAQi 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)(36860700016)(1800799024)(23010399003)(82310400026)(921020)(10067099003)(11063799006)(56012099006)(261021123027099003)(261021121427099003)(261009223027099003)(261102123227099003)(261022105027099003)(261022075727099003)(261026140227099003)(261026121527099003)(261028144727099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 63qHRl75aWvoLaScCaogIQIcYPhk/w8bKdBlMSz3tRpFI1WF/EyliVLnEh4/sFQp8dOZvjQ/FIhyK7NyHOaPplNqnO8bdF9g3gPys0JNBOiW0okU9pTo7f8mn1K/39rzlZVsSTdG6+YSsu4zT+WbgqUpynxo9EmV/Y9BVLdS0+8WNKaFG2dhmPzK6FYCfMptJwDvlm5SOhQwDcl2NukEQUq43K4XYTIi1iH1P/874SDAbu4jQForY0HUOJItJrLq7PHVM3DtvVCAPeCJPtXxP7ByFGbh+C55FARBCSIUTfsIe0RGVoUrsg3MfNexVpI8RS8e91Zl0ACAmWpYT5fAavoRwn3EiES3f1P8HUMTC+9TKok20EeChxmNJcTN30H2v0FRZW7LoaUBuJj5NIujU4YXm7BT88QqvOacktmCRsjx9g6oYaaNYgufzi9peujR X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2026 07:12:29.2316 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a617aeed-2c98-4ad1-d2a7-08df460c7902 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: SJ5PEPF000001EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DSWPR12MB999129 If destination folio allocation fails, migrate_folios_unmap() may split a large folio and retry migration with smaller folios. Factor this logic out into migrate_folio_split_on_alloc_fail() to simplify the allocation failure path. No functional change intended. Signed-off-by: Shivank Garg --- mm/migrate.c | 69 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 1f4ddd23cea1..e4e3d1683d1e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1847,6 +1847,34 @@ static void migrate_folios_undo(struct list_head *src_folios, } } +static int migrate_folio_split_on_alloc_fail(struct folio *folio, + struct list_head *split_folios, enum migrate_mode mode, + enum migrate_reason reason, struct migrate_pages_stats *stats) +{ + bool is_thp = folio_test_pmd_mappable(folio); + int rc; + + /* Large folio NUMA faulting doesn't split to retry. */ + if (!folio_test_large(folio) || reason == MR_NUMA_MISPLACED) + return -ENOMEM; + + rc = try_split_folio(folio, split_folios, mode); + if (!rc) { + stats->nr_thp_split += is_thp; + stats->nr_split++; + return 0; + } + + /* + * Try again to split large folio to mitigate the failure of longterm + * pinning. + */ + if (reason == MR_LONGTERM_PIN && rc == -EAGAIN) + return -EAGAIN; + + return -ENOMEM; +} + /* * Unmap the folios in @from, queuing successfully unmapped sources on * @unmap_folios and their destinations on @dst_folios. Increment @nr_failed @@ -1868,10 +1896,8 @@ static int migrate_folios_unmap(struct list_head *from, int nr_retry_pages = 0; int pass = 0; bool is_thp = false; - bool is_large = false; struct folio *folio, *folio2, *dst = NULL; - int rc, nr_pages; - bool nosplit = (reason == MR_NUMA_MISPLACED); + int rc, split_rc, nr_pages; for (pass = 0; pass < nr_pass && retry; pass++) { retry = 0; @@ -1879,7 +1905,6 @@ static int migrate_folios_unmap(struct list_head *from, nr_retry_pages = 0; list_for_each_entry_safe(folio, folio2, from, lru) { - is_large = folio_test_large(folio); is_thp = folio_test_pmd_mappable(folio); nr_pages = folio_nr_pages(folio); @@ -1976,28 +2001,20 @@ static int migrate_folios_unmap(struct list_head *from, */ *nr_failed += 1; stats->nr_thp_failed += is_thp; - /* Large folio NUMA faulting doesn't split to retry. */ - if (is_large && !nosplit) { - int ret = try_split_folio(folio, split_folios, mode); - - if (!ret) { - stats->nr_thp_split += is_thp; - stats->nr_split++; - break; - } else if (reason == MR_LONGTERM_PIN && - ret == -EAGAIN) { - /* - * Try again to split large folio to - * mitigate the failure of longterm pinning. - */ - retry++; - thp_retry += is_thp; - nr_retry_pages += nr_pages; - /* Undo duplicated failure counting. */ - *nr_failed -= 1; - stats->nr_thp_failed -= is_thp; - break; - } + + split_rc = migrate_folio_split_on_alloc_fail(folio, + split_folios, mode, reason, stats); + if (!split_rc) + break; + /* Retry this folio in a later pass. */ + if (split_rc == -EAGAIN) { + retry++; + thp_retry += is_thp; + nr_retry_pages += nr_pages; + /* Undo duplicated failure counting. */ + *nr_failed -= 1; + stats->nr_thp_failed -= is_thp; + break; } stats->nr_failed_pages += nr_pages + nr_retry_pages; -- 2.53.0