From nobody Sat Feb 7 22:21:27 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013019.outbound.protection.outlook.com [40.107.201.19]) (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 5EFD5257827 for ; Fri, 14 Nov 2025 01:22:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763083329; cv=fail; b=T6WSYTefVNKMSI8x3g9XS3EpQm4EuP1GKUq0WIHRE0uQcUa7DGHUOf4k3v8YsF0FWL4+wqLyqH0ZDuDGFbg0ibkkeG1EHn4kmFScFvpqaCRimsE1CO323zUKAcz2Z8rPMyITg3be1am2ZXj6lEbJgxczyOcjQVt0924D8yVQDuc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763083329; c=relaxed/simple; bh=zpPoaj3a3oRuudD7Wz0HY4pIKqXzLt1uJ0pHnCl6IJU=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=EuW0eKrIpJ3JozUZBYXVh1mxTaac/ItMAZPEg29QNwt8tS7Lgojc/QUXC2GuBB2mGQ1aps5D9QOoakM95hbYYSBquTznguWbmcKMp7U65dLJZJ8j47lsqXDN5JcXhoVyK7HoyU7aKYIQpYhzIWwvZMzWEqtwksgpOFs4rzNqcyc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=tTgtr6+I; arc=fail smtp.client-ip=40.107.201.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="tTgtr6+I" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XObLvcJwzH0S6iDJzlrwENMSTvx+xegm548FQ94f8AyznWJbqewi9McYUZsicYw3IizrGJb+PHW++N6rTs6WSNgft4zuuODzjQ2WeLBeTaq8H4NoY4Res1keMjBXvmF/fOOOv1JLJkWCyn66IXx6wHp26QtcKzlf8pHCs6g1ci9Q3bTqxRdhq/oCaCbyVWwA145rMB84ZZuAxI380sBTKp57t8aqVsX0uNHYXduszWhkNJ9ItgYzNfu36S5V8zHUtyxLYCl0txLxq9K21QybrLiLq+pM90co5ZwRROev6k8mtpqCPcV/DFeA4j5GMpSI5YCtOBntTcNOUO7LoLxDiw== 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=G5owos5I+wACJ1YlVyjw+BLjd2AJqWIJKoU6yz3rCXE=; b=TD4KSTo35uDpV3ec784bmdYofFPioMOTdZ0eq1w44+qw6XSLsRLj0HtMzuUim0VdV4hmyTUG+89IZUkYHdkznBg+B95+6vLfKjYZeNRs5vNwhL+RVF0AoLBYoTGDh84T78sfTns/mUo9m4eU9CrohZRh88IzA4eDpjYa5E8U9eP5jsV/ezitvefAhcVRmrrOgKs38mP+xnJVsrDzPWV3Z9VEL42j2QjB9cPJ9uKO17mYSnTxFkUiCjk82ixLt1XjTrCuSE9Tsn51cdid1DDHOqZq1Fx316bN0b5CKEYvc0V80KCrgAhJfFbihQH1YmkaA/RtZQpuldMXv2pQUgm3mQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G5owos5I+wACJ1YlVyjw+BLjd2AJqWIJKoU6yz3rCXE=; b=tTgtr6+IFkdlKYCi0Jgrjz8onhVFORO5uZTbA6fcWVOX8nOkqs9dDCfBG+kJZ/+uW5BlbBkZrRWi1Zi2w06YKegwoKKiPlm4m/+5guWvTLaPt8keartcAlarCOOshRzsDP3BTEHO/+SUm5Vi9sY5qouIX4bAmNBmN94VjIGzc5PVqscXgMIb4xMjQ2EcV7vq0T9UBgkXr+pmsqgpoJsTrxBGkOhibkfMFH7Ylx92wMEFTo7QTjBrU/Nk4yH70/xDKETSLo7NZkxwBzAK052z4OJH/j14IynSmTkqq3MZzQxj6pokdPPqRAn3P7pYzDkVN/Gx79fupE+JD/6Q+XOBnw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from PH8PR12MB7277.namprd12.prod.outlook.com (2603:10b6:510:223::13) by PH8PR12MB6769.namprd12.prod.outlook.com (2603:10b6:510:1c4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.17; Fri, 14 Nov 2025 01:22:00 +0000 Received: from PH8PR12MB7277.namprd12.prod.outlook.com ([fe80::3a4:70ea:ff05:1251]) by PH8PR12MB7277.namprd12.prod.outlook.com ([fe80::3a4:70ea:ff05:1251%7]) with mapi id 15.20.9320.013; Fri, 14 Nov 2025 01:22:00 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, dri-devel@lists.freedesktop.org Cc: Balbir Singh , Andrew Morton , David Hildenbrand , Zi Yan , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Oscar Salvador , Lorenzo Stoakes , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Ralph Campbell , =?UTF-8?q?Mika=20Penttil=C3=A4?= , Matthew Brost , Francois Dugast Subject: [PATCH] mm: fix up softleaf vs thp device-private in remove_migration_pmd() Date: Fri, 14 Nov 2025 12:21:52 +1100 Message-ID: <20251114012153.2634497-1-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.1 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY8PR01CA0016.ausprd01.prod.outlook.com (2603:10c6:10:29c::8) To PH8PR12MB7277.namprd12.prod.outlook.com (2603:10b6:510:223::13) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH8PR12MB7277:EE_|PH8PR12MB6769:EE_ X-MS-Office365-Filtering-Correlation-Id: 8644846e-fc6b-4601-4450-08de231c35a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VklpWFowcC9ycVc3ZWZNbitRZ1Z4RHBtc091dndBYWFjSStCU3NDZHVHdnp1?= =?utf-8?B?OFV1ZlZSYXh4VDAxRENFUHBOWHM2RlcwamI5eUJHdGNTZDNaVmJCY3QrU3l2?= =?utf-8?B?NTk1a05wQytBa25TeDF5TXpnd3hzaEUzNjloRXVvVWJjdDQrQlZwUitsT1Z2?= =?utf-8?B?K0pMbEh5TGIyVmxlc0FSbUVCVFhpS3pCUnZ3SHRvZElFRW41VVFJakVsR1BP?= =?utf-8?B?TzhtNkpXbW10VVNqWTRmR2hneEUwK2RZZG94TE5nakpQUmZiemhqV2Rha3h2?= =?utf-8?B?WWpsZEluTzBzVHRXaVg0KzQvSmo3VzZCL2MrQjJGRkdHVmJaNS9hNjY5L2xO?= =?utf-8?B?dEljajdST2FPUjZZU1JXV1hYekdkNDk3SGY1b1NmaHJhZ0RDc25qRXpJVE9E?= =?utf-8?B?Ly9TQ2JqMWtzUCtJSUVqWXozclk4RHlZUFplZnRzZFJteHJSeE5LMWJjZm9u?= =?utf-8?B?c3dpNHhSOTBpZldFa1ZSZERsV01lTXk3Wld2M2NsVzZVdGRsclAyNXJ4cnRr?= =?utf-8?B?a2NLdnFUdUdPZmVBYmc0eDJhUUR6SDRIZ24zREtYaEFaY0cvYytUVnVaQ1hu?= =?utf-8?B?TVA4Z05WYm95NDBLZytXRmQxUjk5R0xNQkpKZ1BwUy92MGQ1bThkclhwZmVF?= =?utf-8?B?ZnlDM1U4NCtiQ29qeWJzNFpZTFMxc3lmQlBTdDJVdG1SUXFHV09HdGYyZnhn?= =?utf-8?B?RUJORFordjdZWjgzQVBIaVlSak1HMzlJcXM0R0Q2Y1RyMkhXdVVEUDlhOFRt?= =?utf-8?B?TWZFa3dLbVJ6ZU1pUUpTejhzZlZhS2RRbUxyREpJTjRJTW41THpCZUpvSURk?= =?utf-8?B?dHE3bklIUW5JR2I3SDVPb0xURjdjK3hRZHYzYUcvZllJOEI5ZVQ3Rk1ZTm5v?= =?utf-8?B?bURMaEVMM2MxNWV3bVdYSkI5QzIweWt0bU1CbjFza2E4YWpSVjU5US9qb1JQ?= =?utf-8?B?SFVqR3ZKZHJNS1hkUFBib20yQTMvN0QwVmNFYUJhRGl0bWd0eGVCYUxGR1dF?= =?utf-8?B?N3ZsRDhKc1F3RnpDUlVJc05MZHJZSFpMK0txMkMyeFdTR0lqMGZUczZYTzNI?= =?utf-8?B?OVRybkFRQjVOMVhueHg4cGxDVXl1N0tpeFVGNmdqdkp2SEdNcitqSzZiaEk1?= =?utf-8?B?K3BzODFMaGlhQmg5TklWYXFSc2RQcDZqOEN1d3RQRU9NSlVsYVVNNmpPK2Rq?= =?utf-8?B?NUhJZm5PMlo0emhydTVQS3p5MHNOY1VnbjZnei9YYks1aDRJN0oxZllkbWxC?= =?utf-8?B?aFJzNDR2akFHWWVyM3VjWWRwRkxlRHJ3VFFNRTZwNU9pR254VzRjeGJxckY4?= =?utf-8?B?MFpYdmNaMnpjaFBrZ3Fkd25PTm1MazEwK1U2d3JWOVlYSFR3UjlEYUI4Ni96?= =?utf-8?B?UzUvVnhqUGxKbm5XZFdHd0JWL2JTZ1dFRkxjMXI1VVVqZkRxTG92S3QvaFFR?= =?utf-8?B?ZE9hS0lwUGVNZkFTalRhKzBBditjeGd5dGFmcWxVaFh0blpMdzRVVEFjTlRj?= =?utf-8?B?cGluUHRMeDM0bTJibVJNQXpORy95OUxlQzhyS3pjRDRhem5QM3BzbHJoQysx?= =?utf-8?B?OUZ1ZGVJbklram1xZzZOZ2I3NS9mNVNudnJVMkxMZGl2ekpOdUhDMVdNaC9y?= =?utf-8?B?SjhrVDNTUHY0YUdSVklTeDJzVkVzU1BpdllHOUE5MDJPdEpmdFNoMFFwMG9l?= =?utf-8?B?WVFPL1lUTjhmeURKL2Q0MWZzeklmUEtRMXNNckIvRTZ3cHdVVXBRdjVHSnYv?= =?utf-8?B?N3JweHJqdEh6a3gzclljOUxSdW84WkZiR2grUnFZcmV0emdZcGRuRVJyc0hL?= =?utf-8?B?VFZvOHZZMHFqdDlIU1pTNkxDOE5qRTVFZDU2TG41SjcvOGdlL3gycXUyTG5o?= =?utf-8?B?bEVpSDVzcTNYUk9EaXY5cWRmdS8zT0RLNmU3SWYwZENyajQ1S0tyd0MrV3dE?= =?utf-8?Q?+1p2kKEIB2K4Mnhn0TpIFO0cYz6pf+g/?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH8PR12MB7277.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TXQvVVZMdE9EbDBwOHY3blhvK21DNVdWcjUvb1hXTHFzUDN2YzFCREcvNU8x?= =?utf-8?B?alJoaDNuSmJROFI4M2pyK1lHWjJidTAwOUoyQUpUaVk2RXBtdnQ1MHlxSGdz?= =?utf-8?B?a0pzN2VIa3dWSzJsY2NMaGthcmQvaU1Qd3ArSlNUY1ducmJqZmpZMWNvV3JV?= =?utf-8?B?MTNocVhNY3JMUGF6czZLVk5BdFNBYTFwbDBUczlaRVIrVmlPVzBQdWRSekdX?= =?utf-8?B?NWw3T3FxSzdKcXRYY210TDc2cE4ydUVSTk9GcVczTk81N0hMNXdaekcyRkY2?= =?utf-8?B?dG9UcVBHaEliTW1jRElHc3FRN0xORFhpYVB4SHRuVzJCN05ObG85MUtVcUNS?= =?utf-8?B?VkFGVGhmbmJtcWgzRUNJZWhkblJ2SGtsNEJ1RUJIdXJuZWNrdlJsTExlTWw3?= =?utf-8?B?Q0FRUEk3N1JSajV2TkR3cUhNeUt2dEdFTE1pdC9OQSttZkhKWXJDemJaSjF6?= =?utf-8?B?cDhpNTRmOGpYUTVmZzczTDJrNHNrMlcxQUowdE53ZWJFWHhyRWtNaVBkcUVG?= =?utf-8?B?Q3FWUDhiU1hyc2pZWGFoTmU2cE01cm93M0lLZUxnQ2c4NDBZaUExY1UxMmd5?= =?utf-8?B?K21adkY3MWE5UmFLU0RPMjZnY1VMK0dmSnNZWC9iNU8xU2hUZjhnaEc1S3p0?= =?utf-8?B?MXZMUldPQ25ZRnozZmEzUFdNQjBEV0JTMUVQdGhCcTcrY0F1REtVbnlGODcx?= =?utf-8?B?d08rTUNBQ3FiMHFNMXZlMysxelFGRHFQTGVzQThOUXhDSzJ1Tzg4S3ozR0lZ?= =?utf-8?B?ZFl2Qm5TNWN5M1NvOHFmNjYzRkNXTTl3NUlvTzFHdjcvd2RsUmZKak9LcExx?= =?utf-8?B?ZU1LZnZWT1FoMDFFZEg4WVZFeUwxd0x1ekFiQVNvV1QzRVRnU3F6MWExZHRs?= =?utf-8?B?c29rSmQzZzFqNmdDeXhWSUc0K0JxSTVFbVVES3Y0MHhBeDNjcWN5YkZxekRw?= =?utf-8?B?SWp5UnJvT1lSL2JKY0dHYmdMN1FqN0tWY0hKTERsL050d3hRVXowVnJCSVFG?= =?utf-8?B?cXMxQUtXWnI5TjZjbUtScmdXSVgzaTQ3TjBqSExEcWVjUUcrQXpnYVppMVNJ?= =?utf-8?B?aGJSeVc2MFpUazlCaUNQTjFYQ3ltV3Z2dmtmZ09nczdVYnBCMElwTDIwdjFH?= =?utf-8?B?SXhnNU1WZXJtMGZTN0pRb0NWZGNaQ2l0MVBIUXRzdGxyS2JkbHNocDVzTlVr?= =?utf-8?B?WEZzRG5reXE2MVhTdlF3bWNIaFRnVHRRWE1jRklRWERwZTVvM0FxSzdObnpi?= =?utf-8?B?aUlkdzEwa3BCY2JkbTA2OFFGZW5wWld6bklCQkQybHdsRTFMTXp6aks4cUlT?= =?utf-8?B?TXRSZXZSUUJqZ3d5b080SEdtVllGYUZ5U1dYUEZlRHJtM1B0dlRuYUdQb25p?= =?utf-8?B?bnIwOFNrcUFlMmJKSGZ2WSs3MVdNZURSVGdrOXlma3dRcGpWNXB0NENFOUI2?= =?utf-8?B?WnAzMkRNVDdDK0pEejU3RzdUUmhsbStOTG94eGUwTHExYXhjQU1weWF1Uy9w?= =?utf-8?B?V3lDMHY2c3lUUTA4SGhaa05NVGx6Q3MrLzVoMWY1VUZvaitMNThBdlA2M1hp?= =?utf-8?B?ZTdUeE5tc090VDJlVWsyUGRPSFc5ZmhTSjNpUUg1TTZGQ3RMcVliNTVRaURa?= =?utf-8?B?cDZPeWRWbGtRNlE4RDBYMG12cnF3TzYwSlBjZld5a2V3Y01qYkFvd2pMZC9U?= =?utf-8?B?cnZ6Tlc5amhuYlpmOEpDNjJTeFdwbjZNZTFLTVhCZFplcldkeGhudDNjN2RP?= =?utf-8?B?WnNWRTBpRDBENGFoQjdyZXpLSnpaUlRJTFo5TXVEeDc2TUc4V2dFUDJhTVdt?= =?utf-8?B?SWx4N29ZOWduSzVXOHhoSFRJdUpoU0pLeUMydWF1Y0Z2RTVoTkNpR1MrNWkv?= =?utf-8?B?NkNiWnliSTJHeHMzS1ZGM3c5QXBoYXAxVGtra0pSeE5ZS2lxeUowRjAwVkhC?= =?utf-8?B?N2JoV2lSMzZocDFKbnpFR0FUWDlIb3pncTJrTzhPcWtqQmwrZ1YzTXNrU0F2?= =?utf-8?B?Y2lxYW56VGx6czdRenJReGFOSGltVDdWVmFpcXdGQlhSUFFkOWpOeGlXMlc5?= =?utf-8?B?S2F1c2FLOGFPSjBMVVhzb0JpemNxZE5YdHNhOFQzaXFDSjdhL04xa0ZTc3Z4?= =?utf-8?B?WTZGVkZNOGFFcFlxa1V0bnRMdnFEc2R0SWplNUIxWlY1dmZidjFNTlgrQ1RY?= =?utf-8?B?Wmc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8644846e-fc6b-4601-4450-08de231c35a4 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2025 01:22:00.2087 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /MiWuPRhul9sBx1eJS0KitvDPoIiNOM4OWHFc+fMz67cqaJUIQeMlMOvkryws7fxUBfAHSnVvI2pNq6BYOjQ9A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6769 A fix-up in the thp device-private patch mm/rmap: extend rmap and migration support device-private entries introduces conflicts with the softleaf series, this is a fix up patch to resolve the issue Cc: Andrew Morton Cc: David Hildenbrand Cc: Zi Yan Cc: Joshua Hahn Cc: Rakie Kim Cc: Byungchul Park Cc: Gregory Price Cc: Ying Huang Cc: Alistair Popple Cc: Oscar Salvador Cc: Lorenzo Stoakes Cc: Baolin Wang Cc: "Liam R. Howlett" Cc: Nico Pache Cc: Ryan Roberts Cc: Dev Jain Cc: Barry Song Cc: Lyude Paul Cc: Danilo Krummrich Cc: David Airlie Cc: Simona Vetter Cc: Ralph Campbell Cc: Mika Penttil=C3=A4 Cc: Matthew Brost Cc: Francois Dugast Signed-off-by: Balbir Singh --- mm/huge_memory.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 3a8f0c4143c5..4d65c51bc0fe 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -4760,7 +4760,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk= *pvmw, struct page *new) folio_get(folio); pmde =3D folio_mk_pmd(folio, READ_ONCE(vma->vm_page_prot)); =20 - if (is_writable_migration_entry(entry)) + if (softleaf_is_migration_write(entry)) pmde =3D pmd_mkwrite(pmde, vma); =20 if (folio_is_device_private(folio)) { @@ -4777,8 +4777,6 @@ void remove_migration_pmd(struct page_vma_mapped_walk= *pvmw, struct page *new) =20 if (pmd_swp_soft_dirty(*pvmw->pmd)) pmde =3D pmd_mksoft_dirty(pmde); - if (softleaf_is_migration_write(entry)) - pmde =3D pmd_mkwrite(pmde, vma); if (pmd_swp_uffd_wp(*pvmw->pmd)) pmde =3D pmd_mkuffd_wp(pmde); if (!softleaf_is_migration_young(entry)) --=20 2.51.1