From nobody Wed Oct 1 21:27:08 2025 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010010.outbound.protection.outlook.com [52.101.61.10]) (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 7EB642512D7 for ; Wed, 1 Oct 2025 06:58:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301893; cv=fail; b=lSYAG/7XRZYH67TT1BsOzCBj9jcinPyhcBOwfSc9Sti7IScpqQQS4pzI/+0NsUfhgqP9mxAdVG7y/spPqh+cLj5wVp8HR56/Y//mq/k+fv4Z09Slbp3tx1cgajVSEgVWm9HZ0PtMfYV5ujqeM3KEpyO852qooEau+CsxgkxE4gc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301893; c=relaxed/simple; bh=ucwmAWGC1xXcC0C+xlKVDEzJ7lird7qoTq4Vd34Qg+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Mw2TfDEwciz9e5dGIie60UNgFoe4kGkEDKUAURLg9KvGPLEzXwkoZH/z8vOrznLMtfUr/zJ/cOlpvOMajBFkekNcrXwGYN9G/FrSaumXRLW6I+PuuaGQlZidM7OyskKNZ5q62Z+p8yPr0oiX/CgzhM6+QtP9JEat4mjMP2fc6xc= 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=CAty0vu2; arc=fail smtp.client-ip=52.101.61.10 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="CAty0vu2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bHomHcGu50aofqJld2I3z3pvsicqHT4eRxXkAFPZOt0s8gbgGWXbe7CDjS11O6kmWr333VxfEdL3WxGF88KhAcPSDw6IBms5pFlkoamEhHPnu79pCvDQ2WZKH2LXcGJDx6oBlMK8yPlUDpILAYwOUgwoBdD2fCB8OEgc1vw+U03gRUgxbTic0IWM4+ftHr1bHzmW5FNldQfXRcYx0v2M72WMmbHJCxfjrskNHL3gFWYicdQ86bMbBa385NNDzacEdhdbIO3K1ZRpFK26DAi5x3zijd/z7mqqX4SNv5zKeSS8v7y+25PXqy9l8AFQfGfuuquiiuBnh5OfsqjSUVwjQw== 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=FWo606w0uN6afUD4g0ujAef37GuTFqI1pMoRgjoRWEo=; b=QJfpeX2h9B72fi7/fq3dHc6iBxKwVDjIuO9WqNjbwrzNpstsscaIUvQ1nFYA56Wuc4OpXTFAgmVs/9r6FGzeJx3EgKcJ39HHIBjfRMtrQUH/ZeZARJqZfXCzm5Fwqzc8oOqcxL1SSVZPmBeBuf2La9hq9UIocZQ4HacdhpgabTfpfmwMhlwUVuSPLMETFET26wlAbeGMYGDHpmjp43JstHlAKx7vlw06R4YJXdBA9w2bEnnCeh+OOyCsJiCioNDAanlFnTkTQ+r5bdPurU/r8P7kYJsOfscq51dKMW+xm1a+ML+2vStOQ6a4neIsXCV8VDsQJ1+yF9wh0iDXf94XhQ== 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=FWo606w0uN6afUD4g0ujAef37GuTFqI1pMoRgjoRWEo=; b=CAty0vu278syAIDmetbSmElkm1fCkuzvO6+GJ1kWJk3rFuLG0E3I9EeVUAoJJZw94Azjzin8meEHLlKc3rc4BStiIYdyJYiMVXvx92V/DOHmaBlI+NM08FvobhfUmFWNr7cy7yiQpfz+FBub/2DVXwbOrntd3Xa3HSIZMuQS6RkbdqQgMfbGqSkobo3DnAN0+ARy+gMgboxVwKlJk2FKJFT4x/slboeWYtcbmi/OoL/RKqZAZhPSOrqsBQCQIMb7uKEhY6ziPmUO71jVGIS76AP7XKMyUw3FtMjf9NNqdPNtni43O3QjVJYKRiwih7LloFUoUTZuVhEicnJ3u8K/iQ== 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 BL1PR12MB5779.namprd12.prod.outlook.com (2603:10b6:208:392::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:03 +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.9160.015; Wed, 1 Oct 2025 06:58:03 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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 , Madhavan Srinivasan , Christophe Leroy , Felix Kuehling , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [v7 01/16] mm/zone_device: support large zone device private folios Date: Wed, 1 Oct 2025 16:56:52 +1000 Message-ID: <20251001065707.920170-2-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0095.namprd03.prod.outlook.com (2603:10b6:5:3b7::10) 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_|BL1PR12MB5779:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c37edf8-6ab3-4d8e-e653-08de00b7ddc9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|10070799003|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WEUrQUh6dTdnOTNXMWNTQTViUFdRRGZiTVhGSDlyWVAvNEY5QzQ0cTlPdkIr?= =?utf-8?B?NEhPVVBOZ09SUnVVZS9MeTcwMEI5K3JBMlVVUlZoRFVjUkQxYnNvOXFPdW5H?= =?utf-8?B?Qmx0dE9nUXBOSTUzdnlTQ3JJUHZieXAzcnpJWThZZDByZFV1VXlFS0JOdnRC?= =?utf-8?B?RmtpYXNrQzlsRkMvSXZkKzNmZzNSUm14T3BxQ1RxT2JtaHNMTzJmb092d2I4?= =?utf-8?B?cmhEeVRkUVdMSzVORjBWRGxYM2p0VWRETEtwR1NwYjlFTnp3a21OUGNPcHFZ?= =?utf-8?B?eHhCSW1yQUhNRit6cVB0ZUlQaEh0ZnMrNzBYNm9YdllsdWhoZGlzb1BFS3Rj?= =?utf-8?B?ZmNURUU3VjlFUTY4dEdEY3pORWQ2cU93MXNHWkpTcEFLT1FkbmlURHdnUjFw?= =?utf-8?B?MWl0UEFkTGlHV1orSFhFdW5yQjNUUkpzNHJJeS9aNHp6QUhPYlRpL01YQ3Nq?= =?utf-8?B?RTF6YU1LblppancwNURCMUp3cjRCRFExMVJsa3pTQ0J3Nm5CakUwODQ5UzhL?= =?utf-8?B?bm9Ka2dWU21NdEJFK04rN05tbFNZMmt2ckhPR3JlYkllYVBXOTFqUjBaRm8z?= =?utf-8?B?T2gxL1IyN0tLbkMvMWpPSjdBTk54RWU2aDZjUnVaL1kwTWlad1RXR21saGRC?= =?utf-8?B?Y0hraHNFTE95K2x0UzlKZ2RmU29jT055SDB2c212OTd6YlBoNXUzc05vN0NM?= =?utf-8?B?Y3dScnlNTWlYWGJ6Sk1DWit6YXZ5Q09mZ1lvOGxMVXVBUDc5dlAvb1dmejNt?= =?utf-8?B?MzZEdkVyVmRDOW9kZHNqbkxYeFgyQkdtcWFYb3JoaHRkZFgxZ00wRnExUkNt?= =?utf-8?B?ZGswd3RwRHRvUi9qYWNqdmhoc3lzMUY4aXBGdGVsUVB3TkZITGdFOGg3WDVh?= =?utf-8?B?Wm5CMGRnOFUrUzNqY2VPQVp3bFdmMmZDQmxGKzBDUGtWcFdFc2RUWndqQ2lG?= =?utf-8?B?RTlDZWRNelltN0hGaEpjTjQ3SjlSdTRwYWtrMU50eHBQak1jYnZ2TmZzaDFK?= =?utf-8?B?aHdSMkxuM1grVGlSOTZoM3BRdzdFMEtCLzRlZjZvNU5oaGsvRzNRby9oSlFH?= =?utf-8?B?UkZzU2ZHa3g2bi9TajB6WkpkcFE4eEFoWUZoMDJHL1l3cmZWRFhZa2ZrWjh1?= =?utf-8?B?UUN2ZUpmMGFpQW5CbWRjTWs1UWdsa3pMVkxtWjlOZEx0Q2ZjWjlzR2wvMXhD?= =?utf-8?B?MmZCMTZ0UEpHQ0JtZ1VSN054SFNyOE1XMEU4OGdDYndVbkEwRFZ4T2c5YjNz?= =?utf-8?B?UXQyZmxDNXBMVHpKMHRjWFFVOTRocStFNlRaRVk0M08rYm13MEM5dlRFY0Ju?= =?utf-8?B?c0xlOFpYNWdZWHUwTjVqM3JTcmk0V1l6WENNY25sckhxaDVKQUxJV2ZMQ2FN?= =?utf-8?B?eWZrTGRPa0hJUG5DbW1ZY012VUpBeDZMZi9sVytNVFh1VFErV2RsRmtiOTlz?= =?utf-8?B?N0xKMGFuYUxaeklDbDB6LzN6bWFrR3BuNm1FL3NWekN5S1JLWmgwb3lOajQv?= =?utf-8?B?algrcmhIRXdLMFlRNDZMSDZRd21jVTdvQVNOZVk2WXdrS2k0R0lkZXg3dHVr?= =?utf-8?B?SXkrREZZMkVyZ1N0elYzV0szRFhyNUxZMnRlRXp2QXVIQ1hhYlVQaXBEU2l2?= =?utf-8?B?MElKZEF2QVNCOEkrMnV2V0hnSytpWmErUEZmeTQ2U0FvY3pneG1tUHNTemVI?= =?utf-8?B?bW51d2FQK0hKOE1DNkJVWlJXNEk1Y1cyTUozYnFJa3VSY0VyOXJOZmhsdHB1?= =?utf-8?B?em9mWGQvaWdjN1ExRHRJdjlHQ2tLbTZEamZTVUVTYUJ4a2c2eTJnKzZCU1Zt?= =?utf-8?B?WUxqUmhqazQvU3dGdkxNQit3N1FWcE16OEM3M1FrMnUzR2RGT0dtbWd4V0VW?= =?utf-8?B?VUl1bGpzR1lqQjFSVzlqb0l6bTZyWTk5RHhVa3pOTzgvZzlxSTJoZmxEV3Fx?= =?utf-8?Q?wKpVqy5jUtbu8rVdR+xK9C4nHJbl5c26?= 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)(7416014)(376014)(1800799024)(10070799003)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RmFaN2tVRTZHY0ZramIrRFlKY21BMnRBNlpXNUxsaEdLZzFTaEx5UlpBNVN1?= =?utf-8?B?R2dybnZWaGpYdmtDK01hWEpUMHB3WDduKzBPK2VOQ2lDU1ArYzJTWkVpUFRw?= =?utf-8?B?di9aUU9PMkxsbmZQaEZZTko4OThMcnFOaTJZNXQ4aFVmU1FWSWNiK0VCMlho?= =?utf-8?B?dlZlbTlyb1dIS0RUUTgxN2p3UjBiVmw3bVNRUXVrbEhyblgrYTBvWHFxZVZW?= =?utf-8?B?Ui9tWm9aeCt6bXM3MFJWTSt1aDk3ZWcrbXd4LzRrYWJmNDlXY3B4TVdNZ0pK?= =?utf-8?B?dUJsOGhaUEQ1MGl4NGoyQkNvdEpZN3pKTi8ybEQrZUE4akU3VkVsK3AwQ2ZN?= =?utf-8?B?YXFmSGNhLzVCNzJ0Z21FUE1BQ01nazVGS3loaDIxTkF6OGRZWDF2Tmc4ZndQ?= =?utf-8?B?VWpOTGdjQ3hlbVFnQVJ2RndHTW8ranlOeC81OTBSNEZJc29EOThSbU5wZEdY?= =?utf-8?B?aysyUjM1a0xDd3RpUXRreUZyeXBaZTdYb0lPSDdJdGs3bUcrUm5qazlueWtM?= =?utf-8?B?UTBnTjNwR2hueWJGYlkrSWh5RUlhZk9PZ1BOeGdGMDgxRFpsMXo4Q09jUkNW?= =?utf-8?B?MFM3TCtuU2FBb2grS1BYOXd0bXRVVUh1R0lGWnloblRMSmViaEJPN0kxMkpQ?= =?utf-8?B?MzdmN3JEaDRlWERWMXdlR0FQdmVGWmNLMWVEUkRaaHFLU2RMblV1clRaZmg5?= =?utf-8?B?eVFFNTRIQ0NFVmkyUDlySTY1azhuZFdTSEVmWWVaa1pYd2hmQlhjRHdSY2xM?= =?utf-8?B?Nk5ub01nOWlNRWNIdmNEeko2UFgyR2dmQjl4VzlLdVVHQUVvNVZwa1JQQW1G?= =?utf-8?B?SDg2WU02VndFVy8wK2JYOGxrQ2x1Slp0dmVxOWllNHZBUWNmalF4eGdHSWxH?= =?utf-8?B?UTJ3OVN1endYTnA0MnJOSVlQdVhKNkZiU3o0VFNERUJ2cEJWNXBxTHNsSFI0?= =?utf-8?B?bUUydzdrRld5K2grUmdQSDFpL3hGREFoUzF6VHhHSWhzdzJYMitnMVlSK0Zi?= =?utf-8?B?d29WMmE3QmVLQjhFR2djNjVWUUFMdjZEK2FGOEN1cUpZcmJKV3B1NzJ5MXl1?= =?utf-8?B?THFIL3YrQUhnUzhvR1pVam1iZjNFRjJWVWN3RHY5SVdla2pJdXVxbk1oY2dH?= =?utf-8?B?SXRESGtVTjZoTE1rcmFRbXdnSnFvWXlBVFdaT2xCODc1bVZ6bkUxUjBkekV0?= =?utf-8?B?bjAyd252UHFLN0pwUHpXZ3h6M2Jmd3g0byt0Ly9SelVWWjdjZmZPTk9yRVMx?= =?utf-8?B?NC9oYmR6R1dGcTdGejNCSjRJdWlQcmEySjNZc0VXUUwwelBiZmNDOUFhdm9L?= =?utf-8?B?akZCOGYvWnZoUUpLQ3g4ZHdON29MOStzK2NNN0c3SkNpaUtYckxLTTdhNllK?= =?utf-8?B?dVFUSVFGM1NGTVB3UDFtT1R3bkd1ZEpYQTB3ZjQwbExScHNERGlvYmF5NHEx?= =?utf-8?B?ZkJhcjI2WXMzOWordi9vbGovbUpmL25VN2JJZWRZWEJQZGdFVlNLRGkzUExW?= =?utf-8?B?UDBRTytuQ25oZ3lYc0NSdy8rL2hFVms2cTlzRnhiOGx0QUFpaXN6OHd5M2FN?= =?utf-8?B?U2JYU0hmK1ZEQ2ZMSEtnUXU1bGZsNE9tZ2ROR3Mzakx2TXNETjRhZFVNdWEz?= =?utf-8?B?c1RLZ1F0cEY2S1c3Y3ZDbjlsdmhHMi82cldwdSs0L0QyUEFjK3hJR0Z6SkJz?= =?utf-8?B?dWFsdjZUT0RpODgybjdGdUJBMDd0MUxIcVAvbGRQOU5YTEpTOE9nUXdPNXJ4?= =?utf-8?B?YUpocFZWb2ZmS25rTlVWZFI5bjVIYUlvUVhsQyt1WXVNdm85bUxTQmcyekdJ?= =?utf-8?B?OElaSTVrN1l3Mm1CNEVuYVY3ZnFkdjBHNTY1SGI0UDFHWkpWZkt1RzVxWW1p?= =?utf-8?B?L2N0UEp3QTNuMU5NMkE4cnRHbTVHNGZTbStLVW5XRVI0THNOZEtCMS9WTGZH?= =?utf-8?B?ZHFFQVgvajB3ZDU2TDdqY2Z6UFVGWGFlK3pJb1hsdFVaSDZvOGVzUnhRMUR5?= =?utf-8?B?R0RvclB0V3QrandFNkxyWEVqbXIvbG01UVpGTzRlM2ZkQnlOTlF1LzF1akZH?= =?utf-8?B?M0ZWUkQ1YUsrM0FWMkdidmhJK2l6WHJqL2hJNGlRM2YzK0IwdWRJTkRSQmtv?= =?utf-8?B?bXF0M2Y3bUNGNDhkNGt2YktRY1VVS0txRGFyaDFjeU5LTmZMa2ovS2grbjg1?= =?utf-8?B?RUE9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c37edf8-6ab3-4d8e-e653-08de00b7ddc9 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:03.6552 (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: 8FX+YqkyK1iVapQjML2pgrbv3O2RjLNFXOl9rX+9rxTFHqRcS5sNQit8D7VB+lNlOldQfWlCCvsF/i9A4fAlqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5779 Add routines to support allocation of large order zone device folios and helper functions for zone device folios, to check if a folio is device private and helpers for setting zone device data. When large folios are used, the existing page_free() callback in pgmap is called when the folio is freed, this is true for both PAGE_SIZE and higher order pages. Zone device private large folios do not support deferred split and scan like normal THP folios. Signed-off-by: Balbir Singh 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 Cc: Madhavan Srinivasan Cc: Christophe Leroy Cc: Felix Kuehling Cc: Alex Deucher Cc: "Christian K=C3=B6nig" Cc: Andrew Morton --- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- drivers/gpu/drm/drm_pagemap.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- include/linux/memremap.h | 10 ++++++++- lib/test_hmm.c | 2 +- mm/memremap.c | 26 ++++++++++++++---------- mm/rmap.c | 6 +++++- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_h= v_uvmem.c index 03f8c34fa0a2..91f763410673 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -723,7 +723,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long= gpa, struct kvm *kvm) =20 dpage =3D pfn_to_page(uvmem_pfn); dpage->zone_device_data =3D pvt; - zone_device_page_init(dpage); + zone_device_page_init(dpage, 0); return dpage; out_clear: spin_lock(&kvmppc_uvmem_bitmap_lock); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index 79251f22b702..d0e2cae33035 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -217,7 +217,7 @@ svm_migrate_get_vram_page(struct svm_range *prange, uns= igned long pfn) page =3D pfn_to_page(pfn); svm_range_bo_ref(prange->svm_bo); page->zone_device_data =3D prange->svm_bo; - zone_device_page_init(page); + zone_device_page_init(page, 0); } =20 static void diff --git a/drivers/gpu/drm/drm_pagemap.c b/drivers/gpu/drm/drm_pagemap.c index 1da55322af12..31c53f724e25 100644 --- a/drivers/gpu/drm/drm_pagemap.c +++ b/drivers/gpu/drm/drm_pagemap.c @@ -196,7 +196,7 @@ static void drm_pagemap_get_devmem_page(struct page *pa= ge, struct drm_pagemap_zdd *zdd) { page->zone_device_data =3D drm_pagemap_zdd_get(zdd); - zone_device_page_init(page); + zone_device_page_init(page, 0); } =20 /** diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouve= au/nouveau_dmem.c index ca4932a150e3..53cc1926b9da 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -318,7 +318,7 @@ nouveau_dmem_page_alloc_locked(struct nouveau_drm *drm) return NULL; } =20 - zone_device_page_init(page); + zone_device_page_init(page, 0); return page; } =20 diff --git a/include/linux/memremap.h b/include/linux/memremap.h index e5951ba12a28..d2487a19cba2 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -206,7 +206,7 @@ static inline bool is_fsdax_page(const struct page *pag= e) } =20 #ifdef CONFIG_ZONE_DEVICE -void zone_device_page_init(struct page *page); +void zone_device_page_init(struct page *page, unsigned int order); void *memremap_pages(struct dev_pagemap *pgmap, int nid); void memunmap_pages(struct dev_pagemap *pgmap); void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap); @@ -215,6 +215,14 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pfn); bool pgmap_pfn_valid(struct dev_pagemap *pgmap, unsigned long pfn); =20 unsigned long memremap_compat_align(void); + +static inline void zone_device_folio_init(struct folio *folio, unsigned in= t order) +{ + zone_device_page_init(&folio->page, order); + if (order) + folio_set_large_rmappable(folio); +} + #else static inline void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 83e3d8208a54..24d82121cde8 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -627,7 +627,7 @@ static struct page *dmirror_devmem_alloc_page(struct dm= irror_device *mdevice) goto error; } =20 - zone_device_page_init(dpage); + zone_device_page_init(dpage, 0); dpage->zone_device_data =3D rpage; return dpage; =20 diff --git a/mm/memremap.c b/mm/memremap.c index 46cb1b0b6f72..e45dfb568710 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -416,20 +416,19 @@ EXPORT_SYMBOL_GPL(get_dev_pagemap); void free_zone_device_folio(struct folio *folio) { struct dev_pagemap *pgmap =3D folio->pgmap; + unsigned long nr =3D folio_nr_pages(folio); + int i; =20 if (WARN_ON_ONCE(!pgmap)) return; =20 mem_cgroup_uncharge(folio); =20 - /* - * Note: we don't expect anonymous compound pages yet. Once supported - * and we could PTE-map them similar to THP, we'd have to clear - * PG_anon_exclusive on all tail pages. - */ if (folio_test_anon(folio)) { - VM_BUG_ON_FOLIO(folio_test_large(folio), folio); - __ClearPageAnonExclusive(folio_page(folio, 0)); + for (i =3D 0; i < nr; i++) + __ClearPageAnonExclusive(folio_page(folio, i)); + } else { + VM_WARN_ON_ONCE(folio_test_large(folio)); } =20 /* @@ -456,8 +455,8 @@ void free_zone_device_folio(struct folio *folio) case MEMORY_DEVICE_COHERENT: if (WARN_ON_ONCE(!pgmap->ops || !pgmap->ops->page_free)) break; - pgmap->ops->page_free(folio_page(folio, 0)); - put_dev_pagemap(pgmap); + pgmap->ops->page_free(&folio->page); + percpu_ref_put_many(&folio->pgmap->ref, nr); break; =20 case MEMORY_DEVICE_GENERIC: @@ -480,14 +479,19 @@ void free_zone_device_folio(struct folio *folio) } } =20 -void zone_device_page_init(struct page *page) +void zone_device_page_init(struct page *page, unsigned int order) { + VM_WARN_ON_ONCE(order > MAX_ORDER_NR_PAGES); + /* * Drivers shouldn't be allocating pages after calling * memunmap_pages(). */ - WARN_ON_ONCE(!percpu_ref_tryget_live(&page_pgmap(page)->ref)); + WARN_ON_ONCE(!percpu_ref_tryget_many(&page_pgmap(page)->ref, 1 << order)); set_page_count(page, 1); lock_page(page); + + if (order) + prep_compound_page(page, order); } EXPORT_SYMBOL_GPL(zone_device_page_init); diff --git a/mm/rmap.c b/mm/rmap.c index ac4f783d6ec2..9bab13429975 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1757,9 +1757,13 @@ static __always_inline void __folio_remove_rmap(stru= ct folio *folio, * the folio is unmapped and at least one page is still mapped. * * Check partially_mapped first to ensure it is a large folio. + * + * Device private folios do not support deferred splitting and + * shrinker based scanning of the folios to free. */ if (partially_mapped && folio_test_anon(folio) && - !folio_test_partially_mapped(folio)) + !folio_test_partially_mapped(folio) && + !folio_is_device_private(folio)) deferred_split_folio(folio, true); =20 __folio_mod_stat(folio, -nr, -nr_pmdmapped); --=20 2.51.0 From nobody Wed Oct 1 21:27:08 2025 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010010.outbound.protection.outlook.com [52.101.61.10]) (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 8FC71272E6E for ; Wed, 1 Oct 2025 06:58:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301895; cv=fail; b=k/+frY7o3JE5JeTlWXbUQuW815YKGZlyCo2WCQZhYEDuzLcIIIE4EebVVe54WWmpjMFf1QaZmaUxmSimWcd2hzdUp8DRPoEKU5QCb/EiuBpL1iFlTvjMZ7ez0cE54T7J8CUJEYFG6NUaqIw0QYkX6eZLtFZqC/JLZODj5U5OClg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301895; c=relaxed/simple; bh=26gOEJ90UNYqo4Q0I/6ui8IdW4Ye5+kWyStLbXffNcU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=C2mybjJhD0iXfZv8zDfXsceU1C/pHmaQRDvMdSVIJMb4Vw6pP2n8zkKmqJnvozXmcO6ZsJwQl1gNabTpC+oQEu0O0wOPD9FEJKDBM+8gR0J22Qa+Qv/n4lisqS2l5ului/1VQdFls1str/ckrwwZfLPhJinDYwAVNakOXiz1gMU= 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=uBKL9XJ/; arc=fail smtp.client-ip=52.101.61.10 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="uBKL9XJ/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rpm40GRhpDv8exT8SPwNQEzV9ubCcoTjuCJ6Ki+lhLe78txHyiZ/0ZFumoqZYgsOb4Vs3SOanfVi3kW5A1vBLwE9TtsBGAtEg4MVwad7YDMHxUbkq92uJJ6ignKB5izpqLAmccLClj9Dan+2IDb3zrhWPd6sEWF1BiOVi8+soK/MsfNADctixQCkH9f5t8qW5XjylXeeC99Qlmxm0YVptnIWfiTf2VDyQyUfDP+vQQOROi9qxkjT7Eubgg4sW808rwi4aFofdJPnSmklMRBwn36nVg1TdLo1LNT539r90RwXhLWOFwsFAdVBEt5sHG6HzueC3A/RMOFAiLBmv0SQTQ== 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=zGSmDhVqJHtL/eSfNmUjvSaSPl/EgaRDFf6kOKd4q7o=; b=UCf4VUNCad5QbSbIs+3VeNkGtt2SWw+41jXudv16uVoD53OXK4Q9tuJmxw0FkYNfH+gs2lg1M27suLqhnsxajgwAdbz2/0w8lwOwM1zcboEJgSTt4D5+bCJd5S39MZj+YRI1ukEpjPT0bBAr0WcrsRvdeg0s50/oLJ2jc6Z0A9VAyVhoICuteOSdCP1+tDsA1j8BHZrqbC+nKg7+qBljlNpn7/EQz7/pZ6JTECA3osP54eyvEFr3PDg2wh0YS5E2bpVFORKwRYgxlAWvxD6PyDHOMpJjvGjo6fwv38VD6GFVBGjR0KETnMJ6WB+Qpmw6CVEhnBMpR2CdcbIBJqFPxA== 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=zGSmDhVqJHtL/eSfNmUjvSaSPl/EgaRDFf6kOKd4q7o=; b=uBKL9XJ/h1FfoPPJ83Zpuy0/QYwW+dRgYMOjdgSpNoBGlmt6WQMw/t45Dhb5OCUwTO8LD/yuw8n1pVVTPTUcY+IH4dyyiuqeTUGtsh1WAPPCxnswsURu4QkUNioHwSprQXXieE4UrmGlSrCQLhsWmKbF6jD2Y0zkXaGeuiNxNFWvivO87FxoQ/6hEm+mhouBjexQLvYa3SupmoEFSXYpF6J7Rt2goJqLGsDRsKPEQtNuu7iF9x/cjkZQvt5E1f6ZbxIMNysPiKlpZkPtqOm3rwwcGEzzUQ5MYn7fkIPbuWZMoR5SK3Hnsftvl1IRhzw7rNsUGVRmzaJM4pv0qUzg3Q== 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 BL1PR12MB5779.namprd12.prod.outlook.com (2603:10b6:208:392::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:07 +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.9160.015; Wed, 1 Oct 2025 06:58:07 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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 , Madhavan Srinivasan , Christophe Leroy , Felix Kuehling , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [v7 02/16] mm/zone_device: Rename page_free callback to folio_free Date: Wed, 1 Oct 2025 16:56:53 +1000 Message-ID: <20251001065707.920170-3-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM6PR02CA0141.namprd02.prod.outlook.com (2603:10b6:5:332::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_|BL1PR12MB5779:EE_ X-MS-Office365-Filtering-Correlation-Id: ab28b348-35cc-44f8-8ec4-08de00b7e04d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|10070799003|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?MHJHTi9tejY3UFRuRXlTcy93enVQQ0laSWF1OXJiRzRVSjRtWHkyWVZLcmxY?= =?utf-8?B?bWQrMktXOEVUbWVUbURkdEJTRWgxbitpd0dEbDRocGFjSG8zNEFyd0tVK28x?= =?utf-8?B?NHA3VWZKUENMQVFienBvV2l0bTZKSFZ1WUxlOHFzVFYvMmkyMDVqckNuRW44?= =?utf-8?B?VXhieFcycmdHNjNzMXVLMHlKalVrNkV6WnBSRHhaeXI3c1JEYTdIQkorUTUw?= =?utf-8?B?bkJTZTBnU29BanJScVI4ZUF4NzNlN1ptRGMrUGlUZUFYc2ExTnpaRVgvS0Zz?= =?utf-8?B?STU4dm9TWDhwdTNiSGV6b2R0YlV4Y2JteDM4ZlBEVzl4Zk81YmpvWnRuNDZr?= =?utf-8?B?eThNcy9tUGdPRCtlTEordk1PRi9WZ3JnTGZCL3pDYmRzTnJSNmZSbXZXUURQ?= =?utf-8?B?ZjJwaW16UW00bHFPUHZ5b2pzVU55ZzNXNTZQMjZQeUJINC9ZVWdHY1NjQUtJ?= =?utf-8?B?OUc5WGtpMFlRYkQ0ZmJzRXFhS3NEMzZyTC9vakUvSDFzUDZWVzJveE4xUnEv?= =?utf-8?B?eHY4dVNHdjl1KzNtSVdJYmlSNWE2eHZHQ0pST21JdDJWdjhNOTNTVlgyRDg4?= =?utf-8?B?b0FyWWhVK1FTRTNkQnJNWGEzUkxZcEc2MTg2QlBaeHZQMjV0eVlGNUJFMmRm?= =?utf-8?B?SW5PcldtYVkzVy9CYUZWc2g2cEkrd0tjbVFjQWFEbmlzUWNHeTNTcVphY29o?= =?utf-8?B?Wmc0aXExT1djV0RrN05ucjJQbG9uSXp4Mis2WUhkbU1sSXdwUWsyNmVUOTlN?= =?utf-8?B?VWZqVFpqSDh4QnlDTlUwaEtONUhvcVFWWHllcENpRmZRUmU5ckFpRFZzc3Rz?= =?utf-8?B?bGZuN0RGL3puM3A4OWhYSjlDL2tBdUVmT2czb04vQngxdmxoNGNpRmNTekFL?= =?utf-8?B?SXFBVUg5MlJPZVcvM0VjU3Y5bWdxUTVhTFRBYzVxVzc3ZjVxaXZ4bzNvWXBP?= =?utf-8?B?SXpsUGdBNnpNcmFEQXFUcUdDYUgyN3BBNGdTWEppcUlpV0pXODQ5aVBiL21D?= =?utf-8?B?OVRzc0tydVA5Z3lFeVI2Y1o4QWNnKzJSZUs0VENIQ3ZyZzZCbXFGUkl4NXBa?= =?utf-8?B?N1FSSStPUm9WU29aSldydTdnUXhnTStvNHdyNllQQXQ0WXc4eDYydVZqamY1?= =?utf-8?B?OGpSTXZzdzZUV2J0SUYyd2NRa3U1bXV0WjdKT2dMUUpMcksvd1A0SkM5ZTd0?= =?utf-8?B?QTc2YitLRWIyRloyRzkrb24rWmZJWmxCV2c0d1dqL3doYkVmQ05CVG8wZ1gv?= =?utf-8?B?cXRadExhOVN4VXNhc0dCLzhZNnVDVnBNV1BLOThTSER6akRZS3lpa1BIeHZ4?= =?utf-8?B?UE9oV1hFMk81Z2NTYWtLODBrYUthTCtZN1ZaTVNOQ016VXl3a0RJT0NOd2Zw?= =?utf-8?B?L1F0aklwb3JMcXdpT3hXRzJJTHVxRXhuODhjWVF4Ly93QWFWWWJ6Y1dJVzRR?= =?utf-8?B?NVJ0QURBWE91ZUFqMGZVOGZSalIrSVJsWWwvTGNuSDZOUm1TYVVMTFBjUFB0?= =?utf-8?B?M3BML2IzRG5OUXlTUVdzYnhrTDNpMUpFdjYrTHdMSEEzZGIrR0R2YnVnSzM0?= =?utf-8?B?eTg3dFpmN0pyczBSc2hwY0hiSU1sRkhOckhwRzRpK082UEtIWUZIa2p5aldW?= =?utf-8?B?citxV3VDN3R5YTdMRy9pWWFpcnRzd2ZXc1N1WHdFRy9tc2xPUm93MUdCNklw?= =?utf-8?B?bzdDTytaQ0V0QktTN1QxK0RvL0V3YkVTczlqTWdDU2FZRkYwQ21zVkV2R2hz?= =?utf-8?B?akdYMXVYWi9IYm96Z1JWSS9ZczBHVW1JWTFoY0NQRDF4azhJMkdGeUNiMWNO?= =?utf-8?B?S3QvclRaY2hUVGUxaVNFZzhNaU9HbWVBaEdIeGhCNFVOUmZ2S2Y1bHNJZzFR?= =?utf-8?B?bXhpYUlJNmJQVmpPMDc0bFc1TjdxcVZEeWNvaGV2eUY3QXZWbHV2VThna25T?= =?utf-8?Q?F34HKtGeApm6YF11FYwpYf82eabJBI3N?= 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)(7416014)(376014)(1800799024)(10070799003)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MzZPQ3UxMGdrOGhxZjJFNDFZOEIvSGp1SXF6blh6clg4bENGaFhMU2Q2TTdZ?= =?utf-8?B?emVNRlRtenFSTFh4OTNvR1hqbXd2cDJ5YUlreFlRT2lTMkN2ZlJxRFF6OUdp?= =?utf-8?B?MzN1RWFGeXZUaG9PaG1QeXhkeWhxNFJ5b0diU0J0WVRTVU9EdUZydGpmNDJT?= =?utf-8?B?cndRelg4Uk16YkwwaGc1TFFiMGdBWlVEeUFsRzVRUkF4R0Zwc1dvVEZwWG14?= =?utf-8?B?alpxRW9xNThiY0M2aUxBR0pYdG45QzNBOTBHZzZEQTJxejZuK2doVFNUVUVq?= =?utf-8?B?dEIvejk2OGF1SEN0dWhkRExIeCtOaEllekZNNDM0Mm5RU3BPZjVPZ1JYV3lT?= =?utf-8?B?Q3MwSmFyUkZ3VnQ0clBJY0FPakhmaGFzMUt0SXEvaVNrKzZuSzFlUlA0YWlV?= =?utf-8?B?a3VXY2I0UFJIOURjeitJNWVsQlhoS2c0Q3ptNkdiS3ZLdDk2OWdLNCt1UkpW?= =?utf-8?B?UllDdytkdU5DcDNUN3gwcFZFajFKS3BlbmdmUzlraEYrMG5qMWx0WitNNVZK?= =?utf-8?B?dnFlczJMZ0VoQUg1Z2VRNGNyUWd3SmU1MXBsYk5vb2pvWWU3dUdMdXEzakZI?= =?utf-8?B?ZGQrSksyVHNHZ2VLNzBueWhFbjhFK2EraU1DcGtuVzFXTFBvMXJHOHVEY21h?= =?utf-8?B?RjVNRXpOOG9hVk83TVZScVQ2VTZBeTFRYW9RMG1sVStWcTNwTDQ1L1NWNGg3?= =?utf-8?B?aytsU1kyNnd3aElnR3ZlL2tKQ2FRWXJraEFucXBNbUNPQUpnZEtYaFp6UjZK?= =?utf-8?B?bkFMdnViaDBTVWVBWmJ4ODZDVDZmSmQrQ0UrM2ZnTm5iZ1FrOWp6aHIxcmVF?= =?utf-8?B?bC9TaGx1RTc2VE9nOXhPWGY0YTJ6eGpqM0lVOFBiVUtGUlIvQXZpTThTbjFj?= =?utf-8?B?bHFWQmQyUWZGWUFFNzFXRktXYUZ2REdPM1BmQWU2YmV3cnQ0VU9HTjNvVUVG?= =?utf-8?B?VGVpMkJwOGVwWG5pbE1nUGkyZG0xY0FSWG96SHo0UGp3R3ZOenNJa2hrWkRv?= =?utf-8?B?ZkpkOUdLVkVkWUlrM2Zwd09KR0RNY3dDUzlQSmNGeFdtMjFrZUVjMEprNUh3?= =?utf-8?B?VHI0L3FNdTRiYjNpOWN2d2JOMm5TS2lWUHh4OWFsaXlWU2F5anpFVERrVUdy?= =?utf-8?B?MkdqRzRjajgxWldoV3Q3V3BZbTlTRDJPdEt3UU1wVlAweVVJREdsd3FCZkVP?= =?utf-8?B?QkErS0IybHJ3eTQ2djJMQjQ3SmdGSzFaVTM5WEN4dm52QXZadDZMVkMvek9q?= =?utf-8?B?VjJOUDJ3dU44YTFmejYrdERHbDZPRVdQcWlOZ0FKUGpBckF6WFNMWU8ybEhp?= =?utf-8?B?ZlFwNXp2bUtEbFcvVHJzOWgwOUNMbWdzdlY4alNoUEE4Wlhha1lEUjF3MEpK?= =?utf-8?B?VzBRa1hUV2ltZWFoME9mcklpN2YyV2J6bGZaSVZUVTBJRVY5d3U5aGJ3eCtY?= =?utf-8?B?amZRczNuRWdYN2d2ZTUvTUJmL215dEpIUEQ3dXdaT0dpMzNsSnlUblhOZTRE?= =?utf-8?B?aUdBaE0rbDlrWkcrd2N3b0ljcG5ONDJUdjdEZ05OYlJ3WHY4dDh4MGg2bzJO?= =?utf-8?B?NGU2OW55RTEwVnF2eWR5NDN1ekJGUDZKeHlFZzRpNXQ2Z3k1c1NGY2VXeFhR?= =?utf-8?B?WndTelBQN3B5QjNyMlFNZWF5bkNURk5PWFd1VG8yb1czMGdDQzFDTjRzdDhZ?= =?utf-8?B?SlNIcDVrcDdRdVhSZFpFOGNkVTh6bDJZVkRCWEtqYWZPb2o1ZUhEa3JuN0JU?= =?utf-8?B?bWVBdHV3Q1lGN0RxbjFEeVRwdnJtbW4zcHBPbDYrN0NuWFF5eUFKeWVvT2RF?= =?utf-8?B?RDZHa0VaMXgvVGhJYlB1MXpCdkZSeTV4bHVpVXVZdnZBSzdkbGV1MkF5eU9p?= =?utf-8?B?Q0tJYjl2RURLbEk5OUlCLzBLK01ub2w4VFFzakxpK2pCZG12ZUFGVDltSnY4?= =?utf-8?B?NkRuczFTdCtzdU1wdnRYUTFCaG5ZaDdJRDVMbTRNQXBxamtjYzI4T2xGOTZ2?= =?utf-8?B?UkxTT1VhcTFLMWh1UWVxQkFpQUd4a2Rjb2wyUWhqRXRaNXlEbmExUWUyRThO?= =?utf-8?B?Wkt0VVRIdVUrbXg3K1Q2WjZtN2VSS1g5SHZwbC80Tzg5bkhXa0pEdG1PUFN4?= =?utf-8?B?MXZ1NHNwUE85OW5lbmdiVXE5S2N5RXV0ajN1Z2FsYUlwMDJmb0lsdG5GUlZH?= =?utf-8?B?amc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab28b348-35cc-44f8-8ec4-08de00b7e04d X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:07.7451 (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: /RcQmmpwbf4DOOt6UV9TED/VYNsqGjQE/263B9eC7hn4oA2x2g2qNdCuDjndK4lUj3UnC2Bpub4Y9b7vRkNyPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5779 Change page_free to folio_free to make the folio support for zone device-private more consistent. The PCI P2PDMA callback has also been updated and changed to folio_free() as a result. For drivers that do not support folios (yet), the folio is converted back into page via &folio->page and the page is used as is, in the current callback implementation. 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 Cc: Madhavan Srinivasan Cc: Christophe Leroy Cc: Felix Kuehling Cc: Alex Deucher Cc: "Christian K=C3=B6nig" Cc: Andrew Morton Signed-off-by: Balbir Singh --- Documentation/mm/memory-model.rst | 2 +- arch/powerpc/kvm/book3s_hv_uvmem.c | 5 +++-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 5 +++-- drivers/gpu/drm/drm_pagemap.c | 10 +++++----- drivers/gpu/drm/nouveau/nouveau_dmem.c | 5 +++-- drivers/pci/p2pdma.c | 5 +++-- include/linux/memremap.h | 6 +++--- lib/test_hmm.c | 5 +++-- mm/memremap.c | 16 ++++++++-------- 9 files changed, 32 insertions(+), 27 deletions(-) diff --git a/Documentation/mm/memory-model.rst b/Documentation/mm/memory-mo= del.rst index 5f3eafbbc520..7957122039e8 100644 --- a/Documentation/mm/memory-model.rst +++ b/Documentation/mm/memory-model.rst @@ -165,7 +165,7 @@ The users of `ZONE_DEVICE` are: * pmem: Map platform persistent memory to be used as a direct-I/O target via DAX mappings. =20 -* hmm: Extend `ZONE_DEVICE` with `->page_fault()` and `->page_free()` +* hmm: Extend `ZONE_DEVICE` with `->page_fault()` and `->folio_free()` event callbacks to allow a device-driver to coordinate memory management events related to device-memory, typically GPU memory. See Documentation/mm/hmm.rst. diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_h= v_uvmem.c index 91f763410673..e5000bef90f2 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -1014,8 +1014,9 @@ static vm_fault_t kvmppc_uvmem_migrate_to_ram(struct = vm_fault *vmf) * to a normal PFN during H_SVM_PAGE_OUT. * Gets called with kvm->arch.uvmem_lock held. */ -static void kvmppc_uvmem_page_free(struct page *page) +static void kvmppc_uvmem_folio_free(struct folio *folio) { + struct page *page =3D &folio->page; unsigned long pfn =3D page_to_pfn(page) - (kvmppc_uvmem_pgmap.range.start >> PAGE_SHIFT); struct kvmppc_uvmem_page_pvt *pvt; @@ -1034,7 +1035,7 @@ static void kvmppc_uvmem_page_free(struct page *page) } =20 static const struct dev_pagemap_ops kvmppc_uvmem_ops =3D { - .page_free =3D kvmppc_uvmem_page_free, + .folio_free =3D kvmppc_uvmem_folio_free, .migrate_to_ram =3D kvmppc_uvmem_migrate_to_ram, }; =20 diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd= /amdkfd/kfd_migrate.c index d0e2cae33035..e5203764287b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -567,8 +567,9 @@ svm_migrate_ram_to_vram(struct svm_range *prange, uint3= 2_t best_loc, return r < 0 ? r : 0; } =20 -static void svm_migrate_page_free(struct page *page) +static void svm_migrate_folio_free(struct folio *folio) { + struct page *page =3D &folio->page; struct svm_range_bo *svm_bo =3D page->zone_device_data; =20 if (svm_bo) { @@ -1008,7 +1009,7 @@ static vm_fault_t svm_migrate_to_ram(struct vm_fault = *vmf) } =20 static const struct dev_pagemap_ops svm_migrate_pgmap_ops =3D { - .page_free =3D svm_migrate_page_free, + .folio_free =3D svm_migrate_folio_free, .migrate_to_ram =3D svm_migrate_to_ram, }; =20 diff --git a/drivers/gpu/drm/drm_pagemap.c b/drivers/gpu/drm/drm_pagemap.c index 31c53f724e25..1bd949df2fe8 100644 --- a/drivers/gpu/drm/drm_pagemap.c +++ b/drivers/gpu/drm/drm_pagemap.c @@ -708,15 +708,15 @@ static int __drm_pagemap_migrate_to_ram(struct vm_are= a_struct *vas, } =20 /** - * drm_pagemap_page_free() - Put GPU SVM zone device data associated with = a page - * @page: Pointer to the page + * drm_pagemap_folio_free() - Put GPU SVM zone device data associated with= a folio + * @folio: Pointer to the folio * * This function is a callback used to put the GPU SVM zone device data * associated with a page when it is being released. */ -static void drm_pagemap_page_free(struct page *page) +static void drm_pagemap_folio_free(struct folio *folio) { - drm_pagemap_zdd_put(page->zone_device_data); + drm_pagemap_zdd_put(folio->page.zone_device_data); } =20 /** @@ -744,7 +744,7 @@ static vm_fault_t drm_pagemap_migrate_to_ram(struct vm_= fault *vmf) } =20 static const struct dev_pagemap_ops drm_pagemap_pagemap_ops =3D { - .page_free =3D drm_pagemap_page_free, + .folio_free =3D drm_pagemap_folio_free, .migrate_to_ram =3D drm_pagemap_migrate_to_ram, }; =20 diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouve= au/nouveau_dmem.c index 53cc1926b9da..d34288ebe7d2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -108,8 +108,9 @@ unsigned long nouveau_dmem_page_addr(struct page *page) return chunk->bo->offset + off; } =20 -static void nouveau_dmem_page_free(struct page *page) +static void nouveau_dmem_folio_free(struct folio *folio) { + struct page *page =3D &folio->page; struct nouveau_dmem_chunk *chunk =3D nouveau_page_to_chunk(page); struct nouveau_dmem *dmem =3D chunk->drm->dmem; =20 @@ -220,7 +221,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm= _fault *vmf) } =20 static const struct dev_pagemap_ops nouveau_dmem_pagemap_ops =3D { - .page_free =3D nouveau_dmem_page_free, + .folio_free =3D nouveau_dmem_folio_free, .migrate_to_ram =3D nouveau_dmem_migrate_to_ram, }; =20 diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index da5657a02007..8515b3bfdfdf 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -200,8 +200,9 @@ static const struct attribute_group p2pmem_group =3D { .name =3D "p2pmem", }; =20 -static void p2pdma_page_free(struct page *page) +static void p2pdma_folio_free(struct folio *folio) { + struct page *page =3D &folio->page; struct pci_p2pdma_pagemap *pgmap =3D to_p2p_pgmap(page_pgmap(page)); /* safe to dereference while a reference is held to the percpu ref */ struct pci_p2pdma *p2pdma =3D @@ -214,7 +215,7 @@ static void p2pdma_page_free(struct page *page) } =20 static const struct dev_pagemap_ops p2pdma_pgmap_ops =3D { - .page_free =3D p2pdma_page_free, + .folio_free =3D p2pdma_folio_free, }; =20 static void pci_p2pdma_release(void *data) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index d2487a19cba2..cd28d1666801 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -77,11 +77,11 @@ enum memory_type { =20 struct dev_pagemap_ops { /* - * Called once the page refcount reaches 0. The reference count will be + * Called once the folio refcount reaches 0. The reference count will be * reset to one by the core code after the method is called to prepare - * for handing out the page again. + * for handing out the folio again. */ - void (*page_free)(struct page *page); + void (*folio_free)(struct folio *folio); =20 /* * Used for private (un-addressable) device memory only. Must migrate diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 24d82121cde8..9dbf265d1036 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -1374,8 +1374,9 @@ static const struct file_operations dmirror_fops =3D { .owner =3D THIS_MODULE, }; =20 -static void dmirror_devmem_free(struct page *page) +static void dmirror_devmem_free(struct folio *folio) { + struct page *page =3D &folio->page; struct page *rpage =3D BACKING_PAGE(page); struct dmirror_device *mdevice; =20 @@ -1438,7 +1439,7 @@ static vm_fault_t dmirror_devmem_fault(struct vm_faul= t *vmf) } =20 static const struct dev_pagemap_ops dmirror_devmem_ops =3D { - .page_free =3D dmirror_devmem_free, + .folio_free =3D dmirror_devmem_free, .migrate_to_ram =3D dmirror_devmem_fault, }; =20 diff --git a/mm/memremap.c b/mm/memremap.c index e45dfb568710..4c2e0d68eb27 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -289,8 +289,8 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) WARN(1, "Missing migrate_to_ram method\n"); return ERR_PTR(-EINVAL); } - if (!pgmap->ops->page_free) { - WARN(1, "Missing page_free method\n"); + if (!pgmap->ops->folio_free) { + WARN(1, "Missing folio_free method\n"); return ERR_PTR(-EINVAL); } if (!pgmap->owner) { @@ -299,8 +299,8 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) } break; case MEMORY_DEVICE_COHERENT: - if (!pgmap->ops->page_free) { - WARN(1, "Missing page_free method\n"); + if (!pgmap->ops->folio_free) { + WARN(1, "Missing folio_free method\n"); return ERR_PTR(-EINVAL); } if (!pgmap->owner) { @@ -453,9 +453,9 @@ void free_zone_device_folio(struct folio *folio) switch (pgmap->type) { case MEMORY_DEVICE_PRIVATE: case MEMORY_DEVICE_COHERENT: - if (WARN_ON_ONCE(!pgmap->ops || !pgmap->ops->page_free)) + if (WARN_ON_ONCE(!pgmap->ops || !pgmap->ops->folio_free)) break; - pgmap->ops->page_free(&folio->page); + pgmap->ops->folio_free(folio); percpu_ref_put_many(&folio->pgmap->ref, nr); break; =20 @@ -472,9 +472,9 @@ void free_zone_device_folio(struct folio *folio) break; =20 case MEMORY_DEVICE_PCI_P2PDMA: - if (WARN_ON_ONCE(!pgmap->ops || !pgmap->ops->page_free)) + if (WARN_ON_ONCE(!pgmap->ops || !pgmap->ops->folio_free)) break; - pgmap->ops->page_free(folio_page(folio, 0)); + pgmap->ops->folio_free(folio); break; } } --=20 2.51.0 From nobody Wed Oct 1 21:27:08 2025 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010010.outbound.protection.outlook.com [52.101.61.10]) (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 A931B26E6F8 for ; Wed, 1 Oct 2025 06:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301897; cv=fail; b=U4l1R0eeO7qS8BkxGyaCRC7ztTWlliSZNroXI5Qy7X9nLJV18o9aTTKGXO4/j5uGRYVAVEPI5FA3t/WgepisInw2hnamNStMSMPUmkyxWp+TfR/qInu3k8Ns55x3qK7AWebja4yWnAl9T8kDYn3sMq3PByuJoxM6epNePJzCQLk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301897; c=relaxed/simple; bh=H5015kMvn8hlPQd3/o4HiaHlrDVnqyI9trvjMmqeAWg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=mqAi0JZZCk4sx4gsXULp6eDcaOiMd7IcBRiEhEdQyGCY8g7z3Diadj+cKJb0Bn6fKXTV57LYs7UGKH1JGMJMBBeS5cPpNdelZkCWt1HgpTyEWw4sO8ZIb/kMtYbvfNcP4snEvaq2+xPj64/t02xQLG20GFUSX6DBGJVQxNOQOUg= 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=krNP7NcM; arc=fail smtp.client-ip=52.101.61.10 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="krNP7NcM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kyLA17htXA+XUdPw+v/kk9FR7sWYfKBhp0QNM9/WT1IHwNlvjr5J4MgGNfSRUoXzBERpdqhPg31tVjV/WOomBnUAVEmcf4XsNGd14TzMZ0QLRiOqwZWeXGYvfYWRo8ckHQ3y2M35RbR9atfnpHQ64CCga1uhTC9ran/3lOMZALDyVZXFru8vh55FwFXtOuq6SI/FzqLL8TbgEGM0VxbKNIa8qfciGEMnoyrK6p2CPGWCNTn4/rR8+LY8ztjqBVv94M+umgWVzBUQIqnRMLBl2HPmiueAFOmxp2D0ix1totJDewzxujC7u1W1JyEWAAzQ3599XFak/W+qTXV5RjTlXg== 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=n01txRJv0lR0/+qa8fqOLUodrv003+959W2nsYdpc1A=; b=o/iV3QvjeND6l61kpyeO0s5ld1T4p8p3ia8R55mUD/V8+R6/EapWKCCZGptvsWFdyu655VDz5uBNpLdgTThm5fbqcY9TOunG4h5cuIEu56lkdJpGpIb5bS3ZSopoikF6dUAljW3ajs84KN17M3uCkCG15hYq7o1wkIs7yIWMa3O2kXvNJaxS9XUM8Lh/Z31SKSgnFfozwtu+fnKXToCPVOClqUjkJhBZ8ltcnMz7acP6KBOIKkljWpOE5D2+zsc8QF62ElkMdtzo4p2oEPEhIydIYop2xNffQOYzbil58PV3zBRGg6kRLd7VBNgfDOstejeDD7n4mpralZePDO6mwQ== 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=n01txRJv0lR0/+qa8fqOLUodrv003+959W2nsYdpc1A=; b=krNP7NcMBINQzS33SDH0GhOAa0cdPNTuHu4A2g5gHTTFCOTQAFsf6ONl7YBYt3Igj+895tFDerz6u98yotn8ayCT6mRGnYiFNIUVRHMnlouqLaYnOwM5UYhaCMyMVlbeCuHNHgxqUshV6HYqKJDaIWbypZUw6+zQii1aIPSW4bejtJNoHGxfYqw1hokVMUWYcqxudCGRGTgGIEXTj57vtq0sveAua8rd6xQWyrR5+FTz1jNE18HHrRjh4Xn1u7KNBlvY/Nk+gXTtGvmJ1B9VdW7ccylNjo51Mx5AXJLeaz4GdaSCbA8v4Z1ZE59bwiiApHBtSXagX6BUg8XXP/iFcw== 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 BL1PR12MB5779.namprd12.prod.outlook.com (2603:10b6:208:392::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:11 +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.9160.015; Wed, 1 Oct 2025 06:58:11 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 03/16] mm/huge_memory: add device-private THP support to PMD operations Date: Wed, 1 Oct 2025 16:56:54 +1000 Message-ID: <20251001065707.920170-4-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0051.namprd05.prod.outlook.com (2603:10b6:8:2f::12) 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_|BL1PR12MB5779:EE_ X-MS-Office365-Filtering-Correlation-Id: 65267f84-7d08-4993-c9fd-08de00b7e294 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|10070799003|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?RFpNT3dYaDBra1Jic01leUxCYWNkdFYvT1ozdTVxVTFEQU4wbFkwT3VqdENw?= =?utf-8?B?MXI4clFZNWRHaHVGRHd3a2xKRzFuOWx4bno5cWc2VjZ1MVNXRUI4dDgxd0ht?= =?utf-8?B?aFhYWTVVRTQ2WktXeEtCS1FlSWVOQ3NQbU1uOWxGQ0dIaXNlZjgrL05GN013?= =?utf-8?B?NHpFSEhFczI1OGgvOXNKS3BRWnZzUTBxQ0V0dms5a0FwbmVETFVKUnpvbWRT?= =?utf-8?B?SUpjb2p3U21nQjZvY29LZnNMaWtPc0J0aFludlZhM3RxclQ1WWJIcDlPdmhH?= =?utf-8?B?ZmMxS01NMHdsdnBOZUNOaDNuOWN0ZStIWjRFMnhiMWovekRsT0R1N1ZYSzN2?= =?utf-8?B?OUFKYVRBanMvQWt4RlZyNldCWTJEQ3R6ZXJSQjlnaXJocEF2M0J5RzBVNTVQ?= =?utf-8?B?eEVTWHZyejgxR0U2MS9VTlZjU1JVdWhjZDRmYzBTM2tQcmlNSDdhTGRkdDhl?= =?utf-8?B?c1JncVFDWlZpUitEbmZkcGt4N2tCd2x5KzhmKzA5NktwWk5Id1NBWGFKcXZR?= =?utf-8?B?NWtlNEFER2JYclQ5VDdWdTBBYUZwa282aU1WaWtaTHVDak9xZDVTbHR3a1Ux?= =?utf-8?B?OS9UQzVENm9HTXdJdHdTZUZMZzQyL1pzbS8yWDdRdER6VGhGUDVySzh3a0Iy?= =?utf-8?B?WWEwbno2ZVpVM09JNXpyNk1SbGhmOFZjQVlCZitlTFQzc0FEdFE2YThCNito?= =?utf-8?B?TnFyTTIybG45M3lDYlE0RXhoaDd5Q2gydXRIOTR1UGEzRS9pTnI1MWY5dGIz?= =?utf-8?B?dG0yalo0d0NKZG5ETjRUU3QzVVZkaFVTZ0ppN0VLaXgxeE52MjZ4MGhJUm1L?= =?utf-8?B?SUhybHBldTFMbU1BYU5NWEc2SHFpcSt2dkFEQmZxVnYwTUc3YlVSQ2FEdlUr?= =?utf-8?B?M0xOOUY2Rzk3aFJmOS8xUnlpcGQwa3ppQlJnRi92Y2pTR2FMWENtcU12RzZZ?= =?utf-8?B?WkQvNnhmVmlmcmFLRG5NTmJqRzIyYWN1eC9HUW1KcTRvQU9YVGxLUHNPcG82?= =?utf-8?B?cWVhckU5L1ZrN3YrOVlKRUxma1JUR3VBdGlFZlpYUnV1MklFYm9TRlJrV1g3?= =?utf-8?B?SVZnRkd0czhURFFvWlVMUFMrZFY4a0lTMUhLL2xFcGIvR2FVQk4wR0lnOE0z?= =?utf-8?B?QS9TR0JxODNGWFo2T3dmdmNaUVZEdTNrL24xNXZFcHlIMDA0QUhPdDlPSDZu?= =?utf-8?B?QjZZbWw3Q2o5azIwSkorcWovTlUwYTRDOGlRM3hTZW9iWHA2Ump1bTZmYUxY?= =?utf-8?B?ZENGdEkxRGNua3JyWU9jSTRBb21HcDZGUlNjZVdyeU1WWHhpYWZqdktCUGo2?= =?utf-8?B?YXlaT0VFZ0FpZllPems2NDdhVlBIeHUzb1crVTliVmg4MzBTSktVb3FTYTNK?= =?utf-8?B?WWExMERuT3JZZXJwL3ZYdk5jajIzRlZEZVNuUU1hZEZzSlMvL1VhMkhuRDJV?= =?utf-8?B?RXhlYWxDbVBhWlJBZjFRcysyRlhqeWo4NlRDVWpGVlB0ZzQ1V0l4NUJ5Z0dP?= =?utf-8?B?NlU5dFV6S0hnc3FwYXZEUW1MZzJiV1FGV0x2WE9GUjRqU2ZMQnhlUU9UZ1FI?= =?utf-8?B?c0h3NlVpSkxTNTIxRkVDeXNWTGU0WjdieHVaL1FWSGhEN01pTEFUd2trZmJS?= =?utf-8?B?SUFzenZSVjVDWXkrYWdwYm4xWFNnaUJqMlV0VjFXNjRRNzhrSUh1U2t4V2FI?= =?utf-8?B?V3dWZVV5c1FFd3BocVNWdTIxNWd5S1MvVFNmTzk1NzMrWXdFdTdhTzlidDlQ?= =?utf-8?B?TXphT0NFUXJXNXpRc0N6Q3Y1NDcrZmxWOWF1Ny9NZXVRY043bHhibk5USC83?= =?utf-8?B?Rzc3Y1ZUSitPUDMzNnNtVTBEYUdhSW8yeUxXclVCMENLbGlmTnBmMjlvSWxs?= =?utf-8?B?L2Fnbi9KdjVrNnFEbXc5YXFyMS9jZHgrYTJMUUJDTjBYNGIrTmxpQWJyZjFo?= =?utf-8?Q?LjKLJsprj3F+HB4QS0XNoavEFJtv1eHh?= 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)(7416014)(376014)(1800799024)(10070799003)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T1dMSk05ZWRoUll6Z3lzWlZGbDRzc1VrTVBYY0llY25TNnAwRE1WSjhvcGpS?= =?utf-8?B?Zm5EWlhKd0FZc1dVNXFTdGJkQVJPREJyV0tNamUyRGZMRjQ1MkxnUDd2bHNI?= =?utf-8?B?TDZZV3dWM2NtOTduaWkxMEFaYkRyTlZxMEhqN0RXaFBtQUpRcUZJQ3U4Wldy?= =?utf-8?B?VWVOeTNjamFwU2R4ZE13WTBYdU9jTks5RGpEV05vM2lndEcyc203Sk1ITGNF?= =?utf-8?B?SzJxTjFKMnJ1ditpTXdGSjhPMUg0TnVtU3lOYWI5ektPbnhTYmlaYU5saSt5?= =?utf-8?B?cW4rNEQrWkdPS2NBQmY4amVWanNjbG4ySDdNK2tvNndQVUM3N2dQS0ZiZ3lx?= =?utf-8?B?NmVSbTJWNy94Zjd2RDg2RGNoQnZaVHJ0LzNPbGVHUUM4QmZjbmlQbHhOUVE2?= =?utf-8?B?QXQ4bTEwdWxqU3h6VTZldThCLzVNWWUvZWFZamZIOFhoUkNFdysxMTZId2t0?= =?utf-8?B?eWY1Q0NrV1dJVE9qMnNjQnhGcjcreGZDTS9FSzNJVFBXdXQrVVpNVWlxelpQ?= =?utf-8?B?aUtKTjF6NUlRNjZlZUdCV0hVQVpBcWpBT0VPQUJrTzNwWEhQQWNiWENsd0Q4?= =?utf-8?B?Zk9HZzZsekxTeGJrNWNGWWs0RnBoZUM3L2ljb0I2M1F4aHpzd1NPMmdUa1R4?= =?utf-8?B?ckM2akswYkdvd0I3K0R6RW9qdlpIaTA4TzY5S1g4RjRnYXF0VStKTzVBWlVB?= =?utf-8?B?UW9kVzBqZ3p2MU50QnhsQmVIQkZRQ0N6aWFKOTBjY29DZHBqZEZuZ3V3UDBZ?= =?utf-8?B?VXA4UlNnMHN6bXZRNHhvdXVudk1TR01WWk1WeUQ2RmNIZEVGbDNkaU9jdFBC?= =?utf-8?B?M0ZDdDl4U1MwNTJDYXA5WVAwN2xHU01ZWWlwVkkwblk0TkZWb0VnVy9mTzlV?= =?utf-8?B?TUNWbUVramprb3dyMDE0RXlMczR4cE9rL3NuUEJ1S01MSXVUT0QrQTJnV1Bv?= =?utf-8?B?elp2QkRPUTREUTR0REZ3SyttZHJleGw0Q3hzYVhLZUhUZkwrTkNIa3RkSW40?= =?utf-8?B?R2thclBLZ3FnZGx0MFNVYjJPdW02M0tsRmp0NUlrTXpyTnRCWWMxSFdML1k1?= =?utf-8?B?M3BhWGtOb2Z4Y05naGdkMFJmelAzZmlUNG5Za1ZUSzJ3clRqTkw5bWF0Rzha?= =?utf-8?B?VXZpMzZsaEZhd2ZHUW1nbUN6MUdYMFBURzZCVjhnS1dFRjdRMmw3SGRIaEV3?= =?utf-8?B?d1hoOE1jbVhRM3JtTWk5WTBvRWhTVzlHbk5PTENPaE9jYisyOHJvTXN3dnd5?= =?utf-8?B?ayt6V2x0aEpYVXhFaGYyUVpyMWpwM0pQTVlIY0ZFa0QyZSs2aTc4TFZ5M2J4?= =?utf-8?B?b1hvMkZHUjJ6aGtUdE9mb0pHZENjVWVRM2FLTDZncUZHbktlZ3lKVnVIRDJy?= =?utf-8?B?UDNUZ1VtblZITEFpNFVCQXdyUmIzTHhQUUZ6eXR2aTJVRnFGUyt3dDhwQkpJ?= =?utf-8?B?Z3puYm5NWWk3ekRFLzJJTWVNdWxsNnRkRUwzbkJsYXJrSFE3T2tPMS9zbUFJ?= =?utf-8?B?UkRKdlhIYURUeGlvRVZYWWNLbVYvUzVzdzdZVmZFOTg4aTZDNDdWeGsvU0hD?= =?utf-8?B?MHAwaEhpR3hSRVJiK1V5cXh1T3RwTVpOWUxCa3BzUmpNcDMvUCsveTdvM1F5?= =?utf-8?B?QXRTVDFHRVdMellEejVLNmc4WUFSek1mUTV6QnljekROK2Uya3YyVms3dFVL?= =?utf-8?B?V2w4QlFXcTJwQmcyM3ZGeEJmY0Q0MnBXNE1wK1FmLzQxZzJScEViZ0s0N0tC?= =?utf-8?B?WjBYZ0xaQ0NMR1dxTnJoSzg3eG9ZS2QrZ05QeGk4SHdrSHdST0RCRlpKNFdG?= =?utf-8?B?UEVPVmx1c2k0ZHNSSk1zUnBTQlZJdzZHNmJSL0o3eUZPZDhoUUg0OXo4UmNK?= =?utf-8?B?aG9vMitZT3drTnZOay95KzNMUlhkVEdEUHVCbGM2R3JoaXZhSkhBTW1kZjVy?= =?utf-8?B?ZlFhUlJGSk54N281ZE5NU1VWQ1VBb1Q1K1JqRCs4R2JYczltNW9GT2oyOFNk?= =?utf-8?B?QWhzbkJWZzdLd3VydW9IVU1pNXRYbGZVcVhkZ3h5aWNHQ3RheVNRSXgxZExI?= =?utf-8?B?SjhZS2JYWWVNb0FVUVhGdmFadzZzaG5xVXU5TU5Xd083RldYOElnZnl6TzdV?= =?utf-8?B?VWlTK3Q2MDhUUGQrQUtneXV6a3B3Umc5UGVOd2FZaE04WkNvUHI4VEpMTDc4?= =?utf-8?B?MWc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65267f84-7d08-4993-c9fd-08de00b7e294 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:11.7092 (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: G3JpXmPWT1y0+08cl4OWpN2cc3PXBD0IbaKVqNz0XRX5enB26RU2n+Bx8EkoKa/CGWG3vxhzIWPu3lJYxoPZjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5779 Extend core huge page management functions to handle device-private THP entries. This enables proper handling of large device-private folios in fundamental MM operations. The following functions have been updated: - copy_huge_pmd(): Handle device-private entries during fork/clone - zap_huge_pmd(): Properly free device-private THP during munmap - change_huge_pmd(): Support protection changes on device-private THP - __pte_offset_map(): Add device-private entry awareness 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 Cc: Andrew Morton Acked-by: Zi Yan Signed-off-by: Matthew Brost Signed-off-by: Balbir Singh --- include/linux/swapops.h | 32 +++++++++++++++++++++++ mm/huge_memory.c | 56 ++++++++++++++++++++++++++++++++++------- mm/pgtable-generic.c | 2 +- 3 files changed, 80 insertions(+), 10 deletions(-) diff --git a/include/linux/swapops.h b/include/linux/swapops.h index 64ea151a7ae3..2687928a8146 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -594,10 +594,42 @@ static inline int is_pmd_migration_entry(pmd_t pmd) } #endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ =20 +#if defined(CONFIG_ZONE_DEVICE) && defined(CONFIG_ARCH_ENABLE_THP_MIGRATIO= N) + +/** + * is_pmd_device_private_entry() - Check if PMD contains a device private = swap entry + * @pmd: The PMD to check + * + * Returns true if the PMD contains a swap entry that represents a device = private + * page mapping. This is used for zone device private pages that have been + * swapped out but still need special handling during various memory manag= ement + * operations. + * + * Return: 1 if PMD contains device private entry, 0 otherwise + */ +static inline int is_pmd_device_private_entry(pmd_t pmd) +{ + return is_swap_pmd(pmd) && is_device_private_entry(pmd_to_swp_entry(pmd)); +} + +#else /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_ENABLE_THP_MIGRATION */ + +static inline int is_pmd_device_private_entry(pmd_t pmd) +{ + return 0; +} + +#endif /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_ENABLE_THP_MIGRATION */ + static inline int non_swap_entry(swp_entry_t entry) { return swp_type(entry) >=3D MAX_SWAPFILES; } =20 +static inline int is_pmd_non_present_folio_entry(pmd_t pmd) +{ + return is_pmd_migration_entry(pmd) || is_pmd_device_private_entry(pmd); +} + #endif /* CONFIG_MMU */ #endif /* _LINUX_SWAPOPS_H */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 1b81680b4225..8e0a1747762d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1703,17 +1703,45 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct = mm_struct *src_mm, if (unlikely(is_swap_pmd(pmd))) { swp_entry_t entry =3D pmd_to_swp_entry(pmd); =20 - VM_BUG_ON(!is_pmd_migration_entry(pmd)); - if (!is_readable_migration_entry(entry)) { - entry =3D make_readable_migration_entry( - swp_offset(entry)); + VM_WARN_ON(!is_pmd_non_present_folio_entry(pmd)); + + if (is_writable_migration_entry(entry) || + is_readable_exclusive_migration_entry(entry)) { + entry =3D make_readable_migration_entry(swp_offset(entry)); pmd =3D swp_entry_to_pmd(entry); if (pmd_swp_soft_dirty(*src_pmd)) pmd =3D pmd_swp_mksoft_dirty(pmd); if (pmd_swp_uffd_wp(*src_pmd)) pmd =3D pmd_swp_mkuffd_wp(pmd); set_pmd_at(src_mm, addr, src_pmd, pmd); + } else if (is_device_private_entry(entry)) { + /* + * For device private entries, since there are no + * read exclusive entries, writable =3D !readable + */ + if (is_writable_device_private_entry(entry)) { + entry =3D make_readable_device_private_entry(swp_offset(entry)); + pmd =3D swp_entry_to_pmd(entry); + + if (pmd_swp_soft_dirty(*src_pmd)) + pmd =3D pmd_swp_mksoft_dirty(pmd); + if (pmd_swp_uffd_wp(*src_pmd)) + pmd =3D pmd_swp_mkuffd_wp(pmd); + set_pmd_at(src_mm, addr, src_pmd, pmd); + } + + src_folio =3D pfn_swap_entry_folio(entry); + VM_WARN_ON(!folio_test_large(src_folio)); + + folio_get(src_folio); + /* + * folio_try_dup_anon_rmap_pmd does not fail for + * device private entries. + */ + folio_try_dup_anon_rmap_pmd(src_folio, &src_folio->page, + dst_vma, src_vma); } + add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR); mm_inc_nr_ptes(dst_mm); pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable); @@ -2211,15 +2239,16 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_= area_struct *vma, folio_remove_rmap_pmd(folio, page, vma); WARN_ON_ONCE(folio_mapcount(folio) < 0); VM_BUG_ON_PAGE(!PageHead(page), page); - } else if (thp_migration_supported()) { + } else if (is_pmd_non_present_folio_entry(orig_pmd)) { swp_entry_t entry; =20 - VM_BUG_ON(!is_pmd_migration_entry(orig_pmd)); entry =3D pmd_to_swp_entry(orig_pmd); folio =3D pfn_swap_entry_folio(entry); flush_needed =3D 0; - } else - WARN_ONCE(1, "Non present huge pmd without pmd migration enabled!"); + + if (!thp_migration_supported()) + WARN_ONCE(1, "Non present huge pmd without pmd migration enabled!"); + } =20 if (folio_test_anon(folio)) { zap_deposited_table(tlb->mm, pmd); @@ -2239,6 +2268,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_a= rea_struct *vma, folio_mark_accessed(folio); } =20 + if (folio_is_device_private(folio)) { + folio_remove_rmap_pmd(folio, &folio->page, vma); + WARN_ON_ONCE(folio_mapcount(folio) < 0); + folio_put(folio); + } + spin_unlock(ptl); if (flush_needed) tlb_remove_page_size(tlb, &folio->page, HPAGE_PMD_SIZE); @@ -2367,7 +2402,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm= _area_struct *vma, struct folio *folio =3D pfn_swap_entry_folio(entry); pmd_t newpmd; =20 - VM_BUG_ON(!is_pmd_migration_entry(*pmd)); + VM_WARN_ON(!is_pmd_non_present_folio_entry(*pmd)); if (is_writable_migration_entry(entry)) { /* * A protection check is difficult so @@ -2380,6 +2415,9 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm= _area_struct *vma, newpmd =3D swp_entry_to_pmd(entry); if (pmd_swp_soft_dirty(*pmd)) newpmd =3D pmd_swp_mksoft_dirty(newpmd); + } else if (is_writable_device_private_entry(entry)) { + entry =3D make_readable_device_private_entry(swp_offset(entry)); + newpmd =3D swp_entry_to_pmd(entry); } else { newpmd =3D *pmd; } diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index 567e2d084071..0c847cdf4fd3 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -290,7 +290,7 @@ pte_t *___pte_offset_map(pmd_t *pmd, unsigned long addr= , pmd_t *pmdvalp) =20 if (pmdvalp) *pmdvalp =3D pmdval; - if (unlikely(pmd_none(pmdval) || is_pmd_migration_entry(pmdval))) + if (unlikely(pmd_none(pmdval) || !pmd_present(pmdval))) goto nomap; if (unlikely(pmd_trans_huge(pmdval))) goto nomap; --=20 2.51.0 From nobody Wed Oct 1 21:27:08 2025 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012029.outbound.protection.outlook.com [52.101.53.29]) (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 F1952275872 for ; Wed, 1 Oct 2025 06:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301903; cv=fail; b=M0e6PvL3GqNPkwMP3nM/5H40pHvTvEutT/yXadBgbgOUTEmMFtEBwKe5je8mEYtEDfSZmEE5ZEOsGxPIalWCRlI+OeKq8M868E3W1on2gFXxwgbiRR40zImN1B0u0HmJin4o2Ru/C9mkzrYbA1rmypprS/OCs+iZaCKVRl7/r+k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301903; c=relaxed/simple; bh=cSIDJaS/6bIvRslDrS5CeQ2aGlelGlXLqa0j0W6oKTM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ugSAJ2iAce1XWdADieX0Kqw3NuCw4ASsmDzOP0ygQBq0GMz310X8f56DLuliMueV0QmLkiHIi3vqaOHJyRZN85JjY/45UZsdgiMtvErlg6e2ECVIkZvG6utDXp7Moch9MvPTVMHU5R66OJLSGpXWBLJvi7to1OHu2R6I6hZkBU4= 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=mX4CvQoq; arc=fail smtp.client-ip=52.101.53.29 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="mX4CvQoq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Nq63B3bcwHRpUZoL/QAjGYbTLUsQx9cV+b0fi9z1buj8n3a5tplinG04dzmZz8gKXVP+cHPGBo9wdm1GrjsCStyb5oJ5ZLtFZCDlM0ogL63TGaPb0yxL0Qy63qtXULWhR+TrJOiphSvvfhipgoshxT8tMMZFCZ34wWhZNDpnK692PeEmjnk8kKIMUmC++B25aoPu0OjZBDtu1DGeZ/aci4tQXC2frVwNFLm6iT4gR+28T2/mOfgWtV03RSaX7/695sBK1mLez5NiOkoOtt7COJQlOAf7V+8JzdMulL9/36G2o+XSYaHwDOpq3e27YcVlowEtib439nkIa4hjzd345Q== 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=TTIeljN4phatoi2xIoAxM+GG4T0FIyehCs4+iQbIzQI=; b=uTyPw+x/xZx8RSSxRVNhY1a0+XKIJsiYwhozBtbNKpPF289CDnVAvXF+FhVsajjeV83+2rM2vmubGTbI0WY8egVpkhHRAPspjiwlvaiQ26Xots1X7afMJMv6FtBOm/UOKg0MujmPiuRXaum3cl4GnXLksEkTjswhGZ+FGydzOwuJdUTydbncL6M6IzobuMX6tgXyWmytbb61d5YeLS+/PWWseTRsdAxbRrF4/KOXbZcK2gy0h7c+21gawcAw5iro9VcEXY/9O8LLGfgM9SAVg0lB0F/yPaN7PS1XXRBcN9puO/+Y+7bx4fTClQXzIuFWSKOkUNUi1/9Odj7Msqp3Ew== 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=TTIeljN4phatoi2xIoAxM+GG4T0FIyehCs4+iQbIzQI=; b=mX4CvQoq6EKje1YdW8Y0fDKZPYzy49Ni48gnZwOxXOyL5EBk9asYdUnNJgvarRVgcu5QAxsx1yksk45xolxNc9o1ekJaEdItknGWznceTBlxnstWBdgLXKT25s/qP9CAmjRGCyJNxsyFjid8Odt0sma5hrCgC7+8vCWDuRoZztXeN6xwfGxS8NbmLkm/Ju6x5X7hveoAptJnX+OTo23Y5QTmAM1LEMuTK+AeEDQWvrmwo6bUaP+fozxwird56pPBYJL/X9ndW24VOnqitkhIoNKE9scGJxXNzVg1Yts8k2S0i4CVagGA2eH6a6DBXu8SCzZY1d3hdr+5i4k7jkag1g== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:16 +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.9160.015; Wed, 1 Oct 2025 06:58:15 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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 , SeongJae Park Subject: [v7 04/16] mm/rmap: extend rmap and migration support device-private entries Date: Wed, 1 Oct 2025 16:56:55 +1000 Message-ID: <20251001065707.920170-5-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0047.namprd05.prod.outlook.com (2603:10b6:8:2f::26) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: cf2b5758-ea7d-4628-f91f-08de00b7e4fe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?dzg2U0VWbVcyVEdMbXFnOWlKYVJHV2ZCdXMwcUJYMHNmMGtiN0QyaUFYZ21J?= =?utf-8?B?bXYxVno1L0czOENJa0o5RlFEV3FrSFhQK3JtanBqRW56ZGtWV2NQeXZGVklB?= =?utf-8?B?NUhjWTc3NW5TTlBqTDdFVjRsMlk4S1BJeWt3Z2NXd0lZVVVmSkp3dnpwSzlG?= =?utf-8?B?V2tSZEhjcW9IZytkeitWcmRYdDBKNndsLzVhM3UxRy9DQ3ROcGhBUjRQSkU5?= =?utf-8?B?WWdqck42Z29yZnVCRktzdk9Oa1YzSjM2UGh0NUFwZVh6dmJwZXJGRDFzRmFh?= =?utf-8?B?ZUlpOWVtUUo1d08xUGowY2RFUFAzNkg4U2RVZndlWFZQTVNINUlQcWorWEFF?= =?utf-8?B?c2RPUkV3UStQRzBmOGl1TzV5d21KeGNqRlh3eG9NQWZ1Zy9XRlk2TVduQzdy?= =?utf-8?B?d0hRdjVMYWt3WTlWbFY2WG9hZTR6UzYweVdvZDlwTjVmTytKOTgzeE1rd3NQ?= =?utf-8?B?VFZhd3ZtNE9PM1ZhVUE3RjZVd3p5YVBnUEljbWIyeFNpdmh1bXBRUXVHNW1J?= =?utf-8?B?MjkxT1k5MXFzcTdrWUVnZnYzbmdtR0FKVTdrWDJXNi93bFNPZ0lTcGtZOG9L?= =?utf-8?B?eUZQM3N2OWxrN0JVSFQ2bFNtVkp5RzRrcE8vcktQajFKOWMzOFZ3YVE5Ulhz?= =?utf-8?B?c0dYWVdqNjB1K0t3bDl0d1dxcThZam9NcHdnaUhaTUhKNDRSd2RNWWpkZUcy?= =?utf-8?B?UnpFZE9xNGkwWDhiZ3ZMblFpWTFCS25xRG5uZ3cweVlPZ25tNElIV0IxelV6?= =?utf-8?B?akh4TzlyU3BTK0hnYWJad1JUcmFGRXFtYmZ4MEJlN3htRHFMYXJWNHJBTWNh?= =?utf-8?B?ZG1uUmQ4bGNYRVdLYUx2UGlsR3c0UGhwaXhwdzFYRzBKSEplNDVLWjR0WXFO?= =?utf-8?B?QnlsS04yVG5DSFZ1OElDSDZJL3FIY3BiOXhzNFNwNEZjVGRPcWI0ZklrQTRm?= =?utf-8?B?emh4Qktlc3lzbGdLQ0tQbXhseUk1UFpJeFBBRm0wbTI3UXBsR1RHQmJOZnVa?= =?utf-8?B?UkJBWGtuSVY2OXlUSXR6NHc3VU4wZmVNTkdKWTNlZUhYb0ZLbTZKUlJPZzZl?= =?utf-8?B?aDZaNVI4ZVhRcDdNWGd6b25WUm82V3BQVEZaSmpPUW1PN0EvVzRFMGtWOFVn?= =?utf-8?B?bnRRQUdMSTFvWCtQK3BybFRyRnN4ZXgycTBIejdXR2RQcWRIWjRUQ1ZOOHBH?= =?utf-8?B?dW5GaFRxa3NTR0ZsRUlJUHUvcCtuVWlzWWFicXEySDRYMnVkWFFwNnJPWDI1?= =?utf-8?B?ZERUZFl1TTFSeEYxVWs2NDZZSGczWFUyR056Y01ldWJaRzdsOU02SFBjaWRB?= =?utf-8?B?UTlDTlh2bExMTVlTSkRBcjlmUitBMi9obGhZNHcxaFZtMTlNZk5YeVJRV1FT?= =?utf-8?B?S0JQMVA5T2pxaXo1bVBsLyt1YWEyWkxqZFhuTzZ0Q1BvRXRqamNzcDFiL1Jk?= =?utf-8?B?N2tHREFidTRJb2ZDdUlsQmZkODlibzZRMUlpd0d2ZDRuV1pKMzJLYnR1Z1g3?= =?utf-8?B?QWR6ajZqNnI0UEhXTWE5ZWNCSzFHR3hlcm9hT1FncW0yNUgwdlM4cnFTZUtl?= =?utf-8?B?b1haRjZBS2R0dC9CdUpJT2NHWFNKRUlBaTAxdzdUQW5WQzVQbUZZenBSallj?= =?utf-8?B?b3piQkl3TXZBYTdWb29mTmRCYkF1ZzZuTlRybnBUUjJYZW9yWDB0TXRKWU1o?= =?utf-8?B?VDhtMXZGSkd5ODg5ZGhvVTNXWlNzWFJRMjNXeHdHMk5vVXNKdWdkZ1c3UUx2?= =?utf-8?B?TWxIbnhHU011VG1YaUliMlpiTjZzQmxlTU5rRlF4VERvL1B4OWpRZWFsamZy?= =?utf-8?B?bmp4NlBQcGhoUjllM0t2QXkvTk9uMnkrOHFKRkZqMHo0NDZLLzBmOXNjSGlH?= =?utf-8?B?R0ZEWE9yYXVEWmVKZ2FDSWJqbjR6c2djK1VvR3lzOFVONlRwNE14YXVvSEk5?= =?utf-8?Q?ufz3QcRh/31m+EEFXNB8Y1hnxwwe3aFe?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NWZKQ0ErS3dWNnJudUJydnRHcHlmWjhPVVp4UUYyTFhlVmRwTkMvMnNwMHM5?= =?utf-8?B?VXZFZlJKSFdmUUlSODJuVFlvWVRjYjFpTG04bG9JYlU0bTBMZS9ITmlFYURD?= =?utf-8?B?bTBaYTdqVTJCRHZVcWMzUmxpY2pTYWpuekt2ZHhvTnJwclI0MEFyR3VDY1Rl?= =?utf-8?B?WWtGaHpzYnUvWGhadUNZR21LZ0V4V1QxdUd4cHd1TkFqdlNoYnR1VkpOUEZR?= =?utf-8?B?bXRZWnp5bmVyakh1OG1qUTFMcnZpUWZ2RFNlMXl2QjJHV3NxYkROWkdKWU1T?= =?utf-8?B?TlhoVE5yTXROZXo0UVNJS2hteVhLdzBVQkF3MEhuSmlkbHVtcXhIc1k4Mi91?= =?utf-8?B?bElhY0NtcHBMTC91WkN6czYrS3JMeFdGQ25MQzhCOTFMaTVoWUZSdTFDdzda?= =?utf-8?B?REJUOG9vTFhSckdRVXY3ZVpCeERBNjd1V1N6cXdUbVRyNlhMbEVSQTVVUnBK?= =?utf-8?B?NW5Qb1lyRDVMcmpVR0FMWjRndDJ2b2lxbzFuWnZrbjlrVTd3M1llRlVXRnNu?= =?utf-8?B?YjJNTENvbHBZMFFwMlVQc3ZFaFlHVkhzd3BIVzBHRDdDQUVsQ3E2Zm5pVThJ?= =?utf-8?B?UFlZUkZYaXdjOEtuSFY2dU5wcEZLeVorL2pVU0M4Q2FQYUtLWGlTdGF1eHla?= =?utf-8?B?cklqOERSdndtMCtzRkMyLzNLMDJWUldpMW5jalUvZkFiY3IzamErYjZqU3VJ?= =?utf-8?B?ci9hOXp0MytjbUxUbUYycHJpV2xJbGV5eWV6U0NNQnYyWnRXRGNtRWhobFIw?= =?utf-8?B?dHRtRlZwNll0K3hRcTU4UXp6Vk1RbHgvZURTeHBaMlRBWWFxNm81a0xKMDhB?= =?utf-8?B?ckd1TmRJandWVFBNNXlsRmVSamc5L1JkWEdMTERKVjdYYXoxK1lEY1V0OUJM?= =?utf-8?B?bWpFV2pTTkNyK3RWWW5KQUlxdGw2ZU5Zc0hJcnpxelU1ZW5LME1vbWQ0VEFL?= =?utf-8?B?MGplZ3pPcXhWZzQzQkxaaUVaZmVpbWZOMC9Td2plNGxQVU0xMVptenpGYS9J?= =?utf-8?B?WDFnczZrN2RRakNxYjNuTm9ZZ09jQkZuQkh1bHE2QnpWN0dTL3NGclFONnVi?= =?utf-8?B?aFZqUU40UGVOMHp3cHdKQy84djhUa2EwdzZMeHdnYmp3eTNzWmUvV1Q0eGpN?= =?utf-8?B?SUwxUDI1akYwUzVpcnhOZnRjYzd2SUlqZ1hWWUlVbmZlWkkyenZjcjBNTHpI?= =?utf-8?B?RStNVU4rUnFNbWVrS0FHQUU2MUgxOWowankrcnViM1NxVDRRdjA2cVo0Z3Uy?= =?utf-8?B?aTdjUDQ3U3dBZ29xYmE0L1ZGNzBDU2tPR1hjTlNLTDBtaS9sMnIzMWd1VENq?= =?utf-8?B?alRMczFEMCt5T3BrbWpoQVZDa0EyL0F3YW0wMTM5TXp4anRCY21HSjhrNXQ4?= =?utf-8?B?MzBDTHlHT1Jmdityci9XZ0pVK2xHSEZOVkhtazdOVHNZT2luaEprakc4Y3J3?= =?utf-8?B?cnAydW1kWVhSVjJ3SFhlK2d2OGxFMkRKWEUraHhoOGRHODFWWm1SVlF0c294?= =?utf-8?B?QU9SQlNDTlR5Nyt2WjB1OUZrNjF3WWRFaklTd3hjWE5sTC8zMkREWSs5KzB4?= =?utf-8?B?Vkl2aHBJSDRvSSs2SmwvQktockNiNGFFQ3lqREkycDFhZ2V0YVptdU9rNlRJ?= =?utf-8?B?L3RDUC9vQUlteHdVT2Q3U2k1SExtc1FzVzNrNGVuT2VkNE5RdHJEcURuVXpu?= =?utf-8?B?MEJURXd5MlBJYXdIV2NyZGNmKzNSYmRRb2dVQ2hIOFE3NzMrZThLTDd3RjdZ?= =?utf-8?B?ZHhaWjI0cDdXc1FKNmlhWWppbXMvcklWOVNLeUNIbVBLOUFsVVVXWmVyYnZK?= =?utf-8?B?Z21xTWw0bmZTblpxTTc1czloMllyem9jeWNFVFlJUEdEbG1DQThLejZnaHQz?= =?utf-8?B?amhSREhrTGdQN0l0ZG5iOWNWV0VRMUNucWlKRURKa3lZYlk5bkhoVFIrYnBD?= =?utf-8?B?Z2JTQmRieEhMdWVXcktQNnhDMjFxZHJmTEJYMVkxMG9tUTBhKzhSRVAxRDZv?= =?utf-8?B?NDhkZzhxWnNRMXdRYytQa29PL2hSL2FNWGwvRFFlV2UwbjIrTGl6WlBuZDhY?= =?utf-8?B?YldGamdyc3BiRTlGeG42SXprOGw1RmVNekRscWxQUElhUWQ4aHFIaFR3TWtl?= =?utf-8?B?b0UvVUswaWFCZnZjdTlWZjFmNFF0LzZXOEw3dWtidnk2MER0Sks3SDQ3bFpz?= =?utf-8?B?dGc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf2b5758-ea7d-4628-f91f-08de00b7e4fe X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:15.7697 (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: f1wtbaEf7rs161kKg9ASwpIG5OGTtkDNigXL2RBRqzN1YeL5y6ItzS3TksjHLNITdWbQArtjybNuqFsehMyQHg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Add device-private THP support to reverse mapping infrastructure, enabling proper handling during migration and walk operations. The key changes are: - add_migration_pmd()/remove_migration_pmd(): Handle device-private entries during folio migration and splitting - page_vma_mapped_walk(): Recognize device-private THP entries during VMA traversal operations This change supports folio splitting and migration operations on device-private entries. 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 Acked-by: Zi Yan Signed-off-by: Balbir Singh Reviewed-by: SeongJae Park --- mm/damon/ops-common.c | 20 +++++++++++++++++--- mm/huge_memory.c | 16 +++++++++++++++- mm/page_idle.c | 7 +++++-- mm/page_vma_mapped.c | 7 +++++++ mm/rmap.c | 24 ++++++++++++++++++++---- 5 files changed, 64 insertions(+), 10 deletions(-) diff --git a/mm/damon/ops-common.c b/mm/damon/ops-common.c index 998c5180a603..ac54bf5b2623 100644 --- a/mm/damon/ops-common.c +++ b/mm/damon/ops-common.c @@ -75,12 +75,24 @@ void damon_ptep_mkold(pte_t *pte, struct vm_area_struct= *vma, unsigned long addr void damon_pmdp_mkold(pmd_t *pmd, struct vm_area_struct *vma, unsigned lon= g addr) { #ifdef CONFIG_TRANSPARENT_HUGEPAGE - struct folio *folio =3D damon_get_folio(pmd_pfn(pmdp_get(pmd))); + pmd_t pmdval =3D pmdp_get(pmd); + struct folio *folio; + bool young =3D false; + unsigned long pfn; + + if (likely(pmd_present(pmdval))) + pfn =3D pmd_pfn(pmdval); + else + pfn =3D swp_offset_pfn(pmd_to_swp_entry(pmdval)); =20 + folio =3D damon_get_folio(pfn); if (!folio) return; =20 - if (pmdp_clear_young_notify(vma, addr, pmd)) + if (likely(pmd_present(pmdval))) + young |=3D pmdp_clear_young_notify(vma, addr, pmd); + young |=3D mmu_notifier_clear_young(vma->vm_mm, addr, addr + HPAGE_PMD_SI= ZE); + if (young) folio_set_young(folio); =20 folio_set_idle(folio); @@ -203,7 +215,9 @@ static bool damon_folio_young_one(struct folio *folio, mmu_notifier_test_young(vma->vm_mm, addr); } else { #ifdef CONFIG_TRANSPARENT_HUGEPAGE - *accessed =3D pmd_young(pmdp_get(pvmw.pmd)) || + pmd_t pmd =3D pmdp_get(pvmw.pmd); + + *accessed =3D (pmd_present(pmd) && pmd_young(pmd)) || !folio_test_idle(folio) || mmu_notifier_test_young(vma->vm_mm, addr); #else diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8e0a1747762d..483b8341ce22 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -4628,7 +4628,10 @@ int set_pmd_migration_entry(struct page_vma_mapped_w= alk *pvmw, return 0; =20 flush_cache_range(vma, address, address + HPAGE_PMD_SIZE); - pmdval =3D pmdp_invalidate(vma, address, pvmw->pmd); + if (unlikely(!pmd_present(*pvmw->pmd))) + pmdval =3D pmdp_huge_get_and_clear(vma->vm_mm, address, pvmw->pmd); + else + pmdval =3D pmdp_invalidate(vma, address, pvmw->pmd); =20 /* See folio_try_share_anon_rmap_pmd(): invalidate PMD first. */ anon_exclusive =3D folio_test_anon(folio) && PageAnonExclusive(page); @@ -4678,6 +4681,17 @@ void remove_migration_pmd(struct page_vma_mapped_wal= k *pvmw, struct page *new) entry =3D pmd_to_swp_entry(*pvmw->pmd); folio_get(folio); pmde =3D folio_mk_pmd(folio, READ_ONCE(vma->vm_page_prot)); + + if (folio_is_device_private(folio)) { + if (pmd_write(pmde)) + entry =3D make_writable_device_private_entry( + page_to_pfn(new)); + else + entry =3D make_readable_device_private_entry( + page_to_pfn(new)); + pmde =3D swp_entry_to_pmd(entry); + } + if (pmd_swp_soft_dirty(*pvmw->pmd)) pmde =3D pmd_mksoft_dirty(pmde); if (is_writable_migration_entry(entry)) diff --git a/mm/page_idle.c b/mm/page_idle.c index a82b340dc204..d4299de81031 100644 --- a/mm/page_idle.c +++ b/mm/page_idle.c @@ -71,8 +71,11 @@ static bool page_idle_clear_pte_refs_one(struct folio *f= olio, referenced |=3D ptep_test_and_clear_young(vma, addr, pvmw.pte); referenced |=3D mmu_notifier_clear_young(vma->vm_mm, addr, addr + PAGE_= SIZE); } else if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { - if (pmdp_clear_young_notify(vma, addr, pvmw.pmd)) - referenced =3D true; + pmd_t pmdval =3D pmdp_get(pvmw.pmd); + + if (likely(pmd_present(pmdval))) + referenced |=3D pmdp_clear_young_notify(vma, addr, pvmw.pmd); + referenced |=3D mmu_notifier_clear_young(vma->vm_mm, addr, addr + PMD_S= IZE); } else { /* unexpected pmd-mapped page? */ WARN_ON_ONCE(1); diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index c498a91b6706..137ce27ff68c 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -277,6 +277,13 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk = *pvmw) * cannot return prematurely, while zap_huge_pmd() has * cleared *pmd but not decremented compound_mapcount(). */ + swp_entry_t entry =3D pmd_to_swp_entry(pmde); + + if (is_device_private_entry(entry)) { + pvmw->ptl =3D pmd_lock(mm, pvmw->pmd); + return true; + } + if ((pvmw->flags & PVMW_SYNC) && thp_vma_suitable_order(vma, pvmw->address, PMD_ORDER) && diff --git a/mm/rmap.c b/mm/rmap.c index 9bab13429975..c3fc30cf3636 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1046,9 +1046,16 @@ static int page_vma_mkclean_one(struct page_vma_mapp= ed_walk *pvmw) } else { #ifdef CONFIG_TRANSPARENT_HUGEPAGE pmd_t *pmd =3D pvmw->pmd; - pmd_t entry; + pmd_t entry =3D pmdp_get(pmd); =20 - if (!pmd_dirty(*pmd) && !pmd_write(*pmd)) + /* + * Please see the comment above (!pte_present). + * A non present PMD is not writable from a CPU + * perspective. + */ + if (!pmd_present(entry)) + continue; + if (!pmd_dirty(entry) && !pmd_write(entry)) continue; =20 flush_cache_range(vma, address, @@ -2343,6 +2350,9 @@ static bool try_to_migrate_one(struct folio *folio, s= truct vm_area_struct *vma, while (page_vma_mapped_walk(&pvmw)) { /* PMD-mapped THP migration entry */ if (!pvmw.pte) { + __maybe_unused unsigned long pfn; + __maybe_unused pmd_t pmdval; + if (flags & TTU_SPLIT_HUGE_PMD) { split_huge_pmd_locked(vma, pvmw.address, pvmw.pmd, true); @@ -2351,8 +2361,14 @@ static bool try_to_migrate_one(struct folio *folio, = struct vm_area_struct *vma, break; } #ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION - subpage =3D folio_page(folio, - pmd_pfn(*pvmw.pmd) - folio_pfn(folio)); + pmdval =3D pmdp_get(pvmw.pmd); + if (likely(pmd_present(pmdval))) + pfn =3D pmd_pfn(pmdval); + else + pfn =3D swp_offset_pfn(pmd_to_swp_entry(pmdval)); + + subpage =3D folio_page(folio, pfn - folio_pfn(folio)); + VM_BUG_ON_FOLIO(folio_test_hugetlb(folio) || !folio_test_pmd_mappable(folio), folio); =20 --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010060.outbound.protection.outlook.com [52.101.56.60]) (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 9AABF2773E6 for ; Wed, 1 Oct 2025 06:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301905; cv=fail; b=jtI3C0eXsJYcml2cSL9kZKxCFwCIartJZfBs+uOqkt9fjDzPWzwMRM+MHfk/duDbp9wkr2ZqmcEE46Ah208SMU0tx0uPmIsUTNfoPvqcl+QCnRGvviqkDqVyGsbl+mKdN3pnHnlhSJiwp4GgKMbQU0nOAioK6GQ9zyHBtE4cfbc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301905; c=relaxed/simple; bh=HmzkDV7ZnssFoC5R5m0sPBEmK4rPlX8Ndeqco/ysp7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=j+sQV7skkn8c/VDqcEklSVsH7fx9UgdGA+YQXr2C+xldUrDuNr2oC7VGdI4APSAXDBCw/mzW7/cq1yaX0LpeFkLC7+VxnZKpsgmMzmJyjW2jvFOHDg51eyRFVPWHQmMF9W+K6mQL3C6pdD23QZYt79r9DVpRh8yE+MWBqXOzxEI= 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=Ps/MtzGh; arc=fail smtp.client-ip=52.101.56.60 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="Ps/MtzGh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=viiWR72s8KauAvJZFJ4CNKu3SftI3kZHDeRiwl8yWhAQGqOng+4dBs1OMmbptuzUD+xQT9Y2ipJ2zAtaZKuL1L9Fo0eaiZkFCTrrKZ2SFUYvFFRhUbXA45bkfkHLXIPdYZsChUlhVQAW6ziThPBve4cxL4ghQnjzzGMOlihPF7KJx3Jj+fPul16lJ5uIP//gfGM2JPjfUxO/9icS+chZpd3eogFBjD2JmybAUSNPx7QsPuXC/LACOeo2f8lytDPl7YtWCFeo6Xsp3rXafCyDuSq3e8WkIdsZkKeTu3BE40d1Cc74I9tRhRBVBnJuZj4jZeEtTbv/NPEQvrVSmpbOrA== 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=DsmfsT5rShSAsH7ZfHbs/HULcRgsXc5ehSBKLkKjo7w=; b=RWFwzezzUdteVepkEA4FC9YnhHiFNX7KCbC44IdTJblQiICvGbB+1PHBEhu4hVUlMtzdmt07tzA+w6RTnKnMZaP91gZoKu+2n8bEw3pO37k7OIde7PB0bH4msm7woq1FA/XtTsnj9FXeIOYAAdKIJaYMnrX23hpnlcmDTzWG0RtPecTu6hSHaMhgxnJ3XoFgWrGRRVmy/MbwELLQLxC9oDZFLc0iQ/AGKXTVet0439m0fEhGhHc/X1XFuLLbvXBW8672peLWOgnEgxqOOTrWgEXXKNDI1RReLfKkcZrA5BEO6myMkTIuneVK8AQmNlrrFDLP4p46V4f3BpXu5FCFJA== 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=DsmfsT5rShSAsH7ZfHbs/HULcRgsXc5ehSBKLkKjo7w=; b=Ps/MtzGhGPA3WQjmF7PALPbFP2SxVtAftVZThi46oDmYPKtVBSgbUKCbmsahrvaABH5Xp2ahkA1se8Z8uwvMuRp2DMz3Ydf8t1ed5vRDcu0lTRQl6NGqfjd5w4BB+OyR0OjbbzJmA/X7cTBBWfXGgkL7Y16EYpaT+5ZeGmobdBvy261MBaw16ULtUS3FN4gqKCL8LnNmOcY/y4IcM5qnUNIABcekVo1Ck2EC9CIcK/dIqRc+G/IwKXkDaiAI7spOgMUBxi4vzBsGb28vj1gPfSMLK1rrW46sD4JKGvJRTkB7rilddxOZo3+dAAGlltZGKTa2gDgGf5okspSDU+0VmA== 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 BL1PR12MB5779.namprd12.prod.outlook.com (2603:10b6:208:392::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:19 +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.9160.015; Wed, 1 Oct 2025 06:58:19 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 05/16] mm/huge_memory: implement device-private THP splitting Date: Wed, 1 Oct 2025 16:56:56 +1000 Message-ID: <20251001065707.920170-6-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0104.namprd03.prod.outlook.com (2603:10b6:5:3b7::19) 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_|BL1PR12MB5779:EE_ X-MS-Office365-Filtering-Correlation-Id: f9fdf3ca-d5db-4326-cded-08de00b7e748 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|10070799003|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?RGhUakx4eDFQc2o2SElWYS9WQUdOVzRGSHlpQUl6NUtzaEpOL0dzVGgraStP?= =?utf-8?B?dlE4TlJyVTlFODVpYmVJcUVDUlpQcFh2R0lnejBCM0RGL2hqYlZSVHgrSXhq?= =?utf-8?B?OWFTMWhFT1M4enNSa3pjOGszQUdjbCtOMmVLWUJaL1VVNC9WNUhGV0F5SG5i?= =?utf-8?B?aStBOWFxamU1bWJ1cVY3TTJsU21ON3VNbUx1QTYzRU9LbWdRd3BpMjJhT0E4?= =?utf-8?B?bXgrS1BSTWRhazFvVC93eGR4N1k4alI4Y2I4TVZldGpaa0sxbHZQOFB4UmhP?= =?utf-8?B?bWJwZk45cXBta1RWd0UvaE40TmhMbmJ1U3N6YkJlS2NBdU5UYTV2Q1FhQWk0?= =?utf-8?B?MDNPT1hqMlBpOGRDclQxL1ljUlpxNTFNQjhqbnhiR0xOMWE4cXBabTFwd1hr?= =?utf-8?B?MUdybUV2a3VKc1RTSmNXZG9VU3NOTFlOb1I0bXBCeXdoZmZtV3FaVStSL1pz?= =?utf-8?B?azM5blZsOTdqWW5hZjc5K3U3dm1MbTVqcE54MjFFTmF3Q2QwRHQwTWNydVFt?= =?utf-8?B?SlNOUWtIVGV0d3doazZHaFpGZnlhTEYyS2VOMU5WMW1iMFJzS3RZSnQ3VkVR?= =?utf-8?B?ZnpCWWhHNHhDM0IzWGRZeHBLc0xrZmkxVkkxbWhzMUF6RndmR2xYUHphdUZF?= =?utf-8?B?YUR1M1NxMFFxWGJMbFZ0b0l0Rlo4NDBJVS8wNWN3UFV0Qy9sWTZER0tBbExZ?= =?utf-8?B?emxEV0lWL211MjY0VFAyOE1MUWNkTGVsYngrcmRKaVRpVENoTDdkUDY3YnJn?= =?utf-8?B?SERwcTdNczkyWW9oRVhHYTdoRnM4V1RRUGEydnRYYnhsTzF6dEpINkpsTGZn?= =?utf-8?B?QVVPWW9RN2ZMYi9idlN2S2YxQzY3VGtDdFoxUFRuK3hKUmd4UU5zbmZ2eHlH?= =?utf-8?B?TWtCcXRWSjgvT3hxWmR6TzUvUVNYb3RySFpnNGhGalh6akdzdE9GQnQxNTVZ?= =?utf-8?B?cG90RXRPTnlScGxsZU02b1dXU1ZHbGVxZmhMeUVOSnVyYURyREZLNkxzaFpz?= =?utf-8?B?Qko0OHU0ckE4U3pzRmxxcEhMbTJmUHd5MitKYzVsRXYrVUx3bFprV08yVEhp?= =?utf-8?B?eE1kTjcwSE9vY3BMM0VEU3dSNmlzUTNUVW5lNmJHQ2JqMkNUNHNPSzVCMHZG?= =?utf-8?B?MFQ4blVCNjlCVGlBdDZBU0F0dXRqcWhINnhiWjcxamNRdkt4L0owUUNSamJX?= =?utf-8?B?eS9HQk9YV2NZclVrNjN5SCtWM2FIUjFhYmZIc1V5dmhqMVAvbHpRS2tCK0V2?= =?utf-8?B?YkJDZ0JMcTZLNkFYTEdFdURyM3RHMHZSazgyNkJtQUpWalJGaittWERJR21x?= =?utf-8?B?M2JCMENjKzFjYjhOdkxLclhsV215RFZxajNjZUs5czlEQXpaZjVlME9TeDha?= =?utf-8?B?QnJxUXZvSnE5LzdnWUFwdmxsUzBvTUQwUEU4dEdXTWhRbC9mUHA3Uys1RGR4?= =?utf-8?B?UnRqM0ljTFRWUzVjTDMwVkJndG5DdVhCcWF1b2RPYVFrUUhPMkRBeUlEZGNt?= =?utf-8?B?aVd2Z0Ywd0pJdEJPdHIwZkJpOG5rM3BYZ3lTR1d4elZVYktJOWZVczErdEti?= =?utf-8?B?d2Y1em9EUnZ4MjJOTHc3NklEcUFROHBIeFE0Vk9tVTMyLy9DTlFReXdJb3NG?= =?utf-8?B?MG5yNEFzUTQzbS91RXU0SGd5SlNrTWFHTG5ubVY5dDlaVnRjOG45azVHMWpi?= =?utf-8?B?Znl1a2lrQ1NwMXUrZzdEa1pPTW12NVRORC9HZG1NYXBKWmhQenYrVHM1bURw?= =?utf-8?B?R2RybXpUWDZPVmljbmFDSHZuNUVjaEgwOThWejBZUEZpd1ZYYUw3VDlTTHdK?= =?utf-8?B?ak42NU1YUjIwd0s4b29Dc3d6SG5ReDVQdS9rR2VRWm0za2pLQXpidUgwbjhT?= =?utf-8?B?ZkRwSkZoUm5tN1M5V3A4SEk3TlAvT2tacVk1UHZ6b0JhT2VxQjVYWWVwRGUx?= =?utf-8?Q?zTb2nyiVKyhlVk88jfe2MuERQulS8JVN?= 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)(7416014)(376014)(1800799024)(10070799003)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZkVEbFhOdDZGRVg2TTlNeFRLTjJwWWF6cVhqcldBV3hUMHB6bGlqK2dpV3BC?= =?utf-8?B?UEVIMGxVbEV4MkNqY1hjUmlqNXoxS2JTZjJNOStvZ09pdXlQVFJEbjMrRXpJ?= =?utf-8?B?YmNMSHg0QVF3ZlRBRkRrMG1KQnhRK3VwaTdoTUdUOWxZdFZnUEY5czJoRUtJ?= =?utf-8?B?RFFQbnhzUGhMNURiWW5aOHNJMDVSYVV0U3dFdzBDeHRTOGI1YnJTdUhmZXdK?= =?utf-8?B?WjJSVWxzQ0o0VUQwS0orMG1kclR4bHZQbFRtVG1UYkMxWE1MVlh4RjdCelVV?= =?utf-8?B?S1hPcE1nTm0rcENjSmdoUXlvL0pGTCtxakZKTXhYcWtHbTAzMmFPaEh3QW1Q?= =?utf-8?B?dlhtelpTODlQRjdoUkFIOTlBWmFiSS84b2lhaVhsaDkyQ3RZNTQ5cmZlY0dI?= =?utf-8?B?QmF2OFBJd090TWg1blBBRHBrSDIwSzBjc3JyUGR4WlJmbEgyeFF0U1ExTEox?= =?utf-8?B?d201T0VpV3dYd3pBWFcraUltb0Zyb0k4TDhqakR3OHAyR01ZZ1kzelJQNkVR?= =?utf-8?B?RGswSXhWWHk5aG9reWhWN3E5K2dYOTRVV2U5bytsTHhQYVU3SGo0UG1ndkxi?= =?utf-8?B?ekNCU3lQcFBrUGMyWlIzVTdRSjlsa0svelFOS3pGYVNqNGRLenJkbUthcERv?= =?utf-8?B?NzhoNFgrL3J6RnRrdWhDVlh5Sk11SE9IKzRPY2FMNTV6cUNvbUdhY09xOGtV?= =?utf-8?B?Yjg1QTYxNi9rYnh3azNjQmJWRUczSlQxVTJQbkdLMlduUjRRUWpzZHRpYWk1?= =?utf-8?B?T2N1dVdYRjZUTWVid1pMMzVFQ2NyYTcwVVQvczQ4Wk1kUjYyYjhibEFvaW1Y?= =?utf-8?B?MmdGanZsRlYxYzh6M0MyTkJxZjZqVkNRckQ4dmQ5d0o3WUEyMkdva0M5dWpP?= =?utf-8?B?VFBCMjV6TXEyTjFyREc2d3Q2bVZIbGhnb2VlZy9kTEx5UVVmcG0rbHdNT2dh?= =?utf-8?B?V0d3MXJpOEVSMy9zVWExRU9wQ3JnUUw2ZE5TNlloYjJiVXIrTWlENTV3dzh6?= =?utf-8?B?MStWZmxJUkZBMktQcGhLNnhPaE5hbGhGNDRQSEsrVHpoQ1BFQWVsSHVFaVJ3?= =?utf-8?B?S01DSFJ2c1BQSTl4N25DQlI2SVF1UXozWTZyNVVtU1E2QzBUK2VQK0pUTTI4?= =?utf-8?B?cHhiQXFEalcxTUxyRXhCNzhINTRpZzNyaXNnS2pyZU1CMEJjVnljVFhodEcr?= =?utf-8?B?MjJ3aFVtaG1oOG5pbHREa0pQWW1wTG8zRjZaeHJ2UHhPVzBsdXZqa3ZvTEkw?= =?utf-8?B?N3lXV05HMzU3WkM5VnNXNGNua1I2VjVZZlVHUlpHcHNJaUwrOGNXc1BmaG5R?= =?utf-8?B?MVB5YUsyOU9IT3hYbS9pNnFhemdqNGI5T1RDRXBoREE3QldMbERKQUhqM2xk?= =?utf-8?B?SURudjVFUlQ0ZEdKdmJJSmEvSkVlRjVGR1FRSUNtT0gvcnhCT0theFlpTEZF?= =?utf-8?B?aUFxVUpHWUhoRFJWNFRwZUZuNUlnRlpTWi91NFJvOU9nNnFNaFl6Z3VVeXdm?= =?utf-8?B?TmIrb0JqLzB0NU1XS0ZtOUpiUGk1SjFhbWpya3F5bXVlaEhJQldwNGlJQXB5?= =?utf-8?B?UzdKRGxpcW9IT1hSUDZWTk92SDROeVRQOG5QTmVtMCtXdE02TWR6QVJwOWlk?= =?utf-8?B?dzBjOGxGTWttQXlnemc3TVVNSmpYY1VSU3R3VVdtOHd5WEMyekx5QzRqdno2?= =?utf-8?B?UFJkMFNUZ1kzdzNyd0hJcThUQXRFRFlGMVhNZVp4M01xWkdEVEhEU0UvTkpN?= =?utf-8?B?d0V1UUdHSWNRT2hGT2J6THkyZy9SNm44TW9WVVVRcmQva25XaWEvYUZucUN2?= =?utf-8?B?N0ZYVDFDbDBidmdSbURFVDJPNU8vcGQvazZvYmhuWjdyWnArSWQvbjhnemY4?= =?utf-8?B?dDVvRDE0ckVVaTZ5R2dRU1htN1ErK3o0RjRHQ1Y3dkJPVG56MUhuQm1DaitE?= =?utf-8?B?Y0Nzb2M5ODFCWlVVYUE3UWtMR1dtb2ZJVjMxcDRmd2JOZElJeFhEb25BVjJn?= =?utf-8?B?SnhLcDF6TzNDRTBKRFI5bzIvbEdRVWg3ajBaNzI0TFY5Mk5jOFVGbXN0a0px?= =?utf-8?B?QXhOczdkR3RyaExHazFYQkhWanFpTkticVVUTVc3cHN1dy8yUkVwYUJSWlBO?= =?utf-8?B?NGxIWGVFSjJRaG8rWWlNelRWZHdlcWdHUHFPcmhmdEZ6TVkxbTlBZU1Nd1VS?= =?utf-8?B?TXc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9fdf3ca-d5db-4326-cded-08de00b7e748 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:19.7652 (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: 3DN1sH9LEONKuW9QCDoqDVKfA2DKWuDdIxInNAeXbw+h9TMfRN8kOFhLv20yK0vmp+MBfGoWEMMerwmt8uLO7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5779 Add support for splitting device-private THP folios, enabling fallback to smaller page sizes when large page allocation or migration fails. Key changes: - split_huge_pmd(): Handle device-private PMD entries during splitting - Preserve RMAP_EXCLUSIVE semantics for anonymous exclusive folios - Skip RMP_USE_SHARED_ZEROPAGE for device-private entries as they don't support shared zero page semantics 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 | 87 +++++++++++++++++++++++++++++++++++++++++------- mm/migrate.c | 1 + 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 483b8341ce22..05c68f5b5fe3 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2872,16 +2872,18 @@ static void __split_huge_pmd_locked(struct vm_area_= struct *vma, pmd_t *pmd, struct page *page; pgtable_t pgtable; pmd_t old_pmd, _pmd; - bool young, write, soft_dirty, pmd_migration =3D false, uffd_wp =3D false; + bool soft_dirty, uffd_wp =3D false, young =3D false, write =3D false; bool anon_exclusive =3D false, dirty =3D false; unsigned long addr; pte_t *pte; int i; + swp_entry_t entry; =20 VM_BUG_ON(haddr & ~HPAGE_PMD_MASK); VM_BUG_ON_VMA(vma->vm_start > haddr, vma); VM_BUG_ON_VMA(vma->vm_end < haddr + HPAGE_PMD_SIZE, vma); - VM_BUG_ON(!is_pmd_migration_entry(*pmd) && !pmd_trans_huge(*pmd)); + + VM_WARN_ON(!is_pmd_non_present_folio_entry(*pmd) && !pmd_trans_huge(*pmd)= ); =20 count_vm_event(THP_SPLIT_PMD); =20 @@ -2929,20 +2931,51 @@ static void __split_huge_pmd_locked(struct vm_area_= struct *vma, pmd_t *pmd, return __split_huge_zero_page_pmd(vma, haddr, pmd); } =20 - pmd_migration =3D is_pmd_migration_entry(*pmd); - if (unlikely(pmd_migration)) { - swp_entry_t entry; =20 + if (is_pmd_migration_entry(*pmd)) { old_pmd =3D *pmd; entry =3D pmd_to_swp_entry(old_pmd); page =3D pfn_swap_entry_to_page(entry); + folio =3D page_folio(page); + + soft_dirty =3D pmd_swp_soft_dirty(old_pmd); + uffd_wp =3D pmd_swp_uffd_wp(old_pmd); + write =3D is_writable_migration_entry(entry); if (PageAnon(page)) anon_exclusive =3D is_readable_exclusive_migration_entry(entry); young =3D is_migration_entry_young(entry); dirty =3D is_migration_entry_dirty(entry); + } else if (is_pmd_device_private_entry(*pmd)) { + old_pmd =3D *pmd; + entry =3D pmd_to_swp_entry(old_pmd); + page =3D pfn_swap_entry_to_page(entry); + folio =3D page_folio(page); + soft_dirty =3D pmd_swp_soft_dirty(old_pmd); uffd_wp =3D pmd_swp_uffd_wp(old_pmd); + + write =3D is_writable_device_private_entry(entry); + anon_exclusive =3D PageAnonExclusive(page); + + /* + * Device private THP should be treated the same as regular + * folios w.r.t anon exclusive handling. See the comments for + * folio handling and anon_exclusive below. + */ + if (freeze && anon_exclusive && + folio_try_share_anon_rmap_pmd(folio, page)) + freeze =3D false; + if (!freeze) { + rmap_t rmap_flags =3D RMAP_NONE; + + folio_ref_add(folio, HPAGE_PMD_NR - 1); + if (anon_exclusive) + rmap_flags |=3D RMAP_EXCLUSIVE; + + folio_add_anon_rmap_ptes(folio, page, HPAGE_PMD_NR, + vma, haddr, rmap_flags); + } } else { /* * Up to this point the pmd is present and huge and userland has @@ -3026,11 +3059,11 @@ static void __split_huge_pmd_locked(struct vm_area_= struct *vma, pmd_t *pmd, * Note that NUMA hinting access restrictions are not transferred to * avoid any possibility of altering permissions across VMAs. */ - if (freeze || pmd_migration) { - for (i =3D 0, addr =3D haddr; i < HPAGE_PMD_NR; i++, addr +=3D PAGE_SIZE= ) { - pte_t entry; - swp_entry_t swp_entry; + if (freeze || is_pmd_migration_entry(old_pmd)) { + pte_t entry; + swp_entry_t swp_entry; =20 + for (i =3D 0, addr =3D haddr; i < HPAGE_PMD_NR; i++, addr +=3D PAGE_SIZE= ) { if (write) swp_entry =3D make_writable_migration_entry( page_to_pfn(page + i)); @@ -3049,7 +3082,33 @@ static void __split_huge_pmd_locked(struct vm_area_s= truct *vma, pmd_t *pmd, entry =3D pte_swp_mksoft_dirty(entry); if (uffd_wp) entry =3D pte_swp_mkuffd_wp(entry); + VM_WARN_ON(!pte_none(ptep_get(pte + i))); + set_pte_at(mm, addr, pte + i, entry); + } + } else if (is_pmd_device_private_entry(old_pmd)) { + pte_t entry; + swp_entry_t swp_entry; =20 + for (i =3D 0, addr =3D haddr; i < HPAGE_PMD_NR; i++, addr +=3D PAGE_SIZE= ) { + /* + * anon_exclusive was already propagated to the relevant + * pages corresponding to the pte entries when freeze + * is false. + */ + if (write) + swp_entry =3D make_writable_device_private_entry( + page_to_pfn(page + i)); + else + swp_entry =3D make_readable_device_private_entry( + page_to_pfn(page + i)); + /* + * Young and dirty bits are not progated via swp_entry + */ + entry =3D swp_entry_to_pte(swp_entry); + if (soft_dirty) + entry =3D pte_swp_mksoft_dirty(entry); + if (uffd_wp) + entry =3D pte_swp_mkuffd_wp(entry); VM_WARN_ON(!pte_none(ptep_get(pte + i))); set_pte_at(mm, addr, pte + i, entry); } @@ -3076,7 +3135,7 @@ static void __split_huge_pmd_locked(struct vm_area_st= ruct *vma, pmd_t *pmd, } pte_unmap(pte); =20 - if (!pmd_migration) + if (!is_pmd_migration_entry(*pmd)) folio_remove_rmap_pmd(folio, page, vma); if (freeze) put_page(page); @@ -3089,7 +3148,7 @@ void split_huge_pmd_locked(struct vm_area_struct *vma= , unsigned long address, pmd_t *pmd, bool freeze) { VM_WARN_ON_ONCE(!IS_ALIGNED(address, HPAGE_PMD_SIZE)); - if (pmd_trans_huge(*pmd) || is_pmd_migration_entry(*pmd)) + if (pmd_trans_huge(*pmd) || is_pmd_non_present_folio_entry(*pmd)) __split_huge_pmd_locked(vma, pmd, address, freeze); } =20 @@ -3268,6 +3327,9 @@ static void lru_add_split_folio(struct folio *folio, = struct folio *new_folio, VM_BUG_ON_FOLIO(folio_test_lru(new_folio), folio); lockdep_assert_held(&lruvec->lru_lock); =20 + if (folio_is_device_private(folio)) + return; + if (list) { /* page reclaim is reclaiming a huge page */ VM_WARN_ON(folio_test_lru(folio)); @@ -3885,8 +3947,9 @@ static int __folio_split(struct folio *folio, unsigne= d int new_order, if (nr_shmem_dropped) shmem_uncharge(mapping->host, nr_shmem_dropped); =20 - if (!ret && is_anon) + if (!ret && is_anon && !folio_is_device_private(folio)) remap_flags =3D RMP_USE_SHARED_ZEROPAGE; + remap_page(folio, 1 << order, remap_flags); =20 /* diff --git a/mm/migrate.c b/mm/migrate.c index ce83c2c3c287..11fbfe905e3c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -307,6 +307,7 @@ static bool try_to_map_unused_to_zeropage(struct page_v= ma_mapped_walk *pvmw, VM_BUG_ON_PAGE(!PageAnon(page), page); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(pte_present(ptep_get(pvmw->pte)), page); + VM_WARN_ON_ONCE_FOLIO(folio_is_device_private(folio), folio); =20 if (folio_test_mlocked(folio) || (pvmw->vma->vm_flags & VM_LOCKED) || mm_forbids_zeropage(pvmw->vma->vm_mm)) --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013003.outbound.protection.outlook.com [40.107.201.3]) (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 7750F2D662D for ; Wed, 1 Oct 2025 06:58:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301909; cv=fail; b=pCyf2yttUfKuuKTAaoTjTNLCxbAy0xoydll4PyCdAwHSzZUUYuPiQVQwl0q05ITeEorhTMKDwfHnNrmdZRConsoOXFlqlqBoIhjkVAAmSLgWPUDZH61fln3XYI/y7Oc/nsfyqAeNLuQXvsNOZ3EQxNQwoyZFV3HfxAkvf3SugTE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301909; c=relaxed/simple; bh=Z1ZBUJ4N7eH1AmomXTQxzA3lubS47L7wtR70YNI5kvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=WFP6fSFoeQgigB6NlIJ21XdbfkpFDR6ZPkvaCmugM+Po5zHHnwxd/v8avyO0yCgaUEnSWFqJW3BWrWkaLU+Q0w6BpehkxMZizA4oc5VV7N26IFBkCzx4C0LZqbezGyjNe2R3uop+2xWwnIv2Y80ne05mrVORyiWu4qqC5Dr0MLw= 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=ANPmFU/A; arc=fail smtp.client-ip=40.107.201.3 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="ANPmFU/A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AR7LpBWHxIu/FpychYq4et7HKn2NZAZqfaFagJqXFzQpAO2QXt03FehAZbKTRgVXqOdQra+/vZuAHdGJ0fhEP7Yf9oaNPmiD8YoaIpxw+rHH9pAAlQLnun4gOiCVaN/+caI1z8Rm7ewtwaHuMXvCnc06sWD/7gZOwUXzgGUQPa1XOPclWpSHoBX5WW/NPDkJWMyOYX1rvj7x/c8qFxzrVgZJPmOnmVJlSP3icNGL4XLYVR7ri0uQqYKct717v3iOm4MVIsWv3//HE84V5zPcaC7GTV3naplEFK9EufL7HrFM5hLPb5N/g2WieDlrkLASPv1qdKeD69MU/om7hyc1RQ== 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=IuUN4x48aHvsGyFOkN26zq8zyMzF1TyzQ330PBwCSaI=; b=t/1cuYW2d0tY3v5kdGqyXfYWc8DFPfg6aGGUk9CU1G5OXChFtuLpFvAjfGhUWNHz5QO5HIgtRXRCk2tkNz6Lbo0LnWnO5rBYTwLqjY3ZzKUylwodNXrdKehFmm+RpbUI+K9rL6mUmSusBz72Fcnc9EXTbYeaiYSKJyTU93EuoPNlthhe86q4Ki0NzCWGABwIoDM5K7ZHSuxHYOv0Sw7ANTNxa8T5SLBPriK7dF7v70lH5elbp5Bpbay32X65FPmVuuR1sgEqbXqp8HuCSLvfbyU6H66BYvLX1Jzil6nc2HHCt2ECN+AfjTuIBuln112pnBj4a1AN58Z5Jv/VETOj3w== 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=IuUN4x48aHvsGyFOkN26zq8zyMzF1TyzQ330PBwCSaI=; b=ANPmFU/AUJIi3w9k6FQ0/10w6hEtFev6U732+mDEa+zkT9RkSx+nh3E1IRm6q2HszSiny3uQ02Mi6lzZMyq7DyGtxgmTnXVidW14xEWEn8ujpLIXWkNkRhh6dV9ciXr8qdHRxn+ciI5n9SdshzllBwiSE4ltqUGGLJgRQQhZTsBjbryywZgq0ZswNn1oN3Cplz94ZwAVEaonBkLyDNIiBuS5pjt3UmnrzCunTNP+DiRpb6/L6vo6SKXcJ+XM+PkwemEhJP89zyZGicoSoEhyQf2AG5OnLL/GDXalZWbOl7mPwz+s+y5CQDw55q3+SyboRlVXcjaBQ70IUdaom2+9Pw== 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 BL1PR12MB5779.namprd12.prod.outlook.com (2603:10b6:208:392::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:23 +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.9160.015; Wed, 1 Oct 2025 06:58:23 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 06/16] mm/migrate_device: handle partially mapped folios during collection Date: Wed, 1 Oct 2025 16:56:57 +1000 Message-ID: <20251001065707.920170-7-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM6PR03CA0095.namprd03.prod.outlook.com (2603:10b6:5:333::28) 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_|BL1PR12MB5779:EE_ X-MS-Office365-Filtering-Correlation-Id: 4474ffce-bb11-4db7-a853-08de00b7e9ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|10070799003|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Rm1iVFMvQkhiektWY3JMdmQyTkg3NVhOVm5PTVpHZWhyT1d4Nm91U3cxMHBl?= =?utf-8?B?cUlEU1B4NGtvQ0EvVFlHL2dqSVNQandkVjMrbzQ3eGZBUzJuMnpUbytIUDdM?= =?utf-8?B?V09MVjE3NmVpZDlzS2RRQ1lrODdwSkR3dkNHMGdtNVJ5VjZqY1dGSHA5U0NN?= =?utf-8?B?M1A0VlY3aUxGRmh3V1JPaWxqdERlV0FGZ3ZtMi9ZS2ducko0Ty9ZcHl1UUJ6?= =?utf-8?B?Wm9pWXRaQ2lpcjd3WUdiTEtOK0ppeUEwRVBwamR1VUpqclc2bXRtRXQwbnZM?= =?utf-8?B?RTA3d2tLRlQ1d1Y2TDU1ZC9OdDFWQTYxYzZJeGtMdm54bThvVFB4UWFXb0lx?= =?utf-8?B?bWg3c01pZkhEOExGNXZ6bEFrTG9HbDlQWTlvUndZMnJkUy9jQUEwVzJUMVQ4?= =?utf-8?B?ZDRrdDZiMUlHMkh2R3dpb3h2cXRrUlNXRmxWNGFGT2xHOG1UcHJsUmc3Ri9o?= =?utf-8?B?cnlxdGhaNUMwNzhlVEJGQnRZSU9Fd0laTHJxekZ3Mm1udGowQzh6aHVaNE9L?= =?utf-8?B?NUV0WDdGTlZaMWN1Y283a3NiUGdVU1ZGdGVuZS81NEJFcUMzTTljbkxTMk50?= =?utf-8?B?WDdDREs1dllFL0d5WnVvNERjQjEvUkovSy95VjN6ZXJ5RkVMMnhoYzZTcndx?= =?utf-8?B?aHFQKzEzeGd6Z0FRNFR6ZE9xbmJ4TFVNbng0Tk5KSFBGTU0rbW56WXY5VGdR?= =?utf-8?B?a1B4bHplNzZ6bGxiM1UzbzNZTnRqdHRtaWxwNk82VWo3Zm05UGUzbTlHUWlZ?= =?utf-8?B?LzNWUzIxclkybVNTa1pJTTFhTGdXWW84SnJQYkk4Vkx0WGl1cDdRMWdVS3R0?= =?utf-8?B?d0c0eGZTZkxvUXZiekNwU0hhckJjcEdPRktqWWRlZjc2djZEZS8yUVA1ZTBx?= =?utf-8?B?a2hFVmpoSUowMktFQ3ZEME96Sk9YNExqSzVVeG9YWFFhWHY5aHlVcFJ0TGdl?= =?utf-8?B?RDY3ZzZ1b0w3ajdtNEVzcFZubzEzRDY3ZTc1WEl4cW1MU2d6MFdLNytYcDg4?= =?utf-8?B?TndpY0FzYWdMWWNERHdXWnRwK2xHZUNQc2NJN1VBM04xdi9zOGdjdmdPNEFS?= =?utf-8?B?VGVlbk1BTXFTMUlMU1FidVZ6OHVlS0hhcmd3WHE5QUFUY1NLTEFBbWg4Z3p2?= =?utf-8?B?RVZ5RFNsTEg4TUliNloyMUZTUjN2N1NpMERJUGUyRlJnNjV3Wlp0ME5mSnBq?= =?utf-8?B?Z3VLb0JUTXpwN3dYcElDSE0wT1REdFR6RTgwMjFBb0c0YlA2TmYwMUhBSEVi?= =?utf-8?B?L0F2S29sQkxNTmpJMjZ3ODJuaGgxNTZYdGZ0Wk5NbCt6aE9WNUZiNm41Zmdl?= =?utf-8?B?di9MLzFtYzRUdDFNeUNpdGNyZll0SUN3Tktja1FBTkRZa2FBc08rOE1lWjNX?= =?utf-8?B?clB5VUkzN0c4VGZpQ1dSWUtpUlJRRzRLWTA4Ny8vRTIyMjlwNGNhcGV2dnNw?= =?utf-8?B?VW9RRjRFNlZlTnlZKzBZMXcvb2pleXFHMFpSZ3ZXUEs1b244bEM5ZjA2M2Nz?= =?utf-8?B?OVRhRVpCUlN2OGZUaG1raUtESmJXS01qUXpsTzZYalA0WHRnRUpaSVhKL1F4?= =?utf-8?B?UHpBcU1PN01vbHZ1YTRiTlhBRUJRaVFCWDlmdFRTZFduZVdIZXo3K0F6ZlA5?= =?utf-8?B?cWJFZ2FsSG85NHUvODNaQmtoQmw0TVo4bzJpcFhtYk5JU3Qrd1BIM3lReTlu?= =?utf-8?B?bUFxdnd6TEZwdEFQNlJqbWJPOWY1RjA1UUhNY2x1Z3BSbkZEc0pxN0RsN0ha?= =?utf-8?B?SGRPcGlicHFMOTNNVThYcEx1QlMvS0l0TEtERkZWanpOT2xmQlNINUxMdG1R?= =?utf-8?B?bGh5NTVIR0VqY0RzYkhwdldWRllzYS9aSHBqZVlxZG1KejFOdXNGVnNSWW9X?= =?utf-8?B?bVNndlVnVUF2czZoNFJpZElySmtwWGRLWkt6YjFkS3NtRnVnaWlVVklydUpY?= =?utf-8?Q?O8M0QAlHqUji1lwox35pw4eVU4+NmNsE?= 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)(7416014)(376014)(1800799024)(10070799003)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V0JUd25URHRTQU53SEIzcVVCcC9GRDliVVQzelJJZ1BpZEZzSlllK2Jza3hk?= =?utf-8?B?SE1abng0bDNURUdGeXl3SU5IYUxlTTVVbE9rN2N0S3RXdzFjM09jN003cy9w?= =?utf-8?B?eUlHaDE0RE1odkMvUEFSWGovK2htb2R3NVpDaHp3bFdwZ1lIbnk2Yzgxd3hJ?= =?utf-8?B?VjduVU50TlpZTHlhY2MzTkd6TXZ6OWVvTzlrK3JsNVlPcFVZa1Vlb01FT2dw?= =?utf-8?B?TWcwYjBhakhGVTM5MjhtOGlEYkR3QlBWQmdxR3ZJRGE1ZDNydlYvT29HU1U2?= =?utf-8?B?SXYxajVldjZDcllVWmVmOUxGRVJVSWcrYnlzdFNWWGl0MmpoWWxnYzU4dER2?= =?utf-8?B?WWZBZytzM3hYbzdYUERYTisvSGdtaFpZRXdkVHhNRFIrM2RjMitHZ1QybXAv?= =?utf-8?B?QlFoWS9Bb1V2QVMxMDZySFB0SVYzKys5S1Zwb05vK0RGWE1raXI2SWFrcms3?= =?utf-8?B?TTBtNVlUSXFpK0NIc3JWWnRQR1VHL0owRmdhcXo5S3RyVkRYNWhaY1NkSzlW?= =?utf-8?B?eEc5bWFZZlJwaFVHT1A0ekEvbUF1c2FUUlpQQlJ0SDhPT0ZlMHB1QmhXYjQ2?= =?utf-8?B?dVFYMzh4eFliSklHNTZITVpNc1hMWjN1YVNxZit5aTNWUVk5MmVFT1ErMEM1?= =?utf-8?B?OG5aOVkzM1FNRDY3SVJsM1FMMTV2bEVPaUJDYXBlZlBQZjZ1OThNZ0Y5Y1RP?= =?utf-8?B?d3JIcUcxdTAvV1dJaHhyQkFwbXh6Tk1JMGduSFl4MmgxdmVxN01HdnhhQUpN?= =?utf-8?B?bkhQd3ZRODVTUHFaUEhvSHlMam11QXVXM25BaEZWb0NwcStoS2FrcUZhMVZy?= =?utf-8?B?S0lyMEtaZGdSOG8yZit3bThyYXBsdmQ2aFcrSDM0c04wZGRtWEpKdEwvaWxS?= =?utf-8?B?blZrejE3ZEo4QkwwTG41cFp6N01UbFNuQ3R6aUFIK1dPK3BoTEhLcTNrQ1ky?= =?utf-8?B?aUhMWFZSd0dZbk53cUNVVS9YTE9vdEFGaTkyc3pNL3VPdFFyMUFid1RGR21m?= =?utf-8?B?OWsySXVFZ3hjUDFsdnhCMEZlK3pmNXpSRHVuM0QweXNKa0tnVHh4T1pxUnlj?= =?utf-8?B?R1M2a0NSQzk1QUtHWlNFV2dwQzV4Vk00QzdNckZvbWhnWXJHWDNjZWl6NGxG?= =?utf-8?B?TXZERHN6SEFYd3dMcjdVKzlzcXM0c0s1MU94c3JqRi9WeEJBUDFSd2hRcW1j?= =?utf-8?B?dnhwdVNhQnBvRFd5OSs5RG9SU2t2MGpjTVQrWEQwaWJxNTlzeVl1ZksrRHph?= =?utf-8?B?cFhFSDlCeFA3ajY3YzFpbjJZY2E2MFcwZHdWckkrOEF1V1M5QlVlWUZHZjF4?= =?utf-8?B?NU9GVy8veWRLbVdadkNsd1hBbzZMMDVHNGlxRUVlcEROd2VFVzRycWM4RGYw?= =?utf-8?B?Nk5pR2dIaDdKa05vbjVyV2RPVkg2ZWErR3k0ajRYU0lKdjhRemtHR3ZHeGJJ?= =?utf-8?B?TWdFOTlDYmI4VzNsQ3duaSs2VWhMcXU4RlR1aldTWGdIQ2ZoNWNrNkRqWG0r?= =?utf-8?B?L0k0czRTd0ZJMmFBWTBCRjhETVB1dGRWcWpjck1Ha2g4b3ZMd1NPWURuNmFH?= =?utf-8?B?YjdqVmhHTDZWYS9xQTZIelU1cHBuci9abUNoYmpuaEY2azFXZGt2djBtSzZZ?= =?utf-8?B?ZGNMeDc3RDJqd1AxdXJlNC9ZL3RmeC9qTkJHVWp3S282WnBhd2szS1FSd2l0?= =?utf-8?B?SElaLzBIL3dIb1hUZzZYSWZZWDVpNUdjT1orVWM2ckNlYitwZUpPa1pnZ1lQ?= =?utf-8?B?b1pUaG81V0xab1Y5WU1JNk9FQmltNGltU0kvaHVlZS9kb1B5Kzhxd09tTk1s?= =?utf-8?B?Vk15b1N6TXdpOG1YcHVIRTA3NWFndXlEYWtOZHpPY1FIdFFKNXduVUcxZXMy?= =?utf-8?B?RUNGSjNKMXFrWXVQanVBNTRCcU5ZNGhNZFdGaFlFQk1lYWs0Y2xSUWJEcGl2?= =?utf-8?B?UTdGeGxRRmJOSHFIbGZ3VWpqK0JYT080VGc0YmhQKzdJU1lSd01rSmF0SnBV?= =?utf-8?B?VzVLZllQMWFyelBzeTE4bUtUbmxRNHdqMmQrYi9xN05qRWk4bEcvQXVIbml2?= =?utf-8?B?WnpXWmJYWnozYkEzWW12aTRjQlJmVmlUVEIrOWJ4NTBTLytYMHZzRmpuaTNH?= =?utf-8?B?YjBpQWVwOHJIRmdYQUFJVlRZYTJvVUxYOWZHTVhDNzVsbm9KNThvOENLNU1Z?= =?utf-8?B?RWc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4474ffce-bb11-4db7-a853-08de00b7e9ab X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:23.6443 (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: NWcQfsXKAnfYA8AS03YtXVPLIqF3dYEFOfrQBfo9d7Yd00KfoZ0NWEII8GIvwDu6quzgoWBzVv7E6j2epa46Og== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5779 Extend migrate_vma_collect_pmd() to handle partially mapped large folios that require splitting before migration can proceed. During PTE walk in the collection phase, if a large folio is only partially mapped in the migration range, it must be split to ensure the folio is correctly migrated. 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/migrate_device.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index abd9f6850db6..1c70d937ba44 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -54,6 +54,53 @@ static int migrate_vma_collect_hole(unsigned long start, return 0; } =20 +/** + * migrate_vma_split_folio() - Helper function to split a THP folio + * @folio: the folio to split + * @fault_page: struct page associated with the fault if any + * + * Returns 0 on success + */ +static int migrate_vma_split_folio(struct folio *folio, + struct page *fault_page) +{ + int ret; + struct folio *fault_folio =3D fault_page ? page_folio(fault_page) : NULL; + struct folio *new_fault_folio =3D NULL; + + if (folio !=3D fault_folio) { + folio_get(folio); + folio_lock(folio); + } + + ret =3D split_folio(folio); + if (ret) { + if (folio !=3D fault_folio) { + folio_unlock(folio); + folio_put(folio); + } + return ret; + } + + new_fault_folio =3D fault_page ? page_folio(fault_page) : NULL; + + /* + * Ensure the lock is held on the correct + * folio after the split + */ + if (!new_fault_folio) { + folio_unlock(folio); + folio_put(folio); + } else if (folio !=3D new_fault_folio) { + folio_get(new_fault_folio); + folio_lock(new_fault_folio); + folio_unlock(folio); + folio_put(folio); + } + + return 0; +} + static int migrate_vma_collect_pmd(pmd_t *pmdp, unsigned long start, unsigned long end, @@ -171,6 +218,22 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, pgmap->owner !=3D migrate->pgmap_owner) goto next; } + folio =3D page ? page_folio(page) : NULL; + if (folio && folio_test_large(folio)) { + int ret; + + pte_unmap_unlock(ptep, ptl); + ret =3D migrate_vma_split_folio(folio, + migrate->fault_page); + + if (ret) { + ptep =3D pte_offset_map_lock(mm, pmdp, addr, &ptl); + goto next; + } + + addr =3D start; + goto again; + } mpfn =3D migrate_pfn(pfn) | MIGRATE_PFN_MIGRATE; mpfn |=3D pte_write(pte) ? MIGRATE_PFN_WRITE : 0; } --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013051.outbound.protection.outlook.com [40.107.201.51]) (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 6CABA23E23C for ; Wed, 1 Oct 2025 06:58:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301917; cv=fail; b=RtCqsGdgAxz29jxFK3txjZc1Xaqg7NPIsPOevP7/Ifx8bkc/l0vf/qSuw3qQQSBUmDMoc+zMLM8CfYe8BLKsoL5HzKgrjq1I+lAW3XM62cD6ntkJWlZv2Ub2Ynf4WMOSwbewy/dNcVNxkz4LsBUCwOWbq8fWPLeM2A9zn61aO94= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301917; c=relaxed/simple; bh=aGYR7a14jPK0yrp3PySluROF0OZeffrvjzbnhWytIp8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Ne1l4dsW/ovFb7jfhLjRw2c20TcHqOXWvnGWVTbMUJssu9ER8+mt1sXjRLw7LRgUOTwSt1+OaXSix8gDEVezaFS1r8MGfLPYQnqjYki22prG/mkGlMZlDv7nGprP0U8yO5QGaJDBAWzCpmgUeGAG7A5T0/W3DgiMPcC/obt/NfQ= 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=hcN9taSv; arc=fail smtp.client-ip=40.107.201.51 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="hcN9taSv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CTKI+1bcWq983qtN2ogMgEwG1bD4jRT5rUI2G8xkCzPB9VEmaDzya4uQz4GsP5L3W5mR2NCkRBVOq2cchXV8B8UwGfdjwSBZFmSFxrEnnJk2DxAPWloe2s342Z1bpmavQ2xqWHfRIg4dWJTXuKqRsAkeE7rJm7wmSJSM1EaSTL+fJd0ZHyVWRjWL0wTsC++ldmeTkTMdcUiQHNv+YgaFTZXanjXAS2UYVpFG2lMp7u+xojogq6uyNsChBtpFfYbfXURcfTLF2CcEJDCGhkrZJ0DgAoz8IrRye+874oDhIeqRZOfidxrYoZuYtrlSst7Niqd4rUWKReBL2xAeYlC+sw== 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=vMWd92AlIUpsOyl8vnoUAOAhJooR9njP2iuUWcWlN/U=; b=yfYTN31TqA5CwaIka0R4H89V1tZK+hbOb1rGYsa1bT5thS1ZvkxPCaGrMDN5eGZClXRq9OmcPp8sBZfNElQRYFZ7oq5i1KRcm88SF+duhNWgYZLUKGzGKchugn5uYusYBJXOeSppxfzTtWmAeT2jBVPzQsCF1SIQal1uXjN7h3gVhyYWqWQh2NGz/QBrIwm2/+sGykP3p/krQb8ewD2dB2D7A3pPte+CaS/HZ4UwhN/3wcvRRQtemyz1ygthqGWxOBJKFwORchyguhgFjAvkfWQjnfFZ+Upr6g6qvy7l+YUXgaVxWZM3uDdXkg4VnWWAiIdz2vJlN2FhH19unH2x1A== 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=vMWd92AlIUpsOyl8vnoUAOAhJooR9njP2iuUWcWlN/U=; b=hcN9taSvFSYxPsyaZHY9YyfR1c5eJdvImJVGvsyvaK48IGWtZcngAgUllx2PPf/v97ngsQz0zMQHNGnO6gnmOrnQBiJ/UhNfzOjZr0n6Bnz0RZLyYm6z32jyc1axaaNMm8X80eJ6jbvOO65CrymdiL/y1Wt6ZxlYlpCUeZBTktBbwV1OonzS5YogY1Plim2BKzkVPR6jOteBaUv4tZ2jbwoHF3VTaVFH7M2dO87LhAMzliXFDQ/2j8pKGJIxuZ6YRIvlQcnIayTHqUr3GBnyBWeprMppn5TAyXL8Wqm4QJa3p67QZEGyUcoHFUQlbprIbKsYEUiVa+0bvUAnVED08w== 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 BL1PR12MB5779.namprd12.prod.outlook.com (2603:10b6:208:392::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:27 +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.9160.015; Wed, 1 Oct 2025 06:58:27 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 07/16] mm/migrate_device: implement THP migration of zone device pages Date: Wed, 1 Oct 2025 16:56:58 +1000 Message-ID: <20251001065707.920170-8-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0049.namprd05.prod.outlook.com (2603:10b6:8:2f::27) 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_|BL1PR12MB5779:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a0f6f18-c78c-4585-2303-08de00b7ec19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|10070799003|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?NzQ2WWg1UG9RbTRYRTJNSFh1MUh0SnVyWFNvUVAzRklaQU9jcmV5V0FOVkxm?= =?utf-8?B?Tm8zUysrcjBrRVQ5VUVGQ0tMOG5BSldFSldHaWxFa011Qi9vSWczZWh0VXJ0?= =?utf-8?B?bjJBaXlLb2J3QUh2cmVRS1BRR0o3ZklYQ1hnYzBhT1F3Q0dTbWdzUGhuVzN2?= =?utf-8?B?bFBjaUlNOWlMR09VNmNEUnptNFBiVXBIaXJsbCtrNmRkWXluaGllQWR2L01u?= =?utf-8?B?UStOeVhlbzJma3drUklRcm1GK3N5K0JTRUZKdmxWeXRvcGV2STFxTStGM1Zs?= =?utf-8?B?dmlqaWpBVGxWVUVKWXVGODNoVG9OckdlbVNHNnVEbnFXd1ZpYlQxQzk1Rys2?= =?utf-8?B?RDQrUHhvMVJkRUN2K1F6czJWeDNISE43UHByU2RSMFoxdSs5dlFzZzg0MzVQ?= =?utf-8?B?WnpKWFNJNkowa080N3o2WFdkZUwrRUhWRkZOR1dKYW9mOUhJMi80S1JWUHZH?= =?utf-8?B?Y1BKN3FoV05Ka2JZRDZFSFdYSGxrNXJTcThkcEFSdmtiemFJYk5ISU5zeVdW?= =?utf-8?B?bXl5Mm1WU1h0ODZnN0ZyNDloSmYzWFFuUVFDMEYwRmkyblhwMVN6TFBpT3Y4?= =?utf-8?B?NVlkSzJ0V3NjbzA3VjBRYVQ4OXVFaU5EaEJmU2srZkxSK3h5LzhzREx3alB6?= =?utf-8?B?dXpRTlZ0cVVkTm40Nm9OUkVJYXBvWjc1Y05zSEdZcDlqWmJISkQ5dVBvZ1ow?= =?utf-8?B?T2FGVEpvSDJTSklQQXJtOUQyYXI0OVVDVzdIVjZLQUxXVElSOGhOZStJZ0NO?= =?utf-8?B?V21Qc01IUi82dU43Tkh6bis5cFg5WHdMMEFYRXVTcFc5T3BKNTZ5cE9WT2F1?= =?utf-8?B?VE1lTXg3cjE1OWdqZGJLdXhQQU5iZ1FEaW53Q1A4Q2RTOGRyQVhvRHczUzND?= =?utf-8?B?U2lISFlrTGxVYTUvbEp6SmlQRS8wUjI4YlRxdm9ubXEyS3pLY0kzS0dVT1h0?= =?utf-8?B?Ty91VDh6THJPMjExeFUwYWJNOFJtQ1BkQ0ZxZDRpUm5wbEdyTmRXc3NZVVhu?= =?utf-8?B?Z1VRRE8zMHMycE1FaTZXMWZqZ0hjSHd1QkFhanF6TDVMVDRLY2MrZEd3L0oz?= =?utf-8?B?OXNpZ1RhVGhJSTh3OURGSHJ5S1RRNUR2WkZvdm9KbE5uOUhnVXJTd0UyZlhS?= =?utf-8?B?OWgzMEdjMEV3UlA2d24yT0EvNTd6ZFBZdTR1M2E3NFJvVUprbGt0UXNJaUc3?= =?utf-8?B?Zlo0Zmd3SllIR3RBOGgxQ0wvSEJmN2F0UDdPUmJENzEzeFRVcGFIVUxPREZT?= =?utf-8?B?bTZJWE13UTRiYlBKZm1kdEt3V2tMRXl3UVh2WW14cFpBbUpkekQrc3piTUdN?= =?utf-8?B?OFFvMDV6a0M0Ti84Zk5LVDBmckNCSDhlQTIvUHVTQmtRMmxGNkkyMkR4bXk5?= =?utf-8?B?ZkFjVWFUenNiUjRjSTcvdUlGUlBlc0UzZ0VTcFBnT1dKTzdOUXo4dzJmNnNH?= =?utf-8?B?ODBNa0RsRDkwZ1RxVlU4MzBuRWNwSmhOdmRiYmg1UVJ4SXh3bTZBbXgrU1or?= =?utf-8?B?THlWQlloeitaWUUyZk9jdC9tbTY5aENFRUJMTFNEd0IwbVVFZk52MXNkREg4?= =?utf-8?B?K1lQR1FKQ1pBSkwyckw2bWdiZjJhT3FlNVltVkRoZ1paKytQOFNWUzJHdWlD?= =?utf-8?B?VitjSGJ1RDhIZ3pTV1YvQU01cU5Rc0tOSVE0S2pnZHZxdkVGUkptRit0QzdZ?= =?utf-8?B?MngvYzVEUnhnZk1OQmRwZFYxRHpiVWh1c0VnVy92TVBOR2ZlQkJrZmN5anlW?= =?utf-8?B?aWN1MXFRaUl3MjFIak13c2hUbTNuS0J1TDB2VW9jd1cycnZXWmNzejQ3MGxk?= =?utf-8?B?aTIzaEQ1RTV6ZkluaE4yTkk4WkdKcDZ6azRyNkEwc3dLZnB4SytYVmQwTUln?= =?utf-8?B?TDZQSXdPRU1HbndOZWo4dGpDQWhPS3Y4aHd5eHp0STdFSlE1WGJxUFNUQTVF?= =?utf-8?Q?6h2SC8VvfS3VeXT8VEowfgKYQDmV8Unu?= 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)(7416014)(376014)(1800799024)(10070799003)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SVNkTHBBUWJKQkc4Q2Qvby92Q2g3aWZKMWtPWVNtVGZlSWFYZEZYUXc3d0p4?= =?utf-8?B?U0RhQ2lGbDlhZTEwMTd1OGFtVTRHemxQRjBrRS90TmZvQWU4M3pDNE9KYm5w?= =?utf-8?B?YW94eDVNSEVkMzZQVmdsUHVFaUxRWk5XbHY2WlIzZDBKSjRSZ2c4OXcyZXN5?= =?utf-8?B?R1BkaWNaeGhMVTF0Y1JvYzRmai9nUTdwbVlaaUtMRS9yTkZDOUJqS2pQekQy?= =?utf-8?B?Tnk2dVFMZU0yVVQraEw5aXBxSTFkZ0o4cDdXNE95SlRZM0JtZ3ZuVkt2VGkw?= =?utf-8?B?eFV6QWRoL0l2QWt3K1ZrRWRYUjdtSnlVczVXOFBFa01ZVlY5RmdUMmhBM3pv?= =?utf-8?B?OUVjZzdkZjkrQ2VJZ0xZUGhlRURSc3N6OHdkbWhkQjMydEZhNDBIRGJETzE1?= =?utf-8?B?VzhYM0Vnc1BGTlFjYmtZeWFVdXlHMWkzaXJkTjQzT3ZBNzAxazdFRUdubWhp?= =?utf-8?B?akJETVRYQjNYRGtlcjdTcWU0QmpJdUJDemRxL0xhOXd2ZUhPaW1xWkEra1VT?= =?utf-8?B?UGphRFlibEt5bHJRRG1HNllOVmVnWXNISmFtM3FwZkcrcG1UcENpS2hxODBC?= =?utf-8?B?Z002L2MxYjJjdWZQaVNGV1FDWm0rOFlqOEM5MVk3Y2IwYW5ZMW05SmplM2t2?= =?utf-8?B?dmsxekhpVFBSRUIxVFlHZU1RUzR0WU50cmtTbm40TW1Qek5ROTNqaG9tZlB5?= =?utf-8?B?VVpVSUFyNkFXSGVyV2drZU1rUlFRVGF2MWpacHk0VnNEcVgvMkNHdXdPNWZ5?= =?utf-8?B?VlpWanZDMFFWUFE1WGNIRGJzWDBaMyt2NWQ1Szh5M0d5bmlvb3RYejZkdTc4?= =?utf-8?B?REc1c3Q2Uzh0c0l3bVl5Z3ZTODQ3QUg3U1Y0dGdCLzFLaHFkUnl0c0xKS2lQ?= =?utf-8?B?RmR3eUo1aVcrZHh3M256NnJHUU9xOEt1TXNSekhKaGZEYjgwcHcrYXlhOStC?= =?utf-8?B?d0sxdURLTUpmbGQ2YzRtVk9sdzF0ZW1laURBSEFOSTdJc09ETmNaaklKZkR4?= =?utf-8?B?VXJ4eDFlU3hoZCt6SWdNUVhCdmNxeGUxVWxtVWVmcXRmdnhmbkxhNDViQkFo?= =?utf-8?B?UCt5QTk1WmM4cHI3VWNSVXE3Vk4xQUpBLzBnVHV0eDhabGpuSUNueVRFRXVE?= =?utf-8?B?TkZDWjFsUTdROFl2U1pVOTBYdVNYeFN5VC9vUGxZazNKNSs0d0tmNzBFemlM?= =?utf-8?B?MlI4cWsrNldsMWljMnNpN0wzL3hTZUJWdjRZZTVzdTdvbHZQSHhMdmp5N0RT?= =?utf-8?B?UnVBQWw1MC90TEVFVUFvSExESFpBSUdTOWoreXV3ei9JSUQ0VDcvMTlyR2FM?= =?utf-8?B?eU1FblFQa25kWmZFQm9WTU9xeElidnhnSFp5UGlJdGo3U0IvSktqRTk0SGV6?= =?utf-8?B?WU56U003aEJSOXl2SThyL3hrMnFpYnpqRWQ3RW9SZUFBTy9tOXZrQnRRc2ow?= =?utf-8?B?OW45U3ErUktpa1Bjck8rTW5VM0pZMG4vaEl6Z0JOaU50aTJWWDFkRnlWbEZQ?= =?utf-8?B?bDRBaWovRUVwNUFnWTNVUmtqbTNOU2ZFZnlGWUFLZzQyUHpYZmI0K0dGcUsx?= =?utf-8?B?eHovSUFBS2cvVkZTOWtJdmhaSVlhVzZYOEJuVlQ3QnRjdTRGeDA3SXlEMmNE?= =?utf-8?B?bWE1eFFXWGVMQzk5TUlmRmJHc0NRaTVFZXlvMjU0WmJFSURsVXFzNU1ZYTBy?= =?utf-8?B?OWZ4Z2R3bURGczlMSDBTVlQ1cVVvWWVidmFBeUxLb3NEZ1FKTUxUdWhKR0pR?= =?utf-8?B?OUpseEdrcVRuMFB5eEJwaVVPZkc3bTRPMGdFRkQzeDkxQnhadGZRV0lRbkxz?= =?utf-8?B?TTFTSDlKdERjbmViYnJCMVVPanVxaWx0eDk3U3Y3ZWlYZ2NERFJzQ0toVCtq?= =?utf-8?B?MHFCcHl5Uzd1NG1PU09GcjZmbzJNaEZSMUExcU1od1M0UlFjeVpWVE0wb3dU?= =?utf-8?B?UVg4U1Q2Y3Zjam0zc1ZoSCtNVHRiUS9jK1p3Q212ZEFTR0R2bkVXREpQQmdx?= =?utf-8?B?dDFyYnl3aEk0Ykwzb0JQUHJ2NWFNbStZUlgzei9PR05zSjFIb25nbzFZQ05y?= =?utf-8?B?dDVJVXhmalFTVmthWExOa1dFTnNpZEU5QUFSQ1VBUVUyQURpbXdLZHowWHhu?= =?utf-8?B?V1doVHh3V0ROS1lLNkEyczd6Njl1alcxOGU4QkxrZmZvUFlqeHNqcXlXRTdE?= =?utf-8?B?N3c9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a0f6f18-c78c-4585-2303-08de00b7ec19 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:27.7678 (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: UvguDhBLh0UjRcf7kjVc1zXO1HfOuZBIbsblS5QdClhr8olIwlnYUYpspVrFDufu+ONxgf1N3gj+YEEvWkjx1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5779 MIGRATE_VMA_SELECT_COMPOUND will be used to select THP pages during migrate_vma_setup() and MIGRATE_PFN_COMPOUND will make migrating device pages as compound pages during device pfn migration. migrate_device code paths go through the collect, setup and finalize phases of migration. The entries in src and dst arrays passed to these functions still remain at a PAGE_SIZE granularity. When a compound page is passed, the first entry has the PFN along with MIGRATE_PFN_COMPOUND and other flags set (MIGRATE_PFN_MIGRATE, MIGRATE_PFN_VALID), the remaining entries (HPAGE_PMD_NR - 1) are filled with 0's. This representation allows for the compound page to be split into smaller page sizes. migrate_vma_collect_hole(), migrate_vma_collect_pmd() are now THP page aware. Two new helper functions migrate_vma_collect_huge_pmd() and migrate_vma_insert_huge_pmd_page() have been added. migrate_vma_collect_huge_pmd() can collect THP pages, but if for some reason this fails, there is fallback support to split the folio and migrate it. migrate_vma_insert_huge_pmd_page() closely follows the logic of migrate_vma_insert_page() Support for splitting pages as needed for migration will follow in later patches in this series. 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 --- include/linux/migrate.h | 2 + mm/migrate_device.c | 469 ++++++++++++++++++++++++++++++++++------ 2 files changed, 408 insertions(+), 63 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 1f0ac122c3bf..41b4cc05a450 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -125,6 +125,7 @@ static inline int migrate_misplaced_folio(struct folio = *folio, int node) #define MIGRATE_PFN_VALID (1UL << 0) #define MIGRATE_PFN_MIGRATE (1UL << 1) #define MIGRATE_PFN_WRITE (1UL << 3) +#define MIGRATE_PFN_COMPOUND (1UL << 4) #define MIGRATE_PFN_SHIFT 6 =20 static inline struct page *migrate_pfn_to_page(unsigned long mpfn) @@ -143,6 +144,7 @@ enum migrate_vma_direction { MIGRATE_VMA_SELECT_SYSTEM =3D 1 << 0, MIGRATE_VMA_SELECT_DEVICE_PRIVATE =3D 1 << 1, MIGRATE_VMA_SELECT_DEVICE_COHERENT =3D 1 << 2, + MIGRATE_VMA_SELECT_COMPOUND =3D 1 << 3, }; =20 struct migrate_vma { diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 1c70d937ba44..4156fd6190d2 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "internal.h" =20 @@ -44,6 +45,23 @@ static int migrate_vma_collect_hole(unsigned long start, if (!vma_is_anonymous(walk->vma)) return migrate_vma_collect_skip(start, end, walk); =20 + if (thp_migration_supported() && + (migrate->flags & MIGRATE_VMA_SELECT_COMPOUND) && + (IS_ALIGNED(start, HPAGE_PMD_SIZE) && + IS_ALIGNED(end, HPAGE_PMD_SIZE))) { + migrate->src[migrate->npages] =3D MIGRATE_PFN_MIGRATE | + MIGRATE_PFN_COMPOUND; + migrate->dst[migrate->npages] =3D 0; + migrate->npages++; + migrate->cpages++; + + /* + * Collect the remaining entries as holes, in case we + * need to split later + */ + return migrate_vma_collect_skip(start + PAGE_SIZE, end, walk); + } + for (addr =3D start; addr < end; addr +=3D PAGE_SIZE) { migrate->src[migrate->npages] =3D MIGRATE_PFN_MIGRATE; migrate->dst[migrate->npages] =3D 0; @@ -101,57 +119,151 @@ static int migrate_vma_split_folio(struct folio *fol= io, return 0; } =20 -static int migrate_vma_collect_pmd(pmd_t *pmdp, - unsigned long start, - unsigned long end, - struct mm_walk *walk) +/** migrate_vma_collect_huge_pmd - collect THP pages without splitting the + * folio for device private pages. + * @pmdp: pointer to pmd entry + * @start: start address of the range for migration + * @end: end address of the range for migration + * @walk: mm_walk callback structure + * @fault_folio: folio associated with the fault if any + * + * Collect the huge pmd entry at @pmdp for migration and set the + * MIGRATE_PFN_COMPOUND flag in the migrate src entry to indicate that + * migration will occur at HPAGE_PMD granularity + */ +static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start, + unsigned long end, struct mm_walk *walk, + struct folio *fault_folio) { + struct mm_struct *mm =3D walk->mm; + struct folio *folio; struct migrate_vma *migrate =3D walk->private; - struct folio *fault_folio =3D migrate->fault_page ? - page_folio(migrate->fault_page) : NULL; - struct vm_area_struct *vma =3D walk->vma; - struct mm_struct *mm =3D vma->vm_mm; - unsigned long addr =3D start, unmapped =3D 0; spinlock_t *ptl; - pte_t *ptep; + swp_entry_t entry; + int ret; + unsigned long write =3D 0; =20 -again: - if (pmd_none(*pmdp)) + ptl =3D pmd_lock(mm, pmdp); + if (pmd_none(*pmdp)) { + spin_unlock(ptl); return migrate_vma_collect_hole(start, end, -1, walk); + } =20 if (pmd_trans_huge(*pmdp)) { - struct folio *folio; - - ptl =3D pmd_lock(mm, pmdp); - if (unlikely(!pmd_trans_huge(*pmdp))) { + if (!(migrate->flags & MIGRATE_VMA_SELECT_SYSTEM)) { spin_unlock(ptl); - goto again; + return migrate_vma_collect_skip(start, end, walk); } =20 folio =3D pmd_folio(*pmdp); if (is_huge_zero_folio(folio)) { spin_unlock(ptl); - split_huge_pmd(vma, pmdp, addr); - } else { - int ret; + return migrate_vma_collect_hole(start, end, -1, walk); + } + if (pmd_write(*pmdp)) + write =3D MIGRATE_PFN_WRITE; + } else if (!pmd_present(*pmdp)) { + entry =3D pmd_to_swp_entry(*pmdp); + folio =3D pfn_swap_entry_folio(entry); + + if (!is_device_private_entry(entry) || + !(migrate->flags & MIGRATE_VMA_SELECT_DEVICE_PRIVATE) || + (folio->pgmap->owner !=3D migrate->pgmap_owner)) { + spin_unlock(ptl); + return migrate_vma_collect_skip(start, end, walk); + } =20 - folio_get(folio); + if (is_migration_entry(entry)) { + migration_entry_wait_on_locked(entry, ptl); spin_unlock(ptl); - /* FIXME: we don't expect THP for fault_folio */ - if (WARN_ON_ONCE(fault_folio =3D=3D folio)) - return migrate_vma_collect_skip(start, end, - walk); - if (unlikely(!folio_trylock(folio))) - return migrate_vma_collect_skip(start, end, - walk); - ret =3D split_folio(folio); - if (fault_folio !=3D folio) - folio_unlock(folio); - folio_put(folio); - if (ret) - return migrate_vma_collect_skip(start, end, - walk); + return -EAGAIN; + } + + if (is_writable_device_private_entry(entry)) + write =3D MIGRATE_PFN_WRITE; + } else { + spin_unlock(ptl); + return -EAGAIN; + } + + folio_get(folio); + if (folio !=3D fault_folio && unlikely(!folio_trylock(folio))) { + spin_unlock(ptl); + folio_put(folio); + return migrate_vma_collect_skip(start, end, walk); + } + + if (thp_migration_supported() && + (migrate->flags & MIGRATE_VMA_SELECT_COMPOUND) && + (IS_ALIGNED(start, HPAGE_PMD_SIZE) && + IS_ALIGNED(end, HPAGE_PMD_SIZE))) { + + struct page_vma_mapped_walk pvmw =3D { + .ptl =3D ptl, + .address =3D start, + .pmd =3D pmdp, + .vma =3D walk->vma, + }; + + unsigned long pfn =3D page_to_pfn(folio_page(folio, 0)); + + migrate->src[migrate->npages] =3D migrate_pfn(pfn) | write + | MIGRATE_PFN_MIGRATE + | MIGRATE_PFN_COMPOUND; + migrate->dst[migrate->npages++] =3D 0; + migrate->cpages++; + ret =3D set_pmd_migration_entry(&pvmw, folio_page(folio, 0)); + if (ret) { + migrate->npages--; + migrate->cpages--; + migrate->src[migrate->npages] =3D 0; + migrate->dst[migrate->npages] =3D 0; + goto fallback; } + migrate_vma_collect_skip(start + PAGE_SIZE, end, walk); + spin_unlock(ptl); + return 0; + } + +fallback: + spin_unlock(ptl); + if (!folio_test_large(folio)) + goto done; + ret =3D split_folio(folio); + if (fault_folio !=3D folio) + folio_unlock(folio); + folio_put(folio); + if (ret) + return migrate_vma_collect_skip(start, end, walk); + if (pmd_none(pmdp_get_lockless(pmdp))) + return migrate_vma_collect_hole(start, end, -1, walk); + +done: + return -ENOENT; +} + +static int migrate_vma_collect_pmd(pmd_t *pmdp, + unsigned long start, + unsigned long end, + struct mm_walk *walk) +{ + struct migrate_vma *migrate =3D walk->private; + struct vm_area_struct *vma =3D walk->vma; + struct mm_struct *mm =3D vma->vm_mm; + unsigned long addr =3D start, unmapped =3D 0; + spinlock_t *ptl; + struct folio *fault_folio =3D migrate->fault_page ? + page_folio(migrate->fault_page) : NULL; + pte_t *ptep; + +again: + if (pmd_trans_huge(*pmdp) || !pmd_present(*pmdp)) { + int ret =3D migrate_vma_collect_huge_pmd(pmdp, start, end, walk, fault_f= olio); + + if (ret =3D=3D -EAGAIN) + goto again; + if (ret =3D=3D 0) + return 0; } =20 ptep =3D pte_offset_map_lock(mm, pmdp, addr, &ptl); @@ -238,8 +350,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, mpfn |=3D pte_write(pte) ? MIGRATE_PFN_WRITE : 0; } =20 - /* FIXME support THP */ - if (!page || !page->mapping || PageTransCompound(page)) { + if (!page || !page->mapping) { mpfn =3D 0; goto next; } @@ -410,14 +521,6 @@ static bool migrate_vma_check_page(struct page *page, = struct page *fault_page) */ int extra =3D 1 + (page =3D=3D fault_page); =20 - /* - * FIXME support THP (transparent huge page), it is bit more complex to - * check them than regular pages, because they can be mapped with a pmd - * or with a pte (split pte mapping). - */ - if (folio_test_large(folio)) - return false; - /* Page from ZONE_DEVICE have one extra reference */ if (folio_is_zone_device(folio)) extra++; @@ -448,17 +551,24 @@ static unsigned long migrate_device_unmap(unsigned lo= ng *src_pfns, =20 lru_add_drain(); =20 - for (i =3D 0; i < npages; i++) { + for (i =3D 0; i < npages; ) { struct page *page =3D migrate_pfn_to_page(src_pfns[i]); struct folio *folio; + unsigned int nr =3D 1; =20 if (!page) { if (src_pfns[i] & MIGRATE_PFN_MIGRATE) unmapped++; - continue; + goto next; } =20 folio =3D page_folio(page); + nr =3D folio_nr_pages(folio); + + if (nr > 1) + src_pfns[i] |=3D MIGRATE_PFN_COMPOUND; + + /* ZONE_DEVICE folios are not on LRU */ if (!folio_is_zone_device(folio)) { if (!folio_test_lru(folio) && allow_drain) { @@ -470,7 +580,7 @@ static unsigned long migrate_device_unmap(unsigned long= *src_pfns, if (!folio_isolate_lru(folio)) { src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; restore++; - continue; + goto next; } =20 /* Drop the reference we took in collect */ @@ -489,10 +599,12 @@ static unsigned long migrate_device_unmap(unsigned lo= ng *src_pfns, =20 src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; restore++; - continue; + goto next; } =20 unmapped++; +next: + i +=3D nr; } =20 for (i =3D 0; i < npages && restore; i++) { @@ -638,6 +750,160 @@ int migrate_vma_setup(struct migrate_vma *args) } EXPORT_SYMBOL(migrate_vma_setup); =20 +#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +/** + * migrate_vma_insert_huge_pmd_page: Insert a huge folio into @migrate->vm= a->vm_mm + * at @addr. folio is already allocated as a part of the migration process= with + * large page. + * + * @page needs to be initialized and setup after it's allocated. The code = bits + * here follow closely the code in __do_huge_pmd_anonymous_page(). This AP= I does + * not support THP zero pages. + * + * @migrate: migrate_vma arguments + * @addr: address where the folio will be inserted + * @page: page to be inserted at @addr + * @src: src pfn which is being migrated + * @pmdp: pointer to the pmd + */ +static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate, + unsigned long addr, + struct page *page, + unsigned long *src, + pmd_t *pmdp) +{ + struct vm_area_struct *vma =3D migrate->vma; + gfp_t gfp =3D vma_thp_gfp_mask(vma); + struct folio *folio =3D page_folio(page); + int ret; + vm_fault_t csa_ret; + spinlock_t *ptl; + pgtable_t pgtable; + pmd_t entry; + bool flush =3D false; + unsigned long i; + + VM_WARN_ON_FOLIO(!folio, folio); + VM_WARN_ON_ONCE(!pmd_none(*pmdp) && !is_huge_zero_pmd(*pmdp)); + + if (!thp_vma_suitable_order(vma, addr, HPAGE_PMD_ORDER)) + return -EINVAL; + + ret =3D anon_vma_prepare(vma); + if (ret) + return ret; + + folio_set_order(folio, HPAGE_PMD_ORDER); + folio_set_large_rmappable(folio); + + if (mem_cgroup_charge(folio, migrate->vma->vm_mm, gfp)) { + count_vm_event(THP_FAULT_FALLBACK); + count_mthp_stat(HPAGE_PMD_ORDER, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); + ret =3D -ENOMEM; + goto abort; + } + + __folio_mark_uptodate(folio); + + pgtable =3D pte_alloc_one(vma->vm_mm); + if (unlikely(!pgtable)) + goto abort; + + if (folio_is_device_private(folio)) { + swp_entry_t swp_entry; + + if (vma->vm_flags & VM_WRITE) + swp_entry =3D make_writable_device_private_entry( + page_to_pfn(page)); + else + swp_entry =3D make_readable_device_private_entry( + page_to_pfn(page)); + entry =3D swp_entry_to_pmd(swp_entry); + } else { + if (folio_is_zone_device(folio) && + !folio_is_device_coherent(folio)) { + goto abort; + } + entry =3D folio_mk_pmd(folio, vma->vm_page_prot); + if (vma->vm_flags & VM_WRITE) + entry =3D pmd_mkwrite(pmd_mkdirty(entry), vma); + } + + ptl =3D pmd_lock(vma->vm_mm, pmdp); + csa_ret =3D check_stable_address_space(vma->vm_mm); + if (csa_ret) + goto abort; + + /* + * Check for userfaultfd but do not deliver the fault. Instead, + * just back off. + */ + if (userfaultfd_missing(vma)) + goto unlock_abort; + + if (!pmd_none(*pmdp)) { + if (!is_huge_zero_pmd(*pmdp)) + goto unlock_abort; + flush =3D true; + } else if (!pmd_none(*pmdp)) + goto unlock_abort; + + add_mm_counter(vma->vm_mm, MM_ANONPAGES, HPAGE_PMD_NR); + folio_add_new_anon_rmap(folio, vma, addr, RMAP_EXCLUSIVE); + if (!folio_is_zone_device(folio)) + folio_add_lru_vma(folio, vma); + folio_get(folio); + + if (flush) { + pte_free(vma->vm_mm, pgtable); + flush_cache_page(vma, addr, addr + HPAGE_PMD_SIZE); + pmdp_invalidate(vma, addr, pmdp); + } else { + pgtable_trans_huge_deposit(vma->vm_mm, pmdp, pgtable); + mm_inc_nr_ptes(vma->vm_mm); + } + set_pmd_at(vma->vm_mm, addr, pmdp, entry); + update_mmu_cache_pmd(vma, addr, pmdp); + + spin_unlock(ptl); + + count_vm_event(THP_FAULT_ALLOC); + count_mthp_stat(HPAGE_PMD_ORDER, MTHP_STAT_ANON_FAULT_ALLOC); + count_memcg_event_mm(vma->vm_mm, THP_FAULT_ALLOC); + + return 0; + +unlock_abort: + spin_unlock(ptl); +abort: + for (i =3D 0; i < HPAGE_PMD_NR; i++) + src[i] &=3D ~MIGRATE_PFN_MIGRATE; + return 0; +} +#else /* !CONFIG_ARCH_ENABLE_THP_MIGRATION */ +static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate, + unsigned long addr, + struct page *page, + unsigned long *src, + pmd_t *pmdp) +{ + return 0; +} +#endif + +static unsigned long migrate_vma_nr_pages(unsigned long *src) +{ + unsigned long nr =3D 1; +#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION + if (*src & MIGRATE_PFN_COMPOUND) + nr =3D HPAGE_PMD_NR; +#else + if (*src & MIGRATE_PFN_COMPOUND) + VM_WARN_ON_ONCE(true); +#endif + return nr; +} + /* * This code closely matches the code in: * __handle_mm_fault() @@ -648,9 +914,10 @@ EXPORT_SYMBOL(migrate_vma_setup); */ static void migrate_vma_insert_page(struct migrate_vma *migrate, unsigned long addr, - struct page *page, + unsigned long *dst, unsigned long *src) { + struct page *page =3D migrate_pfn_to_page(*dst); struct folio *folio =3D page_folio(page); struct vm_area_struct *vma =3D migrate->vma; struct mm_struct *mm =3D vma->vm_mm; @@ -678,8 +945,24 @@ static void migrate_vma_insert_page(struct migrate_vma= *migrate, pmdp =3D pmd_alloc(mm, pudp, addr); if (!pmdp) goto abort; - if (pmd_trans_huge(*pmdp)) - goto abort; + + if (thp_migration_supported() && (*dst & MIGRATE_PFN_COMPOUND)) { + int ret =3D migrate_vma_insert_huge_pmd_page(migrate, addr, page, + src, pmdp); + if (ret) + goto abort; + return; + } + + if (!pmd_none(*pmdp)) { + if (pmd_trans_huge(*pmdp)) { + if (!is_huge_zero_pmd(*pmdp)) + goto abort; + split_huge_pmd(vma, pmdp, addr); + } else if (pmd_leaf(*pmdp)) + goto abort; + } + if (pte_alloc(mm, pmdp)) goto abort; if (unlikely(anon_vma_prepare(vma))) @@ -770,23 +1053,24 @@ static void __migrate_device_pages(unsigned long *sr= c_pfns, unsigned long i; bool notified =3D false; =20 - for (i =3D 0; i < npages; i++) { + for (i =3D 0; i < npages; ) { struct page *newpage =3D migrate_pfn_to_page(dst_pfns[i]); struct page *page =3D migrate_pfn_to_page(src_pfns[i]); struct address_space *mapping; struct folio *newfolio, *folio; int r, extra_cnt =3D 0; + unsigned long nr =3D 1; =20 if (!newpage) { src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; - continue; + goto next; } =20 if (!page) { unsigned long addr; =20 if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE)) - continue; + goto next; =20 /* * The only time there is no vma is when called from @@ -804,15 +1088,47 @@ static void __migrate_device_pages(unsigned long *sr= c_pfns, migrate->pgmap_owner); mmu_notifier_invalidate_range_start(&range); } - migrate_vma_insert_page(migrate, addr, newpage, + + if ((src_pfns[i] & MIGRATE_PFN_COMPOUND) && + (!(dst_pfns[i] & MIGRATE_PFN_COMPOUND))) { + nr =3D migrate_vma_nr_pages(&src_pfns[i]); + src_pfns[i] &=3D ~MIGRATE_PFN_COMPOUND; + src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; + goto next; + } + + migrate_vma_insert_page(migrate, addr, &dst_pfns[i], &src_pfns[i]); - continue; + goto next; } =20 newfolio =3D page_folio(newpage); folio =3D page_folio(page); mapping =3D folio_mapping(folio); =20 + /* + * If THP migration is enabled, check if both src and dst + * can migrate large pages + */ + if (thp_migration_supported()) { + if ((src_pfns[i] & MIGRATE_PFN_MIGRATE) && + (src_pfns[i] & MIGRATE_PFN_COMPOUND) && + !(dst_pfns[i] & MIGRATE_PFN_COMPOUND)) { + + if (!migrate) { + src_pfns[i] &=3D ~(MIGRATE_PFN_MIGRATE | + MIGRATE_PFN_COMPOUND); + goto next; + } + src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; + } else if ((src_pfns[i] & MIGRATE_PFN_MIGRATE) && + (dst_pfns[i] & MIGRATE_PFN_COMPOUND) && + !(src_pfns[i] & MIGRATE_PFN_COMPOUND)) { + src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; + } + } + + if (folio_is_device_private(newfolio) || folio_is_device_coherent(newfolio)) { if (mapping) { @@ -825,7 +1141,7 @@ static void __migrate_device_pages(unsigned long *src_= pfns, if (!folio_test_anon(folio) || !folio_free_swap(folio)) { src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; - continue; + goto next; } } } else if (folio_is_zone_device(newfolio)) { @@ -833,7 +1149,7 @@ static void __migrate_device_pages(unsigned long *src_= pfns, * Other types of ZONE_DEVICE page are not supported. */ src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; - continue; + goto next; } =20 BUG_ON(folio_test_writeback(folio)); @@ -845,6 +1161,8 @@ static void __migrate_device_pages(unsigned long *src_= pfns, src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; else folio_migrate_flags(newfolio, folio); +next: + i +=3D nr; } =20 if (notified) @@ -1006,10 +1324,23 @@ static unsigned long migrate_device_pfn_lock(unsign= ed long pfn) int migrate_device_range(unsigned long *src_pfns, unsigned long start, unsigned long npages) { - unsigned long i, pfn; + unsigned long i, j, pfn; + + for (pfn =3D start, i =3D 0; i < npages; pfn++, i++) { + struct page *page =3D pfn_to_page(pfn); + struct folio *folio =3D page_folio(page); + unsigned int nr =3D 1; =20 - for (pfn =3D start, i =3D 0; i < npages; pfn++, i++) src_pfns[i] =3D migrate_device_pfn_lock(pfn); + nr =3D folio_nr_pages(folio); + if (nr > 1) { + src_pfns[i] |=3D MIGRATE_PFN_COMPOUND; + for (j =3D 1; j < nr; j++) + src_pfns[i+j] =3D 0; + i +=3D j - 1; + pfn +=3D j - 1; + } + } =20 migrate_device_unmap(src_pfns, npages, NULL); =20 @@ -1027,10 +1358,22 @@ EXPORT_SYMBOL(migrate_device_range); */ int migrate_device_pfns(unsigned long *src_pfns, unsigned long npages) { - unsigned long i; + unsigned long i, j; + + for (i =3D 0; i < npages; i++) { + struct page *page =3D pfn_to_page(src_pfns[i]); + struct folio *folio =3D page_folio(page); + unsigned int nr =3D 1; =20 - for (i =3D 0; i < npages; i++) src_pfns[i] =3D migrate_device_pfn_lock(src_pfns[i]); + nr =3D folio_nr_pages(folio); + if (nr > 1) { + src_pfns[i] |=3D MIGRATE_PFN_COMPOUND; + for (j =3D 1; j < nr; j++) + src_pfns[i+j] =3D 0; + i +=3D j - 1; + } + } =20 migrate_device_unmap(src_pfns, npages, NULL); =20 --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012038.outbound.protection.outlook.com [52.101.53.38]) (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 F25942D662D for ; Wed, 1 Oct 2025 06:58:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.38 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301916; cv=fail; b=TzIHtrdMj2v3x4ZAqrTMS22pXm9VeZMUPY+zKYv/TV2CswplFWH1ivvnnCPiUT4Edqdx5BEMbbWoUUq9w7UAFcofqyI7tm6H+bGozX5Lcc32lSREN02l5vP0cKTFAw+T+KMf639HJO8Xe63W55ofKb39brZHbKtUZ8q45GUasNY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301916; c=relaxed/simple; bh=FAcJ6Wt3fBr2ItjOKZGYxkg6A7A5rzgRp4E6SuetIaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=F5hwKzOy8egU2Ltdqt1qlaOyYSuVlABp4YKRLJqNbqWIPYc0t2Xb3jyC8OeYdsk5QLoU5PHpeEHWVBPS256QMqPlP4rJmpBp/EkJq8jDpt6t2xfm7MlHlPE7pRLUf8VOTtK76alXEPD6ovPz1/xdmKG5Ipo4TlTizrpQbeKMwYA= 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=HV0DvC+B; arc=fail smtp.client-ip=52.101.53.38 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="HV0DvC+B" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Aro2po3zULRXmP4PqMPeyhNQp5Lhqu3BDefBLCPi+nkYMk92Vx0nH9XGGkzSDtFhuKccvGGzcXV7JImYZB8GmPGr2fxGyShRdQ5FoytjmvD9z12ucCRcMUv+MPhmEdsrwHXNlty+iPjWIX3zMgv2JWjIM8UNoLifpULO+PbXeYFyqPqyRqvIjPqKjk3AsFpTyMyg1Btn7SXkyjL2WZO56LQz7Klngj0oFf5JsAxw/bLUKjkvhQdRACkg3wI87g71pMluNQ6gXaj8D8xRVRONLShItD4x+DE372VVdrhuxAMJE5bW9DSN8tpmPCcilv+MXwoRQujTecQFAWLb7tX2eg== 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=vOl5M3kp4BIcs6OEkYJUTSmye+VyxZYe9zp20piKQ9I=; b=ixjngslNI51z5V6xa1rVfw90hmj86yT6feludMif85Pc7azf68tEXEwtBBM/zJ/ZutZYge4bdqgqlNMAptZxk4yoXulycJjYYd0fQ/ehp1GuicaIQMyLZ4xIFqVoPQHJIEggbvc3uzjfsNbQ3FpXXQzxMfRD9PKv3q8OCsr/Lln0++V7OzFLwrWtxheE1NN5z/XY71PWSJf8TKIWL68BCeHr9tgoDwaxhQGimfOe6XoEggCiGgdWwEQJIz95S5NQSpcFGKt6qj0+LH9oE8N2b4pw6SeTf+u/2hVDa/Rf9/uM9GDpD+1hkTRei8Y6R9p11GmFII8FaAwWhglK3h50LA== 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=vOl5M3kp4BIcs6OEkYJUTSmye+VyxZYe9zp20piKQ9I=; b=HV0DvC+Bz+aDq/brjbssjubFltaT8xNlb1XJr96t0BW4zG1DZz/QmB3HWGIvnAXZwvodvabSWLODmZgEfKUnWqGxmBVroOaJWYaIa635vSyxFR9dswgNOQoK830q30Vx1xxFXChTb7N8LC/qXVyosGT0uwqVR6mJHLWXES7W5ml46dPCHlT1hLsZC58R+jJkomMedCLQ1gFF96JCPy5As81lcOVZcHVF3izQ7alWrTbuzYqQKTPBsQ+1l4Ps7VShsOr1oLgdfjvvZAmLctjIHcxxXyk9vPAJWV7LDRgLVbcElTXdLm+jalrfu8YzZbcp0VObNPdoj8bqqFdRtkWLwg== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:32 +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.9160.015; Wed, 1 Oct 2025 06:58:32 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 08/16] mm/memory/fault: add THP fault handling for zone device private pages Date: Wed, 1 Oct 2025 16:56:59 +1000 Message-ID: <20251001065707.920170-9-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0002.ausprd01.prod.outlook.com (2603:10c6:10:e8::7) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: 029b4cae-118b-48cd-6366-08de00b7eec3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?dFhhdGIzb0E4cTVia1JqQ28zSXErYzJKV0REVXZFNXNFOGxWVytVL2NuWHFZ?= =?utf-8?B?cDJ6Yk0zZ3lKRlBFRW93K1VTOHNNeTBtK3lCclZhV3BDUTlhVmM2aG9IV3VR?= =?utf-8?B?NXJJU3lwRmVZRkRyemd4SjYyQm5ZZ0VScDBZVHV3L3FLSittTDBSMmlEa3NX?= =?utf-8?B?Y0ZMSEJMT0c2WGpDT0ZESC9RNkVCUkluZ04vbzA4N2ZPWUFnNVR2T0tvNW5y?= =?utf-8?B?bEt4QVNFbWo1OUk0bkRtWjJ0YTM4bG9IaVNTM2xJbWgrNXFvUmhObUNERzhq?= =?utf-8?B?d2pwNVhWTTdsRDl1ek9paXJFdTk4SGZqU2xhL0pxWkw0aUEvczFNS3JxSjBK?= =?utf-8?B?dUxkcitOZWNOUzlnczRNUUpLV0oxenNwTWUvQVJxTUFwMVJzc2tvaktjaGIy?= =?utf-8?B?UGl0bGhHWHlHejdETXR5Nm9LT3VuNVpnSkpva0RvdTFaeHVYckVsTnZoNG96?= =?utf-8?B?dVJlNUFoNHRqOFQ1Z0pUMCtoTXF4TXlLQUNhcDRRVSs3cEJySkY1WDZZb2to?= =?utf-8?B?ZnhtcThuSk1EK2VPcWxmcHVXdzljZ2c5WEhKazJWWlNZNTJQcGhJZ01Vdndt?= =?utf-8?B?L0dldExKZFZkTUM0OWhjVUpJWm13bU9vdlMrYjZFTGRKRnNQVHJGNnVzYlYz?= =?utf-8?B?NEdLczg0QUJvV1AwZkJBWkxIL0xhMVFOSi9LQmlzWlkzVTBXWnBubDhBQ29y?= =?utf-8?B?Ly96eU1CUU0vbmhubkVTY2p4dUxvNFpDRzdMeGZBNXh2NXBxam1HQ2JzdkMz?= =?utf-8?B?ZU1VQmJkeUtZQjlkRE1PS3NuSUZZaUtPbUdJRWV1d1Q5RmRobDJnRGxjR2Rk?= =?utf-8?B?c0htenpFeDdxWWZoVWNYdmJ6d0hEMmNKOGpuNkxNZHdDU0p5RWxHTElxNDhS?= =?utf-8?B?NnhVL3BFZlhhUHVZeGdYYlgxSzdTOCtqTjdwcFp5aDJENWNkbEpQWllWWndj?= =?utf-8?B?WHhtNzdHK0VVK2ovQS9PdXBDUGFMdkk0ejBMMXVqSElwUlpjVVlrK2JhbHlW?= =?utf-8?B?aktkNkdaaVFET2luTWNRMHUwMGFzeWkvT2FRZVN1YmI2YytlWm5QNEcwbW90?= =?utf-8?B?a3M4UEhjTGpHL24yeG1IVllxRVdWVlhqZmkvZXJtek9DY0pINXN1TEs1NWdq?= =?utf-8?B?N0xHTUZDWnlhQzF1T1JsYTl3UTdhVzk2VXExZUt2MzRvQVNYd0MrcWdSM1VT?= =?utf-8?B?b1Mya2ZSc3lZdDlGcis0UE5nR053ZVVZb2MxRkE3Rm5PZzNMdWxnNjcrdHZH?= =?utf-8?B?bUFONEJtcHMrNWROYVRkMkh6a2RGSzNGMHNFNVRVcC9FTGFta3NyLzhMcW8y?= =?utf-8?B?YUM2ZlNTcHU1eFdYTjVidmdqaTJSOGc5ZTJBaEdsaStEakZOQlFGVUdQYkN5?= =?utf-8?B?Q1REM1VqK25KamlBUktESzBtOWxTMHFwMS9kNm4vUWM0WXRabkFSc3dHb290?= =?utf-8?B?YzFieXRMQ2xzY29kdVJxNGduNWJpNmxIQ3FuK1M2K0JTaUgvOVFXUzlXRkRC?= =?utf-8?B?SkJBRnRBLy9nNWYyWTQxQ2Y1YWxRRnhsMWtGZEZicEpZQXpnQ3BnRWFybkQw?= =?utf-8?B?NjdKb2VFTnBNc1hGTGtycVI0Tjh5eTladGE2VnlhcVcrcmRBSUlxN1hDdUNy?= =?utf-8?B?SlJydWpKcHVUOEpmbXdYWkh4b0l5UWtiUG9Qa1lDcGVMVkdOckttdFl0NGFj?= =?utf-8?B?TWFYTkV1WVJuZkJGZFRRZ0l0RGpqdHY4dFZUYndFc3pZcjhnTjNFU0tIRkp4?= =?utf-8?B?TnRjeWVGS1N4OVhrelVQTzYvWVRHeHpoL001d3lNKzdiSFRDaDZMbk1YVWZV?= =?utf-8?B?dmtETnR3bVJrSHVSeVJKZVJPRGpUYlIrYnZRNzZHRXFHcDlqZm9oVEpYWnQw?= =?utf-8?B?eUlCblg2RllWbGRXYXU0b21kU0Z5WThoRGJWZUNTbHVZN3JFQ1FVK0NxZ3BW?= =?utf-8?Q?Zw3FGLiBy5IVdIg2vxZvE5hzagBVs3UM?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c0owMTloOEJQM09jNTNyR1AvelNLMUNiRlA1QTZnQUhiNHVReENBMjhvTnZr?= =?utf-8?B?bmxsbDhveHJlTHJZOUJzR1NMWjZ0WXU4WWx4QkJlRGt1SFFxM3VRdlhjLzdk?= =?utf-8?B?Zmp0TDVCeU1CYkF1YWpmTWladTNiNFQ0a1dsMVBhVzVwVUFjcEQ5MDFjclVz?= =?utf-8?B?aHJPN1AvbGpVQ1BXT0IrQVk5bFFkR3JVc20yRGtpMWxmOVBZaUFIOUhNKzJJ?= =?utf-8?B?ZEtEOUZtWDFPc3RhdmtOMUd6ZXRxR1NPOVFoMlhkSyt5b25sQ1FXemIrSnNj?= =?utf-8?B?R1UvQjNWNEFHNkRlR1RIVGt3bzlNN2I3bi9TMHBxZWZiSWZJK1dleDhTY3Az?= =?utf-8?B?bTJVek5Cc0VuSEtzR01uRmJmL0RSMUZNdExPTGg2WGsxc1dLVDJRdmV3SjZZ?= =?utf-8?B?d2gyZWxON3UwekRJRlBKRlMyTGN3Y3g2L1lrOFlZRXNsMWpSN0FiOUE2T2dx?= =?utf-8?B?eXN5aktKb2JheXpqeCtwaDBTZEJHa3lHN3FDb3RId0FTT3AycUJySzFxRllq?= =?utf-8?B?NkhQQS82d3pKV0JzblU1ODk0RUxicHFKVW96S0dmNmJYdTZNNlFtNE9IaWs0?= =?utf-8?B?YmJrQ3Z4cnU0WGtVUklnQU02NmpMNjJCbVo1V1ZZbjFadGVXcHFvTE1XMFpI?= =?utf-8?B?UlhkTG9adVpEcklTckxrNDhYK0RUd053a1kxcHF6U3d1bTRtR3ZWcFZLR3N5?= =?utf-8?B?amZqeUk1eU9tcUs5QjFsRzlqVW9rRUpUNGJ4TEVtMldKRXYveDBsa1piamVO?= =?utf-8?B?cVhCZDdVN3k4VVY1VzZHZ3FNVXptV0xVTWNDVlFKak11MnRweFNjdFlQTlVL?= =?utf-8?B?N0xYYUR1MXcwOU5heE1lZjRrSzR0YzZuNEVSdHpQeVlhU1ZDS2JVeFdmaVlR?= =?utf-8?B?dGdXbGZaRzdxTmxnNHR3Y2R4YVkwMzVURVdVSSt3NVBLck9Fd2o2MUcxQjc0?= =?utf-8?B?T0tSOGpFbFVpKzdaekp6YURsTjdTVE15SG9HODAyT0d4V2szbmhoclJjMUR1?= =?utf-8?B?TnorRGxCRERmbE4vNkFrT3Y4YWtXQVFHaWVIekJvY0IvTXBKelZhelFsNUtN?= =?utf-8?B?RFNMelZlbEFnZDBSN25nZk8wMzl0T3pacEF3VVZmYTN4QkZPSk1Wa3pva2Yx?= =?utf-8?B?TDB0c3pDem83OHcxTk96R05TZ28vN29sUWFuSTNKK2tMWGtLVlZ0VERmNjNL?= =?utf-8?B?aFRxWHR6Z2ZoNlpSeTd1bTc0cjNEbkZrOXR3OW8wVzEzU0JGWEZ2blEyT2FM?= =?utf-8?B?Vm5VcE8xV2R6d3ZTckRPNXdaQ0ZvZ2tnOHJIR08vOWNHRmNYeW1vbUJYcmEz?= =?utf-8?B?MnVRQUtXOXZod1U4eWFXY0hDdi9MdThYeDNOMHFHZ3RrelBjeHlHM3A4T0RQ?= =?utf-8?B?OHBtNjQraWQvdndmenJGYWJiUGdSM01jOFpwU016WjRWYUdrZVlyeVNWQ0dn?= =?utf-8?B?dlNpdkw1OEFNRlZuV1VTbkErQmlld0ZRMEN1dEZzeWh4VU0veFNBdSt4Qi9u?= =?utf-8?B?c0R3M2YydGlxZy8vWWlja1dvMHo5cjg5NVZZSFEvNGo5QnYxSkNsK0VsajZQ?= =?utf-8?B?M24rbHduUEZSRFBiYjd2NjRwWlhGaDZOT3Ewc3FQTzFaS3dkeWNKWStWNElP?= =?utf-8?B?L1Q3RjJvcWRvbEx2VU43clcwS3kwOTdNYm9RMHlZUmwzbjcyOG9jbHptQkRN?= =?utf-8?B?TXM5ZUV6Vmh2eFlmcEN5YUhIb1N4UWdCcTkrK3FkcVZsQWZia282Q0FCa2dE?= =?utf-8?B?VCt1Q0VlRkFOTU0zdDVIbGlxOUJ5cUE4UndHL2t0YTd1QXdKV1hMdVlUaTNH?= =?utf-8?B?MUtHYVVVK2hkM2dpL3hiajk2VWtNSnFNVTVQejRvam0raUtBZExGdldrRUlm?= =?utf-8?B?RlVpOTFIU3YzRE1iRkJDTGNqVXA4cnI0QzluZXJENkVDSDk5STFvU1ZQV000?= =?utf-8?B?U2VkS3k1aW1RSUt5Qnl0MjkvbmsrQzRHc24vREJaSWRpWUplSW1TdHJXOUZT?= =?utf-8?B?UTVERmUwNmNwS2Z4bGpVT3BTRmRNNVlIRDA5ZnFQL25EbUdzaWlIck5oUU82?= =?utf-8?B?eWdtMlA3bTRQdFlZcWg1QUltL2QrVWxqcTY0dHJ1M3JraGk1YkwydjlsWS9o?= =?utf-8?B?cndBZHlJcWMxdEEzS3l0Y3o3aDhjRVlOY2ZJck9ISWs2bk9hRm5TQ3VmN3ZP?= =?utf-8?B?dVE9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 029b4cae-118b-48cd-6366-08de00b7eec3 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:32.0701 (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: U0AF0VG6VrnTn74wSpAAA7jXMo4c1pntQNX0MY+AysfMCgZPtdebihL0rzCcmDACtrL60qOSfynOO7Hiok5UdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Implement CPU fault handling for zone device THP entries through do_huge_pmd_device_private(), enabling transparent migration of device-private large pages back to system memory on CPU access. When the CPU accesses a zone device THP entry, the fault handler calls the device driver's migrate_to_ram() callback to migrate the entire large page back to system memory. 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 --- include/linux/huge_mm.h | 7 +++++++ mm/huge_memory.c | 38 ++++++++++++++++++++++++++++++++++++++ mm/memory.c | 5 +++-- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index f327d62fc985..2d669be7f1c8 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -496,6 +496,8 @@ static inline bool folio_test_pmd_mappable(struct folio= *folio) =20 vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf); =20 +vm_fault_t do_huge_pmd_device_private(struct vm_fault *vmf); + extern struct folio *huge_zero_folio; extern unsigned long huge_zero_pfn; =20 @@ -671,6 +673,11 @@ static inline vm_fault_t do_huge_pmd_numa_page(struct = vm_fault *vmf) return 0; } =20 +static inline vm_fault_t do_huge_pmd_device_private(struct vm_fault *vmf) +{ + return 0; +} + static inline bool is_huge_zero_folio(const struct folio *folio) { return false; diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 05c68f5b5fe3..8c95a658b3ec 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1287,6 +1287,44 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struc= t vm_fault *vmf) =20 } =20 +vm_fault_t do_huge_pmd_device_private(struct vm_fault *vmf) +{ + struct vm_area_struct *vma =3D vmf->vma; + vm_fault_t ret =3D 0; + spinlock_t *ptl; + swp_entry_t swp_entry; + struct page *page; + struct folio *folio; + + if (vmf->flags & FAULT_FLAG_VMA_LOCK) { + vma_end_read(vma); + return VM_FAULT_RETRY; + } + + ptl =3D pmd_lock(vma->vm_mm, vmf->pmd); + if (unlikely(!pmd_same(*vmf->pmd, vmf->orig_pmd))) { + spin_unlock(ptl); + return 0; + } + + swp_entry =3D pmd_to_swp_entry(vmf->orig_pmd); + page =3D pfn_swap_entry_to_page(swp_entry); + folio =3D page_folio(page); + vmf->page =3D page; + vmf->pte =3D NULL; + if (folio_trylock(folio)) { + folio_get(folio); + spin_unlock(ptl); + ret =3D page_pgmap(page)->ops->migrate_to_ram(vmf); + folio_unlock(folio); + folio_put(folio); + } else { + spin_unlock(ptl); + } + + return ret; +} + /* * always: directly stall for all thp allocations * defer: wake kswapd and fail if not immediately available diff --git a/mm/memory.c b/mm/memory.c index 7e32eb79ba99..59985b88a9b1 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -6337,8 +6337,9 @@ static vm_fault_t __handle_mm_fault(struct vm_area_st= ruct *vma, vmf.orig_pmd =3D pmdp_get_lockless(vmf.pmd); =20 if (unlikely(is_swap_pmd(vmf.orig_pmd))) { - VM_BUG_ON(thp_migration_supported() && - !is_pmd_migration_entry(vmf.orig_pmd)); + if (is_pmd_device_private_entry(vmf.orig_pmd)) + return do_huge_pmd_device_private(&vmf); + if (is_pmd_migration_entry(vmf.orig_pmd)) pmd_migration_entry_wait(mm, vmf.pmd); return 0; --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 1951826F2A6 for ; Wed, 1 Oct 2025 06:58:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301938; cv=fail; b=QQopb5ESlEBkJXrW4YVwRSFaQezO9fWorXUgLI9ulpOMdeM13wqLYDtKAU9CNW88nFAdVeR6WAY3NFNKjtxklRtYFTHflVBKHkHqDSKzJMMafa9+z0Dx6CaJrx2AsmcCPRhsPcqmaiHrmNHr8ISpJ82OkIZ54j5g+UEvvl4hytU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301938; c=relaxed/simple; bh=sdnZZeJEi2F1w0D+90DT3XUI4QBjCj/pHZKUzfkqGX0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=gd68jCGHLxldOUVn/ML0ZCCQx4xf7iTyoP4QIT0f0w474sFvJnu7J/K0rMTpjTICuZ3m/+j3GXnXDNIIZYHmGKZlqVudHPkZAxwQSo76TDjPaZhduLQ27bx6mDdZpbVtfOlAlycUUnH68KQAAHzl/5Ig/+Mp8tSUv7/VA8bRFFQ= 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=og2qj1YL; arc=fail smtp.client-ip=52.101.193.20 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="og2qj1YL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C9gN5SrvJ86+xZR5lgJ5V/x5B3HI+O8dpUMNDfbCCeIdKuSkb0ytXNd5myX5m7rgCma00cU8djYlM9Kn4rjszen2Pp7wOZzwElzr7xKJMHnOP5c0CTYmK///Cm0f5GCM2FPzg3QbYz4wAk/4xQKUsV1Ax0kzNup5Q6dMEHhlvzTFhwmlDBTJzv7UbUEYpsLxQ4a8RdGMFX634eeRpTxoJp8we4ni1TXE5/7mZEk+G8R5wVPWiSd8jRCqpzK6no2EIHCGYwNGmh2iNhroOi/Q8TB8g38R2GcD2gQN1Qnhf8iVrK0uXypjzFSTUts8MEC8Me1+hXse7OOtvoQar4npBA== 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=Owc77XdQzRRTRdRN/LdXS7ya2DNChj16REY5ruhJXF0=; b=tbI/HHhlfKAwMo+Mm6MdCcxDhDwHowCDPl4PDqDzCHRPPRWbxcIEHkLZ6Hg4NRy5Xp0UdvpTMOLgBxtQKxXbG9olpnWkqrc4qWYAH8y1BkPXtDypVIc1wlP58rgUG3x9+0h0nusdivy4jspj1D5LTku6tHmLh/2PXv8RJWG4gRX7pHRDEXMNjEwKNMjg1Cle3hWVTMCxyj2vF1TY/Oe2mN/bfw1D2t2bqaCnN7kn1CPt+GeUxin1AWTyBXbbhmIwyev6Akv31se0IB2TyVHUeMVxtr4KPXGDiV+V6FQ595ediuvGeM0Re401f9JSO7DXoot9xaR0cQCxvs1+l54bYA== 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=Owc77XdQzRRTRdRN/LdXS7ya2DNChj16REY5ruhJXF0=; b=og2qj1YLsth3rTbiFlU/Ofsna7cZA+Kv1+A1K81N/4nLpfXgNP9CBDmDXTxCwgX9wrf+wTB/WJY1ENBYXBdfj1iwlzpF/OMjZkagCGz/+6kUzvGL/w/Kv43aBzkNKoUoDGTueen+dkvZlkw6Z3VHjyGGB4eSspYiQgB9RNqstgOtlTxThY9hTUG1QPdmOeAIbSKU42S08OvnWmXpC4rv/abdzl+fQkNib60Ys+yTEC3VI6j4knm+RsfPFpYjcT3LE7L2L8rXtK8v5Zd0itypLpNyxN9LnuOrx88zU3qJYZ6cokkaFsuFW7ExMzUtM8Vzm91nlbKMmfVapMQqkCXgKQ== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:36 +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.9160.015; Wed, 1 Oct 2025 06:58:36 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 09/16] lib/test_hmm: add zone device private THP test infrastructure Date: Wed, 1 Oct 2025 16:57:00 +1000 Message-ID: <20251001065707.920170-10-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM6PR02CA0148.namprd02.prod.outlook.com (2603:10b6:5:332::15) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: a2787312-4ef4-439a-ee90-08de00b7f13f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VmZvcWpON2pCWGVLZVc3VlNscWVnY2kybzlzRzVzR1lMNkkrVFRzQjNWdFov?= =?utf-8?B?Slo3Z0RrcjUzVForYm9QN2FEanhabUNwaUxoQldWVVVHQk1DZGdqTEsrakc1?= =?utf-8?B?U2hXeTBMZlFLZ0hoU0RHbTRXSGx5ZCtrSlFiQVYxakd0cFhuUjlvZ1NMU3pw?= =?utf-8?B?UXFDdll3eVVwVTZoQy9qYlZxMzVMWi9BL25ubFpMb1RzNDMvVjgzYWthZ3BJ?= =?utf-8?B?NDdRb2NCdDFLWVJrQloydVUxcy9SbGtWK1RQMko5VDBzOXRxRTNicjRSUVli?= =?utf-8?B?Sk5nNlNPVjZnd3BucE8yKzROd3YvM0lBR3UxZ3I0cE8wenU0WTNwQWJ6RGlq?= =?utf-8?B?bTArd3pVdEY3dVc4ZUJFb3RMbHVSa0Q1ZmRuWTFSSFJlbDJBYzVOd0NGbU11?= =?utf-8?B?V3pxb2lyOCs4SnMvaDdUY05FUVVCdFdVWDljUE9xSXFIY1BPTEVoSHN5cllX?= =?utf-8?B?T3B6Q3RUTjZQT0lUVzlIeFlvc1MvRjBzM29qWENMRmZISk5CV1VHZ2h6azhi?= =?utf-8?B?UEVjQWlKcGo2ZVhQNHdhRkZzNkx4ZkV3MUI1dzM2UlJlMU84OGdwRjYwQkxn?= =?utf-8?B?M29FMEFTbmN2WEZhYjdkWEVCQzNjM3NCTkxhNmFrVnkwaWlJUGlxQmEyWEF6?= =?utf-8?B?V1V2UGlsWnpScUZ1S1prSU5RSWpoOXdFbFFyemI2SjJpZnpZWElFT0V5dC9k?= =?utf-8?B?RTBTL0NNL2ZYeStwUCtiOGs2ZDlqTjNZOU04cTdDNjdVVFVaNk83a3FBWnpQ?= =?utf-8?B?TEt0YWQwOTkzMTRkNXdZbUp4c3grZUQrbVAweDR2RjZsSnFwVjUzVm5GSmlN?= =?utf-8?B?MDdCSnk2a3FYbEZ6TkZpS1RjYmRHYmkyVXJtbzcwNkZBaGdUSXY0OTRxaUhF?= =?utf-8?B?QjU3akpHakxMaS9ueTE2Y1lpMGFIdG5ocEpuNFlNa1RKTzAxeTJsTXg5RSs4?= =?utf-8?B?TktJMVl2Qk1XZmZIcHUyalFkUEdPaS9LL3Mvc2FnSWQ2Zm1obCtIbEhsUjk5?= =?utf-8?B?eVZjU3g5WnNnOWdkcmViWlNFck0xRW1KTmtCcmMra0V1cGRBSUZNOWs5UHls?= =?utf-8?B?ZmlLanpJb1orM0lsZldNR2UvejBIbUlmZXVIZFpwWEFRZlpuMHB5NW9hQmVM?= =?utf-8?B?MjVQb20ya3BxN1hLOG1zWExjcW12NUJhbGYwRWpKWWo4RjEvZmU0V1YzWVA0?= =?utf-8?B?bXNSTnZRUk85bnBCbGxSWnRLUUpaMm04VDg3dVdiZjNndmZIcFdGdlJZNEtU?= =?utf-8?B?VVJENDdDTW1PT0I5Tmc3alBXV2ViazlibTBONDIyelk3ekZ3cGVoYzFoWXBm?= =?utf-8?B?em1qczVHRHM0MXVlUTF0akZVOXprYUswTkZnMTYxVytHR0l3VnVUY3pudmRw?= =?utf-8?B?SjRMVjRhMk5mZG14ZUlpejRqaHBLL0N3RzlWSHRSSUE5T3hZdnJWT0c3c0xF?= =?utf-8?B?VFBGUU1ReGRMM2tha0RYNkZoUXZNZktjSEcxanprVWxhTGhtYWViS2ZLWksr?= =?utf-8?B?aWR4UXRwN0oxQUgzMVM2Q0VNaDNKMkwvM3E3QmhSWEpydUJ5Yi9FZ3h5TWQx?= =?utf-8?B?YkJFbDd3aTdBQUFIYnY4TSs3VGYvMnNkb3VxN3RPTWNZcVU1RlBtNjRBMGlx?= =?utf-8?B?aEdkRmFPdUtxTWpUOFFXdmRlcDZrSW9MRzZ1Z3dPSHhRSWJrQmRQZ2tZSmZ0?= =?utf-8?B?eHJQZkoxV1FYMWZ5UnRhRW4rU2hkV0ZLUndiSFRwYXcxbXg4Q2krM1FxaWdK?= =?utf-8?B?RVB5WlNNVzNkNWFmUHdpUFFaUEl5aGRaTS9hclZOMHpNdnR2MjBGSDZkcW9T?= =?utf-8?B?VWZlWE8xYjFycTFuTnlST3dMQU1xNTZrVVNUODRyRFJHS05NRGpiYnRML3Fp?= =?utf-8?B?a3plVE1aOU43K2pYVmRlY29tb01Kc3pQeXVleGhOaiszbHBsZ094SzFuSnRO?= =?utf-8?Q?NAztvDOWmmaF2Xr3xqQMTNB/5JzPapsx?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z3VzWVZkMG9aTUtpV1lyWlFBRWFrUTJKdGlJVkZsNmhUa3lOVVN6RHMzRmY2?= =?utf-8?B?d01SR2ZDZjdXdlRNaWwrWk1OZE9PQ0pySU54eWNsaEh0YnpKNllRdXpqR0Vw?= =?utf-8?B?VWs5ZGZzVi9VeWI3ajJMZGFqeXd5WkNvZlU1OWN0bzdJczZwQVBzUUpVUk5T?= =?utf-8?B?OXFGbnQrUkUzVTN5QWVQTlRmN1hjb0V1cU1ySWl3bjM4K3pBeVkrSEZmQmFG?= =?utf-8?B?clRaR2tJZTBNbFY1SytYdFhjOTlKak0xTFRKZEVIVHBtK3E3UjdRNHR3QndS?= =?utf-8?B?dC95TTIwaHJMN1J3TXpUak9UUUlySjRWSG02U01YWXhOM0xqS3E4TW91eW0y?= =?utf-8?B?cXFYL3FUVldHWDFkWjEwUWRmbnliOXdvVnJuWUk5SjEra1RBZVh0TktMc25K?= =?utf-8?B?SWNZbEl3SGMvQWtxZ2poV2RHWTlHbXFEQ085a3JxektxaHBCNjd2NGg3MVpq?= =?utf-8?B?UzdlT21pM1VadnZDcWt2Qyt6bTBhQ3lucmc2NnBXV1QwNVhZMXArQlI2eHNt?= =?utf-8?B?VmJJS1JaOUx2TkgvYzJ6UUxKcjN6QitZbHRVTk9ueHhvZW9UV2doYmw5ZzJR?= =?utf-8?B?Mk01RjkwK1d0OGJKZW9xRWVaemtxSHdhTnBEOUNZK3cySHlyV0RYZy80V0lh?= =?utf-8?B?MHRITlY0ZjlyNWR4K0k1TSt3cDJFYzVKc2l4RWpuUE1kVXhIenpPMWJSRTJv?= =?utf-8?B?Z3ljNW9SRHYxeFVsd1IyMXR5NUF1enNDOUZvNFVxcm5ma3Q1WTl3WVZrTkk0?= =?utf-8?B?NUJiS1ZlSWFFazZJKzQrbzhOVU5OcWx6ZWwxbGF1ZWZkU3pEN3RWRm1NMmwx?= =?utf-8?B?Mkg5cnphaStzdVVkWTZrdGptSTArYVFmMkhneG5Fb1h0dFBYckJiV1dpem8v?= =?utf-8?B?TkhjeGJwaVhxK2p1Z1N1cWlrUVNxS2o3YzUzVStnbzJTQjI5WjIrdHdYbUFk?= =?utf-8?B?dS9RaDl1THF1Y05wY2p0NDZyWDNVUnIxUVlhZ2JKZkRxeHY3N2UwZFhTdFB2?= =?utf-8?B?cjBQRTJVUEJIYkd1QmtjdmZGN29YSloyVU0yVG8yRjRJcHFPUnZFa0FSRnRO?= =?utf-8?B?TE1zMVhXRmRBQ2M2R1hrSXAwTjkyV1FGZFUwUDFjdFFzbFpaSERvendqRTJI?= =?utf-8?B?Wlo5OXloZlJJVTZudStTUENHbGVtL1NIak9sNkd1a3dJdzJtN3V0bG5kcWR2?= =?utf-8?B?WG9yZHV5WEUvZlRkdWZ4ZldUdWcrM05FSVBCdldvZnRDL0hOZ1RkbWlZTG90?= =?utf-8?B?OEw0QXVCVkE5SWxiNXNQRXlVaDh6cFpKQW0rc1NNM3dqTGVQTEJNbzBpQlZH?= =?utf-8?B?SVIyT011ejFVWXlnWEE2TjB5MEFhMWYyNG90K282YzNyUlBHeFhQeXhGZzJB?= =?utf-8?B?cjI5VjJzRFI1VUpGTDhPOEtJL0JEYnVlUEFBWGxZaXhFcitQdnN1N3BFbmFU?= =?utf-8?B?QTdmeldEZUo3RDM5emVtRkJpRlRTcUlMSS8wem5vWDN0dFYrUHJWcnhRclIr?= =?utf-8?B?c0taRE4rZStjczdtRk5DTDAxa05SZmdUeVRZY0dremJ4QTNkOHY3NHoyVFIr?= =?utf-8?B?SUhWaVB4LzlMYWNCZmFvV0NVVGhyL28ybTJLbGZFZ3BIcEo5V2VKVEx0V2dB?= =?utf-8?B?ZkJhNkI5eGhveXFpV2F1ajQxRTArOGdRTW16WXl1VzBJZHdERHBkSHhzbGI2?= =?utf-8?B?RnZDUFN6OHJKYTBjQzZVNjdSRVdsdGFmZVNGMGZSNEVHbFZETVNyL3M4ajNR?= =?utf-8?B?aHVvdm5FTXFzYlZwcFlxanhsZk9qTTU5SlB3YjgyOGYrYktwcm5jbW8yZzBh?= =?utf-8?B?eXZwY0laTk1ibVhpdG51eFUwbGUvc1pxbGtlUUdKZUxEOUcxdDZKYVk3bUJm?= =?utf-8?B?a05LMXVOSFc3T1FhWDNGbmVMclhNSENxbWcwV2YyR2xVT3JMVUV4ZW5ReUtT?= =?utf-8?B?aGtEMFJjNnNGK2I0MjRpM09TQkQxeno3b2FOQXR2V29CZ1BoaEtTNmZoQjBP?= =?utf-8?B?cWVMTXZpdEx6MkJQUjJ6bzRWbGZ6SGNBalpyTVdvMGo5bGE2Zis5QVcxdGFS?= =?utf-8?B?aXNpMmJTL2wwMjBYS0x5QUJ4enVEdytDZHFTTjNvWjVYS2gvdDNlWjJsaUc1?= =?utf-8?B?VFQ2NVhTbndCMWlBdGNzaTV5NkpVNmVEQ2xuUGF6ZU1iWTZIVzkrU1VDK212?= =?utf-8?B?MWc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2787312-4ef4-439a-ee90-08de00b7f13f X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:36.4798 (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: XTok1n1PecJS8jPbH8Tn8i/mvQ8B6z0EZkcL5abQ4JWTi9beQR5ykNIm8SDiePwYn7HN9wMQ1EwdkULgVFyiPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Enhance the hmm test driver (lib/test_hmm) with support for THP pages. A new pool of free_folios() has now been added to the dmirror device, which can be allocated when a request for a THP zone device private page is made. Add compound page awareness to the allocation function during normal migration and fault based migration. These routines also copy folio_nr_pages() when moving data between system memory and device memory. args.src and args.dst used to hold migration entries are now dynamically allocated (as they need to hold HPAGE_PMD_NR entries or more). Split and migrate support will be added in future patches in this series. 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 --- include/linux/memremap.h | 12 ++ lib/test_hmm.c | 368 +++++++++++++++++++++++++++++++-------- 2 files changed, 304 insertions(+), 76 deletions(-) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index cd28d1666801..7df4dd037b69 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -177,6 +177,18 @@ static inline bool folio_is_pci_p2pdma(const struct fo= lio *folio) folio->pgmap->type =3D=3D MEMORY_DEVICE_PCI_P2PDMA; } =20 +static inline void *folio_zone_device_data(const struct folio *folio) +{ + VM_WARN_ON_FOLIO(!folio_is_device_private(folio), folio); + return folio->page.zone_device_data; +} + +static inline void folio_set_zone_device_data(struct folio *folio, void *d= ata) +{ + VM_WARN_ON_FOLIO(!folio_is_device_private(folio), folio); + folio->page.zone_device_data =3D data; +} + static inline bool is_pci_p2pdma_page(const struct page *page) { return IS_ENABLED(CONFIG_PCI_P2PDMA) && diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 9dbf265d1036..32d402e80bcc 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -119,6 +119,7 @@ struct dmirror_device { unsigned long calloc; unsigned long cfree; struct page *free_pages; + struct folio *free_folios; spinlock_t lock; /* protects the above */ }; =20 @@ -492,7 +493,7 @@ static int dmirror_write(struct dmirror *dmirror, struc= t hmm_dmirror_cmd *cmd) } =20 static int dmirror_allocate_chunk(struct dmirror_device *mdevice, - struct page **ppage) + struct page **ppage, bool is_large) { struct dmirror_chunk *devmem; struct resource *res =3D NULL; @@ -572,20 +573,45 @@ static int dmirror_allocate_chunk(struct dmirror_devi= ce *mdevice, pfn_first, pfn_last); =20 spin_lock(&mdevice->lock); - for (pfn =3D pfn_first; pfn < pfn_last; pfn++) { + for (pfn =3D pfn_first; pfn < pfn_last; ) { struct page *page =3D pfn_to_page(pfn); =20 + if (is_large && IS_ALIGNED(pfn, HPAGE_PMD_NR) + && (pfn + HPAGE_PMD_NR <=3D pfn_last)) { + page->zone_device_data =3D mdevice->free_folios; + mdevice->free_folios =3D page_folio(page); + pfn +=3D HPAGE_PMD_NR; + continue; + } + page->zone_device_data =3D mdevice->free_pages; mdevice->free_pages =3D page; + pfn++; } + + ret =3D 0; if (ppage) { - *ppage =3D mdevice->free_pages; - mdevice->free_pages =3D (*ppage)->zone_device_data; - mdevice->calloc++; + if (is_large) { + if (!mdevice->free_folios) { + ret =3D -ENOMEM; + goto err_unlock; + } + *ppage =3D folio_page(mdevice->free_folios, 0); + mdevice->free_folios =3D (*ppage)->zone_device_data; + mdevice->calloc +=3D HPAGE_PMD_NR; + } else if (mdevice->free_pages) { + *ppage =3D mdevice->free_pages; + mdevice->free_pages =3D (*ppage)->zone_device_data; + mdevice->calloc++; + } else { + ret =3D -ENOMEM; + goto err_unlock; + } } +err_unlock: spin_unlock(&mdevice->lock); =20 - return 0; + return ret; =20 err_release: mutex_unlock(&mdevice->devmem_lock); @@ -598,10 +624,13 @@ static int dmirror_allocate_chunk(struct dmirror_devi= ce *mdevice, return ret; } =20 -static struct page *dmirror_devmem_alloc_page(struct dmirror_device *mdevi= ce) +static struct page *dmirror_devmem_alloc_page(struct dmirror *dmirror, + bool is_large) { struct page *dpage =3D NULL; struct page *rpage =3D NULL; + unsigned int order =3D is_large ? HPAGE_PMD_ORDER : 0; + struct dmirror_device *mdevice =3D dmirror->mdevice; =20 /* * For ZONE_DEVICE private type, this is a fake device so we allocate @@ -610,49 +639,55 @@ static struct page *dmirror_devmem_alloc_page(struct = dmirror_device *mdevice) * data and ignore rpage. */ if (dmirror_is_private_zone(mdevice)) { - rpage =3D alloc_page(GFP_HIGHUSER); + rpage =3D folio_page(folio_alloc(GFP_HIGHUSER, order), 0); if (!rpage) return NULL; } spin_lock(&mdevice->lock); =20 - if (mdevice->free_pages) { + if (is_large && mdevice->free_folios) { + dpage =3D folio_page(mdevice->free_folios, 0); + mdevice->free_folios =3D dpage->zone_device_data; + mdevice->calloc +=3D 1 << order; + spin_unlock(&mdevice->lock); + } else if (!is_large && mdevice->free_pages) { dpage =3D mdevice->free_pages; mdevice->free_pages =3D dpage->zone_device_data; mdevice->calloc++; spin_unlock(&mdevice->lock); } else { spin_unlock(&mdevice->lock); - if (dmirror_allocate_chunk(mdevice, &dpage)) + if (dmirror_allocate_chunk(mdevice, &dpage, is_large)) goto error; } =20 - zone_device_page_init(dpage, 0); + zone_device_folio_init(page_folio(dpage), order); dpage->zone_device_data =3D rpage; return dpage; =20 error: if (rpage) - __free_page(rpage); + __free_pages(rpage, order); return NULL; } =20 static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args, struct dmirror *dmirror) { - struct dmirror_device *mdevice =3D dmirror->mdevice; const unsigned long *src =3D args->src; unsigned long *dst =3D args->dst; unsigned long addr; =20 - for (addr =3D args->start; addr < args->end; addr +=3D PAGE_SIZE, - src++, dst++) { + for (addr =3D args->start; addr < args->end; ) { struct page *spage; struct page *dpage; struct page *rpage; + bool is_large =3D *src & MIGRATE_PFN_COMPOUND; + int write =3D (*src & MIGRATE_PFN_WRITE) ? MIGRATE_PFN_WRITE : 0; + unsigned long nr =3D 1; =20 if (!(*src & MIGRATE_PFN_MIGRATE)) - continue; + goto next; =20 /* * Note that spage might be NULL which is OK since it is an @@ -662,17 +697,45 @@ static void dmirror_migrate_alloc_and_copy(struct mig= rate_vma *args, if (WARN(spage && is_zone_device_page(spage), "page already in device spage pfn: 0x%lx\n", page_to_pfn(spage))) + goto next; + + dpage =3D dmirror_devmem_alloc_page(dmirror, is_large); + if (!dpage) { + struct folio *folio; + unsigned long i; + unsigned long spfn =3D *src >> MIGRATE_PFN_SHIFT; + struct page *src_page; + + if (!is_large) + goto next; + + if (!spage && is_large) { + nr =3D HPAGE_PMD_NR; + } else { + folio =3D page_folio(spage); + nr =3D folio_nr_pages(folio); + } + + for (i =3D 0; i < nr && addr < args->end; i++) { + dpage =3D dmirror_devmem_alloc_page(dmirror, false); + rpage =3D BACKING_PAGE(dpage); + rpage->zone_device_data =3D dmirror; + + *dst =3D migrate_pfn(page_to_pfn(dpage)) | write; + src_page =3D pfn_to_page(spfn + i); + + if (spage) + copy_highpage(rpage, src_page); + else + clear_highpage(rpage); + src++; + dst++; + addr +=3D PAGE_SIZE; + } continue; - - dpage =3D dmirror_devmem_alloc_page(mdevice); - if (!dpage) - continue; + } =20 rpage =3D BACKING_PAGE(dpage); - if (spage) - copy_highpage(rpage, spage); - else - clear_highpage(rpage); =20 /* * Normally, a device would use the page->zone_device_data to @@ -684,10 +747,42 @@ static void dmirror_migrate_alloc_and_copy(struct mig= rate_vma *args, =20 pr_debug("migrating from sys to dev pfn src: 0x%lx pfn dst: 0x%lx\n", page_to_pfn(spage), page_to_pfn(dpage)); - *dst =3D migrate_pfn(page_to_pfn(dpage)); - if ((*src & MIGRATE_PFN_WRITE) || - (!spage && args->vma->vm_flags & VM_WRITE)) - *dst |=3D MIGRATE_PFN_WRITE; + + *dst =3D migrate_pfn(page_to_pfn(dpage)) | write; + + if (is_large) { + int i; + struct folio *folio =3D page_folio(dpage); + *dst |=3D MIGRATE_PFN_COMPOUND; + + if (folio_test_large(folio)) { + for (i =3D 0; i < folio_nr_pages(folio); i++) { + struct page *dst_page =3D + pfn_to_page(page_to_pfn(rpage) + i); + struct page *src_page =3D + pfn_to_page(page_to_pfn(spage) + i); + + if (spage) + copy_highpage(dst_page, src_page); + else + clear_highpage(dst_page); + src++; + dst++; + addr +=3D PAGE_SIZE; + } + continue; + } + } + + if (spage) + copy_highpage(rpage, spage); + else + clear_highpage(rpage); + +next: + src++; + dst++; + addr +=3D PAGE_SIZE; } } =20 @@ -734,14 +829,17 @@ static int dmirror_migrate_finalize_and_map(struct mi= grate_vma *args, const unsigned long *src =3D args->src; const unsigned long *dst =3D args->dst; unsigned long pfn; + const unsigned long start_pfn =3D start >> PAGE_SHIFT; + const unsigned long end_pfn =3D end >> PAGE_SHIFT; =20 /* Map the migrated pages into the device's page tables. */ mutex_lock(&dmirror->mutex); =20 - for (pfn =3D start >> PAGE_SHIFT; pfn < (end >> PAGE_SHIFT); pfn++, - src++, dst++) { + for (pfn =3D start_pfn; pfn < end_pfn; pfn++, src++, dst++) { struct page *dpage; void *entry; + int nr, i; + struct page *rpage; =20 if (!(*src & MIGRATE_PFN_MIGRATE)) continue; @@ -750,13 +848,25 @@ static int dmirror_migrate_finalize_and_map(struct mi= grate_vma *args, if (!dpage) continue; =20 - entry =3D BACKING_PAGE(dpage); - if (*dst & MIGRATE_PFN_WRITE) - entry =3D xa_tag_pointer(entry, DPT_XA_TAG_WRITE); - entry =3D xa_store(&dmirror->pt, pfn, entry, GFP_ATOMIC); - if (xa_is_err(entry)) { - mutex_unlock(&dmirror->mutex); - return xa_err(entry); + if (*dst & MIGRATE_PFN_COMPOUND) + nr =3D folio_nr_pages(page_folio(dpage)); + else + nr =3D 1; + + WARN_ON_ONCE(end_pfn < start_pfn + nr); + + rpage =3D BACKING_PAGE(dpage); + VM_WARN_ON(folio_nr_pages(page_folio(rpage)) !=3D nr); + + for (i =3D 0; i < nr; i++) { + entry =3D folio_page(page_folio(rpage), i); + if (*dst & MIGRATE_PFN_WRITE) + entry =3D xa_tag_pointer(entry, DPT_XA_TAG_WRITE); + entry =3D xa_store(&dmirror->pt, pfn + i, entry, GFP_ATOMIC); + if (xa_is_err(entry)) { + mutex_unlock(&dmirror->mutex); + return xa_err(entry); + } } } =20 @@ -829,31 +939,66 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy= (struct migrate_vma *args, unsigned long start =3D args->start; unsigned long end =3D args->end; unsigned long addr; + unsigned int order =3D 0; + int i; =20 - for (addr =3D start; addr < end; addr +=3D PAGE_SIZE, - src++, dst++) { + for (addr =3D start; addr < end; ) { struct page *dpage, *spage; =20 spage =3D migrate_pfn_to_page(*src); - if (!spage || !(*src & MIGRATE_PFN_MIGRATE)) - continue; + if (!spage || !(*src & MIGRATE_PFN_MIGRATE)) { + addr +=3D PAGE_SIZE; + goto next; + } =20 if (WARN_ON(!is_device_private_page(spage) && - !is_device_coherent_page(spage))) - continue; + !is_device_coherent_page(spage))) { + addr +=3D PAGE_SIZE; + goto next; + } + spage =3D BACKING_PAGE(spage); - dpage =3D alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); - if (!dpage) - continue; - pr_debug("migrating from dev to sys pfn src: 0x%lx pfn dst: 0x%lx\n", - page_to_pfn(spage), page_to_pfn(dpage)); + order =3D folio_order(page_folio(spage)); =20 + if (order) + dpage =3D folio_page(vma_alloc_folio(GFP_HIGHUSER_MOVABLE, + order, args->vma, addr), 0); + else + dpage =3D alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); + + /* Try with smaller pages if large allocation fails */ + if (!dpage && order) { + dpage =3D alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); + if (!dpage) + return VM_FAULT_OOM; + order =3D 0; + } + + pr_debug("migrating from sys to dev pfn src: 0x%lx pfn dst: 0x%lx\n", + page_to_pfn(spage), page_to_pfn(dpage)); lock_page(dpage); xa_erase(&dmirror->pt, addr >> PAGE_SHIFT); copy_highpage(dpage, spage); *dst =3D migrate_pfn(page_to_pfn(dpage)); if (*src & MIGRATE_PFN_WRITE) *dst |=3D MIGRATE_PFN_WRITE; + if (order) + *dst |=3D MIGRATE_PFN_COMPOUND; + + for (i =3D 0; i < (1 << order); i++) { + struct page *src_page; + struct page *dst_page; + + src_page =3D pfn_to_page(page_to_pfn(spage) + i); + dst_page =3D pfn_to_page(page_to_pfn(dpage) + i); + + xa_erase(&dmirror->pt, addr >> PAGE_SHIFT); + copy_highpage(dst_page, src_page); + } +next: + addr +=3D PAGE_SIZE << order; + src +=3D 1 << order; + dst +=3D 1 << order; } return 0; } @@ -879,11 +1024,14 @@ static int dmirror_migrate_to_system(struct dmirror = *dmirror, unsigned long size =3D cmd->npages << PAGE_SHIFT; struct mm_struct *mm =3D dmirror->notifier.mm; struct vm_area_struct *vma; - unsigned long src_pfns[32] =3D { 0 }; - unsigned long dst_pfns[32] =3D { 0 }; struct migrate_vma args =3D { 0 }; unsigned long next; int ret; + unsigned long *src_pfns; + unsigned long *dst_pfns; + + src_pfns =3D kvcalloc(PTRS_PER_PTE, sizeof(*src_pfns), GFP_KERNEL | __GFP= _NOFAIL); + dst_pfns =3D kvcalloc(PTRS_PER_PTE, sizeof(*dst_pfns), GFP_KERNEL | __GFP= _NOFAIL); =20 start =3D cmd->addr; end =3D start + size; @@ -902,7 +1050,7 @@ static int dmirror_migrate_to_system(struct dmirror *d= mirror, ret =3D -EINVAL; goto out; } - next =3D min(end, addr + (ARRAY_SIZE(src_pfns) << PAGE_SHIFT)); + next =3D min(end, addr + (PTRS_PER_PTE << PAGE_SHIFT)); if (next > vma->vm_end) next =3D vma->vm_end; =20 @@ -912,7 +1060,7 @@ static int dmirror_migrate_to_system(struct dmirror *d= mirror, args.start =3D addr; args.end =3D next; args.pgmap_owner =3D dmirror->mdevice; - args.flags =3D dmirror_select_device(dmirror); + args.flags =3D dmirror_select_device(dmirror) | MIGRATE_VMA_SELECT_COMPO= UND; =20 ret =3D migrate_vma_setup(&args); if (ret) @@ -928,6 +1076,8 @@ static int dmirror_migrate_to_system(struct dmirror *d= mirror, out: mmap_read_unlock(mm); mmput(mm); + kvfree(src_pfns); + kvfree(dst_pfns); =20 return ret; } @@ -939,12 +1089,12 @@ static int dmirror_migrate_to_device(struct dmirror = *dmirror, unsigned long size =3D cmd->npages << PAGE_SHIFT; struct mm_struct *mm =3D dmirror->notifier.mm; struct vm_area_struct *vma; - unsigned long src_pfns[32] =3D { 0 }; - unsigned long dst_pfns[32] =3D { 0 }; struct dmirror_bounce bounce; struct migrate_vma args =3D { 0 }; unsigned long next; int ret; + unsigned long *src_pfns =3D NULL; + unsigned long *dst_pfns =3D NULL; =20 start =3D cmd->addr; end =3D start + size; @@ -955,6 +1105,18 @@ static int dmirror_migrate_to_device(struct dmirror *= dmirror, if (!mmget_not_zero(mm)) return -EINVAL; =20 + ret =3D -ENOMEM; + src_pfns =3D kvcalloc(PTRS_PER_PTE, sizeof(*src_pfns), + GFP_KERNEL | __GFP_NOFAIL); + if (!src_pfns) + goto free_mem; + + dst_pfns =3D kvcalloc(PTRS_PER_PTE, sizeof(*dst_pfns), + GFP_KERNEL | __GFP_NOFAIL); + if (!dst_pfns) + goto free_mem; + + ret =3D 0; mmap_read_lock(mm); for (addr =3D start; addr < end; addr =3D next) { vma =3D vma_lookup(mm, addr); @@ -962,7 +1124,7 @@ static int dmirror_migrate_to_device(struct dmirror *d= mirror, ret =3D -EINVAL; goto out; } - next =3D min(end, addr + (ARRAY_SIZE(src_pfns) << PAGE_SHIFT)); + next =3D min(end, addr + (PTRS_PER_PTE << PAGE_SHIFT)); if (next > vma->vm_end) next =3D vma->vm_end; =20 @@ -972,7 +1134,8 @@ static int dmirror_migrate_to_device(struct dmirror *d= mirror, args.start =3D addr; args.end =3D next; args.pgmap_owner =3D dmirror->mdevice; - args.flags =3D MIGRATE_VMA_SELECT_SYSTEM; + args.flags =3D MIGRATE_VMA_SELECT_SYSTEM | + MIGRATE_VMA_SELECT_COMPOUND; ret =3D migrate_vma_setup(&args); if (ret) goto out; @@ -992,7 +1155,7 @@ static int dmirror_migrate_to_device(struct dmirror *d= mirror, */ ret =3D dmirror_bounce_init(&bounce, start, size); if (ret) - return ret; + goto free_mem; mutex_lock(&dmirror->mutex); ret =3D dmirror_do_read(dmirror, start, end, &bounce); mutex_unlock(&dmirror->mutex); @@ -1003,11 +1166,14 @@ static int dmirror_migrate_to_device(struct dmirror= *dmirror, } cmd->cpages =3D bounce.cpages; dmirror_bounce_fini(&bounce); - return ret; + goto free_mem; =20 out: mmap_read_unlock(mm); mmput(mm); +free_mem: + kfree(src_pfns); + kfree(dst_pfns); return ret; } =20 @@ -1200,6 +1366,7 @@ static void dmirror_device_evict_chunk(struct dmirror= _chunk *chunk) unsigned long i; unsigned long *src_pfns; unsigned long *dst_pfns; + unsigned int order =3D 0; =20 src_pfns =3D kvcalloc(npages, sizeof(*src_pfns), GFP_KERNEL | __GFP_NOFAI= L); dst_pfns =3D kvcalloc(npages, sizeof(*dst_pfns), GFP_KERNEL | __GFP_NOFAI= L); @@ -1215,13 +1382,25 @@ static void dmirror_device_evict_chunk(struct dmirr= or_chunk *chunk) if (WARN_ON(!is_device_private_page(spage) && !is_device_coherent_page(spage))) continue; + + order =3D folio_order(page_folio(spage)); spage =3D BACKING_PAGE(spage); - dpage =3D alloc_page(GFP_HIGHUSER_MOVABLE | __GFP_NOFAIL); + if (src_pfns[i] & MIGRATE_PFN_COMPOUND) { + dpage =3D folio_page(folio_alloc(GFP_HIGHUSER_MOVABLE, + order), 0); + } else { + dpage =3D alloc_page(GFP_HIGHUSER_MOVABLE | __GFP_NOFAIL); + order =3D 0; + } + + /* TODO Support splitting here */ lock_page(dpage); - copy_highpage(dpage, spage); dst_pfns[i] =3D migrate_pfn(page_to_pfn(dpage)); if (src_pfns[i] & MIGRATE_PFN_WRITE) dst_pfns[i] |=3D MIGRATE_PFN_WRITE; + if (order) + dst_pfns[i] |=3D MIGRATE_PFN_COMPOUND; + folio_copy(page_folio(dpage), page_folio(spage)); } migrate_device_pages(src_pfns, dst_pfns, npages); migrate_device_finalize(src_pfns, dst_pfns, npages); @@ -1234,7 +1413,12 @@ static void dmirror_remove_free_pages(struct dmirror= _chunk *devmem) { struct dmirror_device *mdevice =3D devmem->mdevice; struct page *page; + struct folio *folio; + =20 + for (folio =3D mdevice->free_folios; folio; folio =3D folio_zone_device_d= ata(folio)) + if (dmirror_page_to_chunk(folio_page(folio, 0)) =3D=3D devmem) + mdevice->free_folios =3D folio_zone_device_data(folio); for (page =3D mdevice->free_pages; page; page =3D page->zone_device_data) if (dmirror_page_to_chunk(page) =3D=3D devmem) mdevice->free_pages =3D page->zone_device_data; @@ -1265,6 +1449,7 @@ static void dmirror_device_remove_chunks(struct dmirr= or_device *mdevice) mdevice->devmem_count =3D 0; mdevice->devmem_capacity =3D 0; mdevice->free_pages =3D NULL; + mdevice->free_folios =3D NULL; kfree(mdevice->devmem_chunks); mdevice->devmem_chunks =3D NULL; } @@ -1379,18 +1564,30 @@ static void dmirror_devmem_free(struct folio *folio) struct page *page =3D &folio->page; struct page *rpage =3D BACKING_PAGE(page); struct dmirror_device *mdevice; + struct folio *rfolio =3D page_folio(rpage); + unsigned int order =3D folio_order(rfolio); =20 - if (rpage !=3D page) - __free_page(rpage); + if (rpage !=3D page) { + if (order) + __free_pages(rpage, order); + else + __free_page(rpage); + rpage =3D NULL; + } =20 mdevice =3D dmirror_page_to_device(page); spin_lock(&mdevice->lock); =20 /* Return page to our allocator if not freeing the chunk */ if (!dmirror_page_to_chunk(page)->remove) { - mdevice->cfree++; - page->zone_device_data =3D mdevice->free_pages; - mdevice->free_pages =3D page; + mdevice->cfree +=3D 1 << order; + if (order) { + page->zone_device_data =3D mdevice->free_folios; + mdevice->free_folios =3D page_folio(page); + } else { + page->zone_device_data =3D mdevice->free_pages; + mdevice->free_pages =3D page; + } } spin_unlock(&mdevice->lock); } @@ -1398,36 +1595,52 @@ static void dmirror_devmem_free(struct folio *folio) static vm_fault_t dmirror_devmem_fault(struct vm_fault *vmf) { struct migrate_vma args =3D { 0 }; - unsigned long src_pfns =3D 0; - unsigned long dst_pfns =3D 0; struct page *rpage; struct dmirror *dmirror; - vm_fault_t ret; + vm_fault_t ret =3D 0; + unsigned int order, nr; =20 /* * Normally, a device would use the page->zone_device_data to point to * the mirror but here we use it to hold the page for the simulated * device memory and that page holds the pointer to the mirror. */ - rpage =3D vmf->page->zone_device_data; + rpage =3D folio_zone_device_data(page_folio(vmf->page)); dmirror =3D rpage->zone_device_data; =20 /* FIXME demonstrate how we can adjust migrate range */ + order =3D folio_order(page_folio(vmf->page)); + nr =3D 1 << order; + + /* + * Consider a per-cpu cache of src and dst pfns, but with + * large number of cpus that might not scale well. + */ + args.start =3D ALIGN_DOWN(vmf->address, (PAGE_SIZE << order)); args.vma =3D vmf->vma; - args.start =3D vmf->address; - args.end =3D args.start + PAGE_SIZE; - args.src =3D &src_pfns; - args.dst =3D &dst_pfns; + args.end =3D args.start + (PAGE_SIZE << order); + + nr =3D (args.end - args.start) >> PAGE_SHIFT; + args.src =3D kcalloc(nr, sizeof(unsigned long), GFP_KERNEL); + args.dst =3D kcalloc(nr, sizeof(unsigned long), GFP_KERNEL); args.pgmap_owner =3D dmirror->mdevice; args.flags =3D dmirror_select_device(dmirror); args.fault_page =3D vmf->page; =20 + if (!args.src || !args.dst) { + ret =3D VM_FAULT_OOM; + goto err; + } + + if (order) + args.flags |=3D MIGRATE_VMA_SELECT_COMPOUND; + if (migrate_vma_setup(&args)) return VM_FAULT_SIGBUS; =20 ret =3D dmirror_devmem_fault_alloc_and_copy(&args, dmirror); if (ret) - return ret; + goto err; migrate_vma_pages(&args); /* * No device finalize step is needed since @@ -1435,7 +1648,10 @@ static vm_fault_t dmirror_devmem_fault(struct vm_fau= lt *vmf) * invalidated the device page table. */ migrate_vma_finalize(&args); - return 0; +err: + kfree(args.src); + kfree(args.dst); + return ret; } =20 static const struct dev_pagemap_ops dmirror_devmem_ops =3D { @@ -1466,7 +1682,7 @@ static int dmirror_device_init(struct dmirror_device = *mdevice, int id) return ret; =20 /* Build a list of free ZONE_DEVICE struct pages */ - return dmirror_allocate_chunk(mdevice, NULL); + return dmirror_allocate_chunk(mdevice, NULL, false); } =20 static void dmirror_device_remove(struct dmirror_device *mdevice) --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 CD83B270553 for ; Wed, 1 Oct 2025 06:58:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301940; cv=fail; b=dxxW18xhyBtBif6L+F/MmvyCPEIyyCCqEh+acEcHk+DnUsnspIYRBQQGMDsA0HfT5vwTcNRI+9piNG0b2WorALccnaqWfzEMEOgWacdS5WqEIQsOzvwA1UnsGuDYx7qDsynLle4x+D1PiBfBckHJ7e0oSPl51nM4/QBLzZfk5Gg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301940; c=relaxed/simple; bh=LpB0StoAIUsckORRTkAz4HQ732s1b0xRapXErNB8vk8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=u23nf/nq+CtzU6amNJtqXn3SI6/oCS5PZ1KNLEe7ysaEDpXi7uJQIKucwTq8ukd9c0y4hXuONuhyZu7cZHrZuhwX4JwikHl5Wt/SqZIm5RlhS7d+BUayK2ed3dcHxxRZsfr2vwjhxNowTOfWrJRNBZ8reLNZ4IUBCFZzXOd7O0M= 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=Nz2zgYgy; arc=fail smtp.client-ip=52.101.193.20 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="Nz2zgYgy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tIhwR41HcP8J7QT08CrLXD4iPTw3o4kcCjajelJPsjR7r2yNocIQpWRPK2tsq+j/2i0fEX69g5neJgcJe/cj2whe+yMrv1xc/V+s+PfnN+ykf6+m2kQemEg6sM4AaqNmj/ANyMGwovAwRDp+Wz3eGkH6jD6QTZHMzlFiM6cFIedb6Huddok+p2MG2PVWsChypwt2lhEYgZZZMccM6qQ9qix/zgBUXOWFKLIjl8q8Azuof4m4ZfWMGvnBfQE90hkIvlZ8sp26mJQvB5+Hyipl180z27CuTfnHta9MfpBBz1xxzJ841anqQhAjOhKe6HYx0EfDBH/csZWDLngI6cbirw== 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=9T5qJA1XYVBPoFNxXYiiw31s4oulVwBVgK40oU3nOH0=; b=pg2jADA6vkvgiJqZ5REsiFmcTaVNP8ns0llZSjGxoerqawmyFW9ZlfNR9oSrDCadBJecA5gcRhtyuWE8gYkcn5NJvSo5j8FZ1FmCZ5h5IX01WlCLQMUgwRocSGiS+zeJvE61FPWPK3kiJzpRGVx5TcFYfNpgdyCvYZdC/N/nYo989EcoZXiOmaRQh3zEtpq0zyvRI39M2EWagTmaxMFEOA2W1ln4P8ZMeohv+KkPbU3C+X6fJsXHG+qbg3Q71jKD+svqQTY8IyNhnUDlALWuxJlSgEwBjXg286gZ+O7zm6IXfF+BDPT6hhEGh1zgQI1K4gOOgForGuQGGpUx6BaDdA== 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=9T5qJA1XYVBPoFNxXYiiw31s4oulVwBVgK40oU3nOH0=; b=Nz2zgYgyHyFKLJ2frZ82GHk0vYJrrYAQce5PxkmpgDerK5JlYWBT2+k3g+46CE4ynputwvHH17LUgQW2RXGr8A7AlMo1Dv5cgFQOeHRZzC4K79ZFx7QvZSAbdIYiGOgZGugCpCk5mbieyXi67+DLqLYvvbbatp+ThJA0VZgBFipbhTJ/6UsRf9r6p2Tf1T4j2c8TR7jEAsuxtTQ9x3Vo0k3LEKalV6DUpMW+Fk9XXfONXpgPkf8VaLaSz9bQs3sLMzm7g94S+gi+/nWPMKYnN6Ph8dpWJdCAZsB0cPkUnYztKAMw5ouzD1x/ewpTy1ZLP+k/gCH987QNc3gpLzFJTA== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:41 +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.9160.015; Wed, 1 Oct 2025 06:58:41 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 10/16] mm/memremap: add driver callback support for folio splitting Date: Wed, 1 Oct 2025 16:57:01 +1000 Message-ID: <20251001065707.920170-11-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0053.namprd05.prod.outlook.com (2603:10b6:8:2f::34) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bb4da98-0713-46d5-7696-08de00b7f463 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WExrTmVsaUo1Q01vd0grbEFJdVZVZ1I1ZDdXTmNiT04vMGtDSGVpSHRsYXBh?= =?utf-8?B?K3B5aUJRKzcrWGtRWDMra0wxVCswM2JEQnFwVlA3TGdGQXgvRzNpT1Z5OXcx?= =?utf-8?B?RnlBTWtGaEFpR0hlODZIZ3ZsRWpsalNOODIzSFlzWVJiZ0RKTUlxNHJ3MEx0?= =?utf-8?B?S3hUWDFFWExZVEN3dDcrYWRSc3pscDFteVJtRnNQNUZlWHhPaGJ4YkN1ay93?= =?utf-8?B?eGlpTEhyMzhIemE1UGRlcVpUc01aaWZvOS8xNis4VE5NYmxjY2Q1QTU0U0NL?= =?utf-8?B?U05FekM0aklDR1N6UW1oQWg5dkVkS3dTMDFGT1N4d2N3YUgva3ROek5hNjc4?= =?utf-8?B?NzdpeTJtTmZORUlTY2ZmYkJFZnVNNjQvVDVNNlFmWmduVWR6UWUvOEZiL0pI?= =?utf-8?B?K0xFank2YXB2SEcyVi9PSjVNZFlpUDNZS0dpK3BaOU8zem8rNDI0MzNxQnJH?= =?utf-8?B?TWZhQjR6aXZqVkUwdTRvQVBpZTlFZ0pVQjBPWGN3dk8yV0l6a3RVaWxoWmlH?= =?utf-8?B?ekhmMkxRS1NKVEJ6cHl4YzdJeFNmSWZ5M2oyYXN6S2dqT1p4RTJYaFpkS0lR?= =?utf-8?B?bmVGWFNBK3hIZFB1NzliOUIwWXRHMkhESEZKbTRHVWtFY0JqeEVQeHFiREl6?= =?utf-8?B?YndRVHkybVo1eTNqbUpPY2pLT0cyQ1hCRjFIUnJDY2NJbGE0dlkraER6STRM?= =?utf-8?B?MWVMaTV3NUpYbWxEbmUwRkgvVzRUb3hPZVRUVnBxV2J6VTVDN0pWWlpzbDFy?= =?utf-8?B?eGpXZ3BXeXRJRkVFQythSTI2YzFjTVhYMzFMNnZhelp6TFZ4OVM2VkVoYjU3?= =?utf-8?B?MmQrRWswdzZMYlVwS09IbUVIM05zNHJGd09QdExCSytkZXoyWWNKRXlVYTBY?= =?utf-8?B?cWJIM0lRbGQ5UFNDN1I2QVl2MW9Yc3hUS05KdkVDakZldmRLVVRKZEJyZi9l?= =?utf-8?B?WDlSUlFzU3ZaWndlWnRyKy9sMHhLSHc4bEFISkV6RGdaeURUU2dKTXNiMmJ3?= =?utf-8?B?d0U3ZlZ6UWh5dDlLRjVoS2VoTjJqeTUyNm5BbEhnRWp0b2k4RzVXV2FVN29r?= =?utf-8?B?N2U3ZHFGSFliUmQ3dVJJaFJtLzNvWDVuL1dMRHE4dG9UYUU4YVNrRTFYNE9Q?= =?utf-8?B?TnBJRHUvWndYVUYvTm5NWGpiSGRnVTJtQ2VpeGRRN2d3ZzJoRTJybDJSajNF?= =?utf-8?B?MjgvUndTTW9SdE5mR2tJQnZZSjR4LzlPQkFOc0t4cUVGbG1GYzdaTStoaTdB?= =?utf-8?B?VWVuQjhIUTVkdjNkNFlHMFNnaVFDM0JJVkNNdzFGNEc0ajhKSHZMZGV0K0JT?= =?utf-8?B?WUgrbFdOK3Zmdkw2bE84K2ZRRzJ1TEIyN05hOEViYkk2MnhlMDVXNHBkWXFJ?= =?utf-8?B?ZUl3MU1LOHdIb0ZEVjd0UjRJRExKR2pVYWR3emlpcFlaZGQ5cXV2SjBjeHBz?= =?utf-8?B?VzFqZmZ1OFJNYjdHdjBvN2x0cFhZaDYwdHh3QUZnNG5pWlpobVFWRFVUbDNN?= =?utf-8?B?S29tWlVUYVZaOTRJMnJlUUlCNTVWTkF6TnZoYXF2UExSZ1VxQlVBUWZ2RVdu?= =?utf-8?B?WlBJSFFJNTlaeHRRck04QlllbitzWUlyNlkxYjBoYUd6eVJ2bjZNTzFSSk16?= =?utf-8?B?anpzalZySWNoNTgwa3k3UkFYQmlEMS96VEJUa2J5TW8xSUNqdXV1Z2JMMjUz?= =?utf-8?B?dmg4QWMvdU1EQTZyMzRvWDZXdHFKMlErUVZlY3FRVi9ldEpwREpnMDZRcVJN?= =?utf-8?B?ZXVLSC8xSldxTTJZZFArTHhlSFNEbEkra0xaVmdZYTdYaHZUOUdHNjF5dUxP?= =?utf-8?B?VWZjMThQaGZBa09aNnVyMUlScG5WTE5rTHdVNE1uNVRtVFhHazMyRFlUdEtX?= =?utf-8?B?UUViV09ZQjEyUlMxb2wzcnhFSDZlai9DNmNwZ3YwN0svWnAwY25aMGZlNlo1?= =?utf-8?Q?86wfE/aNxPSWkI94kWptYO9bPZ9jUoUW?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?K0lDamVuTHQ2MDlRTmgreGRFTGpxNS93ZHRvUG9QdWF1T2dBTnd2V2tZZ2tK?= =?utf-8?B?VGZNaHdzdmJ5VFBvREZZdVRaRFZ6RGdWV0EwNWhDZ2xyNXA5aVlXczIxRHRz?= =?utf-8?B?b1o2SEhWanltLzZkMG9FdGJIcmloaTVRWHBWRG4rZ2RzMmZ1TUE0dEIyMjNW?= =?utf-8?B?REtSdnhOeVpIZkpWeGtIekZzVkdmeWZKckVld0NiSjAvZE9yZVE0cVFIRGRh?= =?utf-8?B?VktzMmdJOFA4a3hrU1hJMnlqdU84NTRaTkRKTFg1Q01NeGFyNHpnM0x1OTFk?= =?utf-8?B?Zy9oM1RIMHF5dGJSRTBDYWo4U3pDS3NLWFkybnhaZ2NtSjlKZUZjT2ZEQVlS?= =?utf-8?B?azlxdzlRcnFWaERnS1FHZDJEeGk5QzF6RXJCOXVKNm5UNkJkeHE2cnNsRGRn?= =?utf-8?B?Tk5FcjNnLytEb2R1cVVCV09RbEcxMjQ5dUxWMHZUanUrZTFoWFc4N3NyZUZH?= =?utf-8?B?eEZpNWNuMjNsZWJqSDB5dEl0L3RmSFdsd1gveVVSZVNNY1JWY0VQSzNNTjNO?= =?utf-8?B?eHcxbVEwSVQ0dUIwUW91QzVHTyt5Q1kwOUJnTDJVeWpsdUQ2Z09yNDkycjJL?= =?utf-8?B?OEdWeWg4UDFPOGxMMHMrTWQrMzV3bTZHNmVQdTBXd0o2TFhUcVBzL2NGZ3BF?= =?utf-8?B?ZUJEMkJSNjlLVENoUjljT1lMQW5aY0d3TVVPSnBmNVQ1a3IxeVg5bm1BZldG?= =?utf-8?B?bUloTUtQWS9rbkFrRGFnWlZ5UHYrY1RNOGtodnhSQ2JRRzhXOXd1VG10alZJ?= =?utf-8?B?eFNMRGx6enpTY0svbC9aS1F3STlkQnBtYmdmbjhQOVdTQVJkaTN6Q0RyT2FG?= =?utf-8?B?OXp6aFNnQm1qemlxNkw4bTRlVjE4Skw4UzJSOUZZZ0hmTlF5ZmNSSWpGUWta?= =?utf-8?B?WGF4MEdQbGRUemJmYmQySWlrWkwxYklNMXlXWXAyKzFQRXRnR0VzMi9vN05F?= =?utf-8?B?TERYcFU3bzRZcE1tWDBjbkMwT1hCYkh5S0hjUDBBN2l6YXN2VFp5Y2JuWjVo?= =?utf-8?B?c3Z5REdmN0UwS1RrUXQzbDZhcFB5Rng5Y25sT3NqVDlmdWgwYURKUHd3SEI2?= =?utf-8?B?TEhTZzVUTWpDNCtPWjhRRytWUy8xVld2dGdxcVVKZDd3bGFDNnVya2lZSXlF?= =?utf-8?B?R1hqTGpFb0FlSHA1QjJuOG9ucmtzZSs3RmpvdXpCTURra0laaUtkNU9MOEhV?= =?utf-8?B?VGRVYVl4UmZsallnY2V6WnhROWx6Z2UrbUdNTnI2WlhHT00rSzFONGFySkVC?= =?utf-8?B?YU5HbExMZUYzbzhCbElyNS81RnBkZzRaNEt2U2htU09EYWRyaVlvUWIrMElI?= =?utf-8?B?ZHpNclNuVVMyVkdOUUtnUXRucVNpKzlBalBBQkR6RCtOYVJRMmJhU1RDTUxT?= =?utf-8?B?aG80MkNEck1VUVVNWnVKNkdxclVwWFArZnRRb1NCRTBSZnl2ZWJPMWROT0xz?= =?utf-8?B?Z1lKK3dpSVE1dThVVTBidmJ6RUwwQ1U1cHNVY3FyV0NLeEtBdmNhbXZicHF0?= =?utf-8?B?RTE3ak5wVHRtNG80NnBFbWlxeS9SaWNFTXZOMjgwRXdIaXNlb2g0Zm9QYmVn?= =?utf-8?B?WWl5SkFYS2k5K2RsTm11WGJhY05vTDBLY1dnakplYktMU3F5ZUJDanMraGdl?= =?utf-8?B?engrQUI0NXVVRHJ0UTVQcEl2RmV6QnN4RVNLeGJZQ0hEaXFJUnJpR0NPM0J2?= =?utf-8?B?RXhKUmVpVWQvVjVsMUhVcXlIandQTTVHVnRyZjREVDdyQ0UyVm5BQStGNHMr?= =?utf-8?B?Uzc4c3ZuREFEYkIvaE5aYjV2UU9xWGdhSW5xaG5BM0I3ZGxKZGh3R3BzbHNt?= =?utf-8?B?Q3Y3MXJkRVRERXQ3UTlpUzJxTW40VFpsYkJDbjdjUGFvekh2T05hTC9JekdN?= =?utf-8?B?aFhVMEgwSUQ0bENNZGIrcU41cEUzejdRUGYvUXArQ0ZSQXpLSkRiZDVVMzVU?= =?utf-8?B?MXJwbCtzdENocnNhV1pxUUFIWktCNm0xTE16allpdnUvbnA4QlZ1TXFmY0h3?= =?utf-8?B?Lzdtc3BDVU5jKzBScndRYnBJTUt6RkVFcGp1MHpSWElTTnkzYitjOFZ6RTRk?= =?utf-8?B?L2xLVlRIVXVydzgxc3I3dlkrSVJpZ1p0aEwvTVFQWlpZd0pxekhpVW50djY0?= =?utf-8?B?UzR0bHZOMGlicjZ4cVprNWxJd1J3ZDREOVhpWS9rcEV6djUzS1Y0N1FhSFM3?= =?utf-8?B?MVE9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bb4da98-0713-46d5-7696-08de00b7f463 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:41.5356 (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: 66w4XQuX77N9MxPFh03HEcV9Ofgv30/1nx+YqAnmMQDlIwdfTZMWIUUSX13aU2fVn+RWpN0WsOA5/Tr9DMbqLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 When a zone device page is split (via huge pmd folio split). The driver callback for folio_split is invoked to let the device driver know that the folio size has been split into a smaller order. Provide a default implementation for drivers that do not provide this callback that copies the pgmap and mapping fields for the split folios. Update the HMM test driver to handle the split. 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 --- include/linux/memremap.h | 29 +++++++++++++++++++++++++++++ lib/test_hmm.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 7df4dd037b69..aca2b16d6889 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -100,6 +100,13 @@ struct dev_pagemap_ops { */ int (*memory_failure)(struct dev_pagemap *pgmap, unsigned long pfn, unsigned long nr_pages, int mf_flags); + + /* + * Used for private (un-addressable) device memory only. + * This callback is used when a folio is split into + * a smaller folio + */ + void (*folio_split)(struct folio *head, struct folio *tail); }; =20 #define PGMAP_ALTMAP_VALID (1 << 0) @@ -235,6 +242,23 @@ static inline void zone_device_folio_init(struct folio= *folio, unsigned int orde folio_set_large_rmappable(folio); } =20 +static inline void zone_device_private_split_cb(struct folio *original_fol= io, + struct folio *new_folio) +{ + if (folio_is_device_private(original_folio)) { + if (!original_folio->pgmap->ops->folio_split) { + if (new_folio) { + new_folio->pgmap =3D original_folio->pgmap; + new_folio->page.mapping =3D + original_folio->page.mapping; + } + } else { + original_folio->pgmap->ops->folio_split(original_folio, + new_folio); + } + } +} + #else static inline void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) @@ -268,6 +292,11 @@ static inline unsigned long memremap_compat_align(void) { return PAGE_SIZE; } + +static inline void zone_device_private_split_cb(struct folio *original_fol= io, + struct folio *new_folio) +{ +} #endif /* CONFIG_ZONE_DEVICE */ =20 static inline void put_dev_pagemap(struct dev_pagemap *pgmap) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 32d402e80bcc..46fa9e200db8 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -1654,9 +1654,44 @@ static vm_fault_t dmirror_devmem_fault(struct vm_fau= lt *vmf) return ret; } =20 +static void dmirror_devmem_folio_split(struct folio *head, struct folio *t= ail) +{ + struct page *rpage =3D BACKING_PAGE(folio_page(head, 0)); + struct page *rpage_tail; + struct folio *rfolio; + unsigned long offset =3D 0; + + if (!rpage) { + tail->page.zone_device_data =3D NULL; + return; + } + + rfolio =3D page_folio(rpage); + + if (tail =3D=3D NULL) { + folio_reset_order(rfolio); + rfolio->mapping =3D NULL; + folio_set_count(rfolio, 1); + return; + } + + offset =3D folio_pfn(tail) - folio_pfn(head); + + rpage_tail =3D folio_page(rfolio, offset); + tail->page.zone_device_data =3D rpage_tail; + rpage_tail->zone_device_data =3D rpage->zone_device_data; + clear_compound_head(rpage_tail); + rpage_tail->mapping =3D NULL; + + folio_page(tail, 0)->mapping =3D folio_page(head, 0)->mapping; + tail->pgmap =3D head->pgmap; + folio_set_count(page_folio(rpage_tail), 1); +} + static const struct dev_pagemap_ops dmirror_devmem_ops =3D { .folio_free =3D dmirror_devmem_free, .migrate_to_ram =3D dmirror_devmem_fault, + .folio_split =3D dmirror_devmem_folio_split, }; =20 static int dmirror_device_init(struct dmirror_device *mdevice, int id) --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 ABF82273D9F for ; Wed, 1 Oct 2025 06:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301942; cv=fail; b=IcNGUz8SxXuLuR66Uduy45WpMpJUpbLiYQ+KaJ7eRfg+QCl6Dj4MzSA5klFw3hX77Z1iuRoTNAkusKs2xfZbiue59Xq9CPzli6j8xNO93fvyUMbAJwoplNoGCTnNLIzWbOrcJUU4X6SAbmLMlTRCyM1nbU5+WikRaTK8fOhJoHc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301942; c=relaxed/simple; bh=33PYTdElfmOVSxkrQSwpIjtQZCjHBdCauxaQ9vgF9lI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=nMapYm4zknUYVHIB8uBPTVEQi8/DhkX6VJEwZrTDeihfGkuCzQ02O3OgxxBqZd3g0E87BbD1NM2JfylLeqETAwer4oaEeytJC3DHdzmjiGtxCIMAk+Y+1KrXvfRVK161YJS4UDKpqgH7TL2gQCeYHmTk63Jrv7UxwOYfnMl0HA4= 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=WYfBC+Jj; arc=fail smtp.client-ip=52.101.193.20 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="WYfBC+Jj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DbY3a1XS9dW/HxrtHVCba3NReD6teiPi+1QOH0/RPs+G1zv4aZ14bZu+yP1h9qOvGPb8A+cT/xSWOnTmr/RFEVKybwn9DuTSAbg9FCyp98gVyvLb43wAypVqiXrOx6/TrZgZeQblDINGsgIGQqhlO7NUNxN9oGhJtMMmaUU4zt+DfZxZ6cjPT55rt4pGiFfA4e5mBFxpJ8nGChnYnngjgAkMGVuvUm20oq7ELgYts2P6MOYCIJIOqo9iJCua5oJLGP8mQW7rpr4W3r6LAVXB3r9OkL4dUVI9n/+N4wJjrXyvtzJOLAPAf4eZAhNmVMPuNRnxFllJEir7UJU62GahJQ== 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=C0SNmbWmKOtD6qcIGLkPBaaHNri0ZoWVLd0PORGmh0s=; b=G9goat3RDPStVbDJC3zkcwR2TqayDrOKLkYArMBqhvS7Dmb24RbIJVFYaA09aZY9iY3ihOQxMPxWgr9Gq0LDmZybSypXAIRE68kxhfyViBgR1SbZqtKLIOwJiGaaIbS6PA5vnsMGKtVRgskiVDoTMDs5EvYyO9QZg7hh4RgZzsacGdrbbgAZEV2xuu+F7BjAf6U40xi8ZZcFcUFZ52ZDfXTUZl3FAohWxNDVfzG25WMBsxasi8Z9uvwuNS5GAbmauCFQNgCLMgl+Sa2qGv+55RHdl4iyLmYmdvNvcxov8fduI8ha/9tWaBbgfqIo7hzwSat9aV//Gq/SXj+EW75rbQ== 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=C0SNmbWmKOtD6qcIGLkPBaaHNri0ZoWVLd0PORGmh0s=; b=WYfBC+JjK3X3Qzg8w3zvxRmPWY6sM7Mbi0+/a0sbR47FK5mrcC9zkL/PF7I0Deg7FrTi32nTgz751lliOsqTU+1GphKtmrTcj5TknbNoxKUwtq4YDWt0wUoBnHNhi6gCiKEHWiTK8lOV/gHRSRoIg82oVUCOgyiUGzckJ44Y9zJHuFR4Zs3wEo547kCX9FbVqXuejEKVgI0ZVlwmwWaDk/MX4FF4LNEIMQkWGK2htOv9Z5Pqek34g1jUDCOOO0tyPkCkaw0cmwuN5VuKhGLK+YIbmG8i6FfNhHpg2hrB9H/hkrta8LOrvY8HU2gr11jHC0QX5xTWCsjBmCMLJC4PIA== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:45 +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.9160.015; Wed, 1 Oct 2025 06:58:45 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 11/16] mm/migrate_device: add THP splitting during migration Date: Wed, 1 Oct 2025 16:57:02 +1000 Message-ID: <20251001065707.920170-12-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM6PR02CA0146.namprd02.prod.outlook.com (2603:10b6:5:332::13) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: f9a61169-e42d-4441-ddfb-08de00b7f6c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Um9YSmdFdURvMnRSSStzWHhLNXFnZXFCV1pDSzFQMzkxdGNYRDVaSDZGd2No?= =?utf-8?B?OXpYNDQ1Q28yTkY5cjF5d0tVakd1R3hpWHBvOW5kUXpqUDQxWUc0YTNjR1RE?= =?utf-8?B?VXBEaldXUlN4WEJ6MGkvMDBQZFFGRFRxRThZbXRpRWgyRFp4TXhPNS9sMjdz?= =?utf-8?B?Z0NZdWRSL3NRSTExMEZCL0N3ajRJcUZOTlpySVU5VHQ5ckpqYVZwRndDMlVv?= =?utf-8?B?OFA5UGhOQ3gvRVZoaGxqdmVrVmdTV0o0NWlkZmozd1l5c3ZEZHdRcFROZ2pO?= =?utf-8?B?b3F2MEVrS3lVdXJyVmh0SE4xcDJrc2d2NkJlSmJNZDdaMStiZVgvYkFqdnYz?= =?utf-8?B?RGtsM3VaM1pzYWRyeFBLdm9PcEF4MVlYY3VVOVA2QTd2dURUeHZ2TE5WU1cv?= =?utf-8?B?L3pBZ3g2YzIrS2hSN2wvMXlOV3NVTlNtb3ZyTnRtNG5rclBWRDBWOENaaDlo?= =?utf-8?B?RS81UVVnRzRuNVprZXBSRjVjT2Vham43ZjNWTzU4UEV0NVc1UmM0ZDRUM2ZK?= =?utf-8?B?aGgyWjNJZWRleGFjR0lXSmJQdEhLTXhFVGpsVTY2MGx5NnN6WmxxSmprU1p6?= =?utf-8?B?UW10a3hGSnMrWDljZTNrM2lHQlFZaGxqRWpvWnp6RWhBWHJwdUpwNGpCNThM?= =?utf-8?B?Q29mOWJMSi8rVHdRRFVLYnFGemJUeUdTYktTTk12WFNHVS8vQVcrK2V6M1pR?= =?utf-8?B?RDBNQkJKK3RxQmNjbFRwVDBtem1RM3o4aXBibXBJU0tBcWp5TEdYRjY4K2FV?= =?utf-8?B?T2V6eUkzNUMrVUFXZ3FWM0NUTzQ2OFhRMGh6WituZkZOMi9McGVEbEhvUXV1?= =?utf-8?B?OUE2b0U0WjdRaGI5TzVmMWtCNnVuZHJKTzlETzI0K2U0WEFFblcyT1pvNXNO?= =?utf-8?B?YWg2bExZanRJcU83SEhiY0ZEMlFkcFNYVUV6NjJlK0R2YTd0N0ZocXRhSUw3?= =?utf-8?B?ZEdweCtaOHR3ZG4yQUlmZGJJMWlINHpJQS90QjN2citLczExSnFtWmV2N0JT?= =?utf-8?B?WHNlaDErTXdQYjdxSnNxWlpQaU9OM09ZUDMyc0FWZzQvTXlybUNGVGZyekJ2?= =?utf-8?B?R2hNbHdoUE9XVjRWajB0a1BQTUxIY2FSUzVMcGg3ekNxY1BkWUw1emI2S2Jr?= =?utf-8?B?cDJqb29aTjZUdTVWK0tYN1hZb0dlNjRvSE9KMjBxUDROeWtOT3FSaUxnbVdY?= =?utf-8?B?ckc4Zkh1U0k0L0M3dVpscW42MXFaZFFINkFzV1k3Qnozc2xrclFDK1NoYzR5?= =?utf-8?B?VVJzWVhQeFgvd2hiMVJBZHVkbTRIc1lFTVhjR0l5VDVEc21RSktqVENoV2dX?= =?utf-8?B?RlQyOFFGSS9jVmNqQ3dKK0tBNE0wb0p0TEhUVWpUZHVUSDVacVBpVElGUjRl?= =?utf-8?B?YUdGd2E4M0pDRkdUc1BXVG9COWRZWXQzcUZBWGZQSFYrcUt3UmlkZ051a3Rx?= =?utf-8?B?OU81SExnYUMxbGdZUzlnVU1KbDdLbHhtNUdHcCtnNXlkb2RpSHF0ZFUyM0Za?= =?utf-8?B?NlhoR0Z3dXBwM3p6SEVPdlZ1RWF2WGZQNUZJNGFKY0dIckpKcEMzcW4xakt6?= =?utf-8?B?c1ZvN1hDcmdVYSs2SVkrbFhkS0J5MHlsU25ZdytCaldFRDRPWis3WGs4SnJD?= =?utf-8?B?RXJRSUpNTDdJRGs3TWxQWXA2YjdXZTJCdGxPK25CWXZqaXRSdzNFT1RQZXVN?= =?utf-8?B?SVR1azZwck1JbjNVUjRpSGp6TEZxQ1ZzbUtKTXB1VGJzVUlGdmNVdlJ6NTRW?= =?utf-8?B?cjR3OVlGbE5xUXFWQ2tIUElpeEpDSk9VM3VIQU1QclZtWnNhdmFLcy9qdXhN?= =?utf-8?B?bkJDS1NvRHZ6Uk5kMTZibnhodFNJdm9wWUkxODZXN2czRnZWYVp2ZGVmdjFi?= =?utf-8?B?aVFORVZWb1pRcGkvUXExZ3BlOHd0enI2NkJ3U2VWNGRadXZSL1I1VHFhc20y?= =?utf-8?Q?CSANeTCp6VcTu2o5yq/WsEtK0LvLjjLg?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MUc4bENzZHpkYk16NE9YS0dsemxJMFRtNDFsNUdpRUJWRGpuZVRyQUtBNnRR?= =?utf-8?B?MC9mNXRpem1jNGxqMU1oVjdEeGJYaXppb25rTjgrQUxKa2lpWDhuR3dZSldy?= =?utf-8?B?a3lpUSs1Y0lVN1k0THZOd2x4UzlFWU1YV090OU9VV2hTSmJ1dlZKNW5wMExl?= =?utf-8?B?L3pTcGNlVDNoZHpvNHF2Q1ZPczF2S1VteXpGRjMrdklaOTBYMUszNkdYWTNo?= =?utf-8?B?aGtqNE4yY3VzWW9VYWI5ajVjRFQwT3JKaFZNTThtYWQrNm9ETEgvNytmRVVo?= =?utf-8?B?NW4rbkZFUGhyc2hFeE9ISDlUTjFCSDhBUUFVM2tJVFFNdC93QzMxc2dNL3pR?= =?utf-8?B?OTYvcFRwT0pDZWFJQ2xJOEtic25zSWpqZGx5cDZxaGtEcTNZd2tVTHBBTG1i?= =?utf-8?B?eHVrYXJJUGVvYnVmUHpBV1lZUzZQKy9BR1hCa3NDaDhzd25RZVUxSFNmenI5?= =?utf-8?B?RWVEZXprc1hzVGNYK3hvSmZFdzU5UGZlUUNLZ2lVckFFNzM0RE5WTWltK21N?= =?utf-8?B?MHE2YU04OFBMM2cybHB1amZCYWJ3VDhCbXNFajZQMHhmM3RqcldhcDNES1Jm?= =?utf-8?B?NU91TWlCRFlobkRqQVdWSFBuZllOempTZllUMW03R3I5M3kxdHhOQU4ranRi?= =?utf-8?B?THpYdkJmRmdPTVQ0eHIzOUxvTGErbzFqR1duZjhTVngvUHV1d3MrRkM4bXdL?= =?utf-8?B?aVBwVHhBSXU0bUxQcERMbGV6emZjRUdVOXRHTFFjcFNuMDFkMlFGWkpwWjBJ?= =?utf-8?B?NE5Ka0VTaXRxZk00RGdla0FGMm43elBmZWx4a3d5NEFubXVGbHlLcHU4bFdZ?= =?utf-8?B?eUlZcy9lVVlNYWgvOUFtcnJvNkJIOW9VL1FSbnVBTzNEcVowc2ZXcXMxQ3Vh?= =?utf-8?B?VHBGRTF4NS8ycitOYlpvdHExOEhaQUNCRjY3ZFJGQ0NNK1c5dnFGQ2RXU29I?= =?utf-8?B?RG1iODV6M3oxaGxoNUppYnBSZlU2SFViQmhaSXIxTjRKSTZ1MXlCUnVOclZu?= =?utf-8?B?UVRTQnZURXY5cXlYbmtuZzY2a1VUcHp6bFUxZk9zaVVPSVIxeS81bGhKMDdp?= =?utf-8?B?bzVLVXRZSk5rTjRndy9jbEJpOHAwTVVHR28rekZYNFAycTFXaVo3RTl5WEdq?= =?utf-8?B?cGVsYitndWREaEhGNGV3WnVlL1l6Zk5pVEdCdEJJUkdiUTlEVzJQZVpYcDN1?= =?utf-8?B?OG5tS3Fpc3R2MGpjMmk4ekc1QmYxMjE5RzNHQ29CMHc5UHdBYys4Y2VxRWlR?= =?utf-8?B?cGdIKy9RY0lsdlcrMUJLZkJURXZZVzRKRmMxcGEva0N0aGc4VmJBUXlOdmhM?= =?utf-8?B?cHVCcFoxRFovdmltWnBGYlU3eURPOUNBMkp0OGN6NjNzZHg2UEZGOThBeDNM?= =?utf-8?B?WGcxc0RVVHhwOStielozWHB2amYzbVlabHZiRDhyQ2ZjMXZkOS9QWG8yTEFi?= =?utf-8?B?cGlUK2duZVo0aWZ4aVN0Vmw5blBvTUVuU2M4MFFuZUhwV0xyL2RQL01oS0JM?= =?utf-8?B?YXBCZjQxcGxlZHBpWHduZHlKdllXZXZZNUlXeGcrL1FibEIwbGY3VGpYOHdZ?= =?utf-8?B?eFdDWHBjTlpJZmFnMGh0QU5aTDBBTmVISXNnSXlCUjl5alQwN0x6aGxYSUJC?= =?utf-8?B?a2xUK2tvV3hQSFNiRG5may9Namw1VlVPZnZXR1JrRzBNV1FmUitibUdLd3JD?= =?utf-8?B?UGF3SVhaTlZKK0UvbU9TYlJ5Y094V0p3WHFzQVdTMVUzNnNjaDEyMGpldXhx?= =?utf-8?B?VldnT1RvUVlhd2FTcml3VC9WS2xBamR6R2sxKzFPdmZXRlR2RHovNlF4bTI0?= =?utf-8?B?UHp6encvR3dobExkU0lob0JuNm9RL0IvQWdtcFNjWFg1WEl2SlNaUGVSWnNB?= =?utf-8?B?SUNicTVwQlBTV2FTWFJkdGg1WGp4Zm5HeEdEWTBmQVpCTk1Kc1h0WDRCVnpV?= =?utf-8?B?YlVvNzRWSnU5MnlwYU42YnNIeEJmb1lzc1FNa3VFTTFyTi9hTHRNV01sOXlp?= =?utf-8?B?bzlURmt2NXh3VEdjV1h3K1Z4dDl0STVqdUdFRU90NVB1anFpZDhFazFORVIr?= =?utf-8?B?bUhZSnVZMDVXWnp0dHBtYU9LZEppbUI3TDZGU0F0REMzTkxMajRERjhLVUhR?= =?utf-8?B?cmtwZ3VrVUltVFdGSFJFWnkrTmJpMXU1aXkvZkhPN0FJaVFCdEt6OHJ1ekEz?= =?utf-8?B?NXc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9a61169-e42d-4441-ddfb-08de00b7f6c1 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:45.5956 (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: kk4ovcTIVDOe+yyWYV7UFbzRmaqfMmd4f6nNn1zqrzcQMPhrJToHJnVL9jiJ7XXgyhRldocS0YkrDnoMA7t9wg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Implement migrate_vma_split_pages() to handle THP splitting during the migration process when destination cannot allocate compound pages. This addresses the common scenario where migrate_vma_setup() succeeds with MIGRATE_PFN_COMPOUND pages, but the destination device cannot allocate large pages during the migration phase. Key changes: - migrate_vma_split_pages(): Split already-isolated pages during migration - Enhanced folio_split() and __split_unmapped_folio() with isolated parameter to avoid redundant unmap/remap operations This provides a fallback mechansim to ensure migration succeeds even when large page allocation fails at the destination. 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 --- include/linux/huge_mm.h | 11 +++++- lib/test_hmm.c | 9 +++++ mm/huge_memory.c | 46 ++++++++++++---------- mm/migrate_device.c | 85 +++++++++++++++++++++++++++++++++++------ 4 files changed, 117 insertions(+), 34 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 2d669be7f1c8..a166be872628 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -365,8 +365,8 @@ unsigned long thp_get_unmapped_area_vmflags(struct file= *filp, unsigned long add vm_flags_t vm_flags); =20 bool can_split_folio(struct folio *folio, int caller_pins, int *pextra_pin= s); -int split_huge_page_to_list_to_order(struct page *page, struct list_head *= list, - unsigned int new_order); +int __split_huge_page_to_list_to_order(struct page *page, struct list_head= *list, + unsigned int new_order, bool unmapped); int min_order_for_split(struct folio *folio); int split_folio_to_list(struct folio *folio, struct list_head *list); bool uniform_split_supported(struct folio *folio, unsigned int new_order, @@ -375,6 +375,13 @@ bool non_uniform_split_supported(struct folio *folio, = unsigned int new_order, bool warns); int folio_split(struct folio *folio, unsigned int new_order, struct page *= page, struct list_head *list); + +static inline int split_huge_page_to_list_to_order(struct page *page, stru= ct list_head *list, + unsigned int new_order) +{ + return __split_huge_page_to_list_to_order(page, list, new_order, false); +} + /* * try_folio_split - try to split a @folio at @page using non uniform spli= t. * @folio: folio to be split diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 46fa9e200db8..df429670633e 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -1612,6 +1612,15 @@ static vm_fault_t dmirror_devmem_fault(struct vm_fau= lt *vmf) order =3D folio_order(page_folio(vmf->page)); nr =3D 1 << order; =20 + /* + * When folios are partially mapped, we can't rely on the folio + * order of vmf->page as the folio might not be fully split yet + */ + if (vmf->pte) { + order =3D 0; + nr =3D 1; + } + /* * Consider a per-cpu cache of src and dst pfns, but with * large number of cpus that might not scale well. diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8c95a658b3ec..022b0729f826 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3463,15 +3463,6 @@ static void __split_folio_to_order(struct folio *fol= io, int old_order, new_folio->mapping =3D folio->mapping; new_folio->index =3D folio->index + i; =20 - /* - * page->private should not be set in tail pages. Fix up and warn once - * if private is unexpectedly set. - */ - if (unlikely(new_folio->private)) { - VM_WARN_ON_ONCE_PAGE(true, new_head); - new_folio->private =3D NULL; - } - if (folio_test_swapcache(folio)) new_folio->swap.val =3D folio->swap.val + i; =20 @@ -3700,6 +3691,7 @@ bool uniform_split_supported(struct folio *folio, uns= igned int new_order, * @lock_at: a page within @folio to be left locked to caller * @list: after-split folios will be put on it if non NULL * @uniform_split: perform uniform split or not (non-uniform split) + * @unmapped: The pages are already unmapped, they are migration entries. * * It calls __split_unmapped_folio() to perform uniform and non-uniform sp= lit. * It is in charge of checking whether the split is supported or not and @@ -3715,7 +3707,7 @@ bool uniform_split_supported(struct folio *folio, uns= igned int new_order, */ static int __folio_split(struct folio *folio, unsigned int new_order, struct page *split_at, struct page *lock_at, - struct list_head *list, bool uniform_split) + struct list_head *list, bool uniform_split, bool unmapped) { struct deferred_split *ds_queue =3D get_deferred_split_queue(folio); XA_STATE(xas, &folio->mapping->i_pages, folio->index); @@ -3765,13 +3757,15 @@ static int __folio_split(struct folio *folio, unsig= ned int new_order, * is taken to serialise against parallel split or collapse * operations. */ - anon_vma =3D folio_get_anon_vma(folio); - if (!anon_vma) { - ret =3D -EBUSY; - goto out; + if (!unmapped) { + anon_vma =3D folio_get_anon_vma(folio); + if (!anon_vma) { + ret =3D -EBUSY; + goto out; + } + anon_vma_lock_write(anon_vma); } mapping =3D NULL; - anon_vma_lock_write(anon_vma); } else { unsigned int min_order; gfp_t gfp; @@ -3838,7 +3832,8 @@ static int __folio_split(struct folio *folio, unsigne= d int new_order, goto out_unlock; } =20 - unmap_folio(folio); + if (!unmapped) + unmap_folio(folio); =20 /* block interrupt reentry in xa_lock and spinlock */ local_irq_disable(); @@ -3925,10 +3920,13 @@ static int __folio_split(struct folio *folio, unsig= ned int new_order, =20 next =3D folio_next(new_folio); =20 + zone_device_private_split_cb(folio, new_folio); + expected_refs =3D folio_expected_ref_count(new_folio) + 1; folio_ref_unfreeze(new_folio, expected_refs); =20 - lru_add_split_folio(folio, new_folio, lruvec, list); + if (!unmapped) + lru_add_split_folio(folio, new_folio, lruvec, list); =20 /* * Anonymous folio with swap cache. @@ -3959,6 +3957,8 @@ static int __folio_split(struct folio *folio, unsigne= d int new_order, __filemap_remove_folio(new_folio, NULL); folio_put_refs(new_folio, nr_pages); } + + zone_device_private_split_cb(folio, NULL); /* * Unfreeze @folio only after all page cache entries, which * used to point to it, have been updated with new folios. @@ -3982,6 +3982,9 @@ static int __folio_split(struct folio *folio, unsigne= d int new_order, =20 local_irq_enable(); =20 + if (unmapped) + return ret; + if (nr_shmem_dropped) shmem_uncharge(mapping->host, nr_shmem_dropped); =20 @@ -4072,12 +4075,13 @@ static int __folio_split(struct folio *folio, unsig= ned int new_order, * Returns -EINVAL when trying to split to an order that is incompatible * with the folio. Splitting to order 0 is compatible with all folios. */ -int split_huge_page_to_list_to_order(struct page *page, struct list_head *= list, - unsigned int new_order) +int __split_huge_page_to_list_to_order(struct page *page, struct list_head= *list, + unsigned int new_order, bool unmapped) { struct folio *folio =3D page_folio(page); =20 - return __folio_split(folio, new_order, &folio->page, page, list, true); + return __folio_split(folio, new_order, &folio->page, page, list, true, + unmapped); } =20 /* @@ -4106,7 +4110,7 @@ int folio_split(struct folio *folio, unsigned int new= _order, struct page *split_at, struct list_head *list) { return __folio_split(folio, new_order, split_at, &folio->page, list, - false); + false, false); } =20 int min_order_for_split(struct folio *folio) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 4156fd6190d2..fa42d2ebd024 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -306,6 +306,23 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, pgmap->owner !=3D migrate->pgmap_owner) goto next; =20 + folio =3D page_folio(page); + if (folio_test_large(folio)) { + int ret; + + pte_unmap_unlock(ptep, ptl); + ret =3D migrate_vma_split_folio(folio, + migrate->fault_page); + + if (ret) { + ptep =3D pte_offset_map_lock(mm, pmdp, addr, &ptl); + goto next; + } + + addr =3D start; + goto again; + } + mpfn =3D migrate_pfn(page_to_pfn(page)) | MIGRATE_PFN_MIGRATE; if (is_writable_device_private_entry(entry)) @@ -880,6 +897,29 @@ static int migrate_vma_insert_huge_pmd_page(struct mig= rate_vma *migrate, src[i] &=3D ~MIGRATE_PFN_MIGRATE; return 0; } + +static int migrate_vma_split_unmapped_folio(struct migrate_vma *migrate, + unsigned long idx, unsigned long addr, + struct folio *folio) +{ + unsigned long i; + unsigned long pfn; + unsigned long flags; + int ret =3D 0; + + folio_get(folio); + split_huge_pmd_address(migrate->vma, addr, true); + ret =3D __split_huge_page_to_list_to_order(folio_page(folio, 0), NULL, + 0, true); + if (ret) + return ret; + migrate->src[idx] &=3D ~MIGRATE_PFN_COMPOUND; + flags =3D migrate->src[idx] & ((1UL << MIGRATE_PFN_SHIFT) - 1); + pfn =3D migrate->src[idx] >> MIGRATE_PFN_SHIFT; + for (i =3D 1; i < HPAGE_PMD_NR; i++) + migrate->src[i+idx] =3D migrate_pfn(pfn + i) | flags; + return ret; +} #else /* !CONFIG_ARCH_ENABLE_THP_MIGRATION */ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate, unsigned long addr, @@ -889,6 +929,13 @@ static int migrate_vma_insert_huge_pmd_page(struct mig= rate_vma *migrate, { return 0; } + +static int migrate_vma_split_unmapped_folio(struct migrate_vma *migrate, + unsigned long idx, unsigned long addr, + struct folio *folio) +{ + return 0; +} #endif =20 static unsigned long migrate_vma_nr_pages(unsigned long *src) @@ -1050,8 +1097,9 @@ static void __migrate_device_pages(unsigned long *src= _pfns, struct migrate_vma *migrate) { struct mmu_notifier_range range; - unsigned long i; + unsigned long i, j; bool notified =3D false; + unsigned long addr; =20 for (i =3D 0; i < npages; ) { struct page *newpage =3D migrate_pfn_to_page(dst_pfns[i]); @@ -1093,12 +1141,16 @@ static void __migrate_device_pages(unsigned long *s= rc_pfns, (!(dst_pfns[i] & MIGRATE_PFN_COMPOUND))) { nr =3D migrate_vma_nr_pages(&src_pfns[i]); src_pfns[i] &=3D ~MIGRATE_PFN_COMPOUND; - src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; - goto next; + } else { + nr =3D 1; } =20 - migrate_vma_insert_page(migrate, addr, &dst_pfns[i], - &src_pfns[i]); + for (j =3D 0; j < nr && i + j < npages; j++) { + src_pfns[i+j] |=3D MIGRATE_PFN_MIGRATE; + migrate_vma_insert_page(migrate, + addr + j * PAGE_SIZE, + &dst_pfns[i+j], &src_pfns[i+j]); + } goto next; } =20 @@ -1120,7 +1172,13 @@ static void __migrate_device_pages(unsigned long *sr= c_pfns, MIGRATE_PFN_COMPOUND); goto next; } - src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; + nr =3D 1 << folio_order(folio); + addr =3D migrate->start + i * PAGE_SIZE; + if (migrate_vma_split_unmapped_folio(migrate, i, addr, folio)) { + src_pfns[i] &=3D ~(MIGRATE_PFN_MIGRATE | + MIGRATE_PFN_COMPOUND); + goto next; + } } else if ((src_pfns[i] & MIGRATE_PFN_MIGRATE) && (dst_pfns[i] & MIGRATE_PFN_COMPOUND) && !(src_pfns[i] & MIGRATE_PFN_COMPOUND)) { @@ -1156,11 +1214,16 @@ static void __migrate_device_pages(unsigned long *s= rc_pfns, =20 if (migrate && migrate->fault_page =3D=3D page) extra_cnt =3D 1; - r =3D folio_migrate_mapping(mapping, newfolio, folio, extra_cnt); - if (r) - src_pfns[i] &=3D ~MIGRATE_PFN_MIGRATE; - else - folio_migrate_flags(newfolio, folio); + for (j =3D 0; j < nr && i + j < npages; j++) { + folio =3D page_folio(migrate_pfn_to_page(src_pfns[i+j])); + newfolio =3D page_folio(migrate_pfn_to_page(dst_pfns[i+j])); + + r =3D folio_migrate_mapping(mapping, newfolio, folio, extra_cnt); + if (r) + src_pfns[i+j] &=3D ~MIGRATE_PFN_MIGRATE; + else + folio_migrate_flags(newfolio, folio); + } next: i +=3D nr; } --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 EE82F2749D2 for ; Wed, 1 Oct 2025 06:59:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301944; cv=fail; b=jaNg4IQm7HJqioFC5HA6uimDLvmFYRvlrer9VGjryU5uobdwwkNYLIavScjiDLtN67ER3diU2xQLh9rgGCwQO4Po6Mep8UgJfYYnQw3zzJ9vo/IEXAQKujN6p1SKaupE+rGR46r1+xLVpNKHrNxh3eQeY+fcr8+PAGVwbUiAsR0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301944; c=relaxed/simple; bh=aOOgZuf5x0gCiFGLTDiGo2yZlyCPZ0gemzrA1If5ycw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=E4c7+D5+cLqwkE+eVlhj8WixRvjye4cy1POsyeA01w064S2m8/bkqcSuw9ycgnmCTwPqVVpn45wHejkQwPnQm+ZJLDpC1WhEaisOT1AQP+3sXG5fRnoFDtsMS4cfeSMcxBp+1+be9fCfAL8UGlxIl9z4D76QqkTLWpnVvSvh58A= 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=JRieOw9t; arc=fail smtp.client-ip=52.101.193.20 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="JRieOw9t" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sbd7nS1/OZSzwjiLWb6r75a3oD+e3vyDRaH9ndBbV/dBEp4mw7Wy/6hY9vbQz2VRgZNArwlSx13uN10wOWcbbWRMRcgS0KgCTvWGZFClQ+0fttTYs3P2z1lULR3AVsIZekUIW4YWr46IgwoXjOTC3L5qCrk5x7yoNAyxeVVZKaupTCKZwUFGGO1zN1cSLa65qaqL5Uw18aXKcOQE/t1WIkoS33Pkuo0hSuDOVbO+5JJR75Ikv4rjG0SCHWsyouShK+kwz5TGf+BoTYSimgsQLwMZHgoP35s+bWUVI6KnWkBZVEoGxMTxbXj9tAhKgede5foO7rdR+AWZmjJldRkizg== 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=fyfFGjia/uCud+lxVakYLHhIMLokQgesD4bJ4nnagNQ=; b=QsyoiAyQ4cZoA9GtMos0C0a/KazSHZLpJ6XD4RstAOrWmiMFfXyoend3FRnvM7soj1WvlZGpEagYjuuUkhQuAHhTEIdkj6cg9vyOkNIXJoc5oACDiMl8DkKeKMXHyEjocJPHzg/0Fj7d9x6xxwVjYtHi+xFUvUvzPlZd74QP5T+vxJ+cYTLAxxkLdpoT/Y98ZJMFOtfJFT25LOZqshPNMRvd0qxQkCSLre8Mho1bAGg4n3Pl6dskz6hoW1kbJvJMdYt6zkcRnjahhB0iV5e7bU4DqM9WHZB01xLCzvVPwh9a7XitHckwAdt65pB+9oRZStDq4+ZTyoO+UQrqyims7Q== 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=fyfFGjia/uCud+lxVakYLHhIMLokQgesD4bJ4nnagNQ=; b=JRieOw9teW2vKNt15Lkp5l26K62/9S1RmBHh152AuuMJRjM+e+sJpYr3eWxc/5ge8Pu1Ny+AXxvpSXo/ZZ1zw90IIEAoSxnEpVoMlzcp18RDbP2f8ZAmx/gX2xrazQd4ryby8IrjQSDosWQWzu1AyxhuDRrIqrRJVp2D8AO6DkW7GjmPR2Xi3lQKHq+SCv+ocbpwQQTr1ZatNy/zeVWxQf4lXhRgSOKYvsucSK5sEZvqlV+0d9BUqWmeQy+hoCGHa5zzsSvzM0St4/tYXeE72CWTAh+Yw9qfYFIn6/uPiBE5FIBIyc0RthuVjPLagqTud/2QwWn4xTN1t9+9crZF5w== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:49 +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.9160.015; Wed, 1 Oct 2025 06:58:49 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 12/16] lib/test_hmm: add large page allocation failure testing Date: Wed, 1 Oct 2025 16:57:03 +1000 Message-ID: <20251001065707.920170-13-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY5PR01CA0021.ausprd01.prod.outlook.com (2603:10c6:10:1f9::11) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e18367a-910f-4bc6-8c1a-08de00b7f93d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UzY4K2RvQnJFQ3ZtbkFKa1F3TVNINTFpdUp1dkh0SytQVHUwTGlxR3ptbVFu?= =?utf-8?B?ZkV4ZDJQN3BzV1lzbkZXaGlsK2gvNnJGWjVvT1Joa1VDV00zcUU0ZU5WckJX?= =?utf-8?B?aDZBdlo0aC9Rcm40MkliVy9GcjlTNjhBQU1ZaVVRS0NFazJ1YVhXNEdic0pt?= =?utf-8?B?YWs5STJCRituYzROd1lJZ2tMMDFXNWYyZElwRUpjUDZXMWszWHJIZythU055?= =?utf-8?B?RjI4dklHYzU5MWRqRktHRWUxRysrdXFWRURaY3BJYlBPaG9VU0VKMDFGcGx3?= =?utf-8?B?Z1RMMEF5Q09kSE5lb3VCNTZVOFhweWI3bEpWWmNwTThqdmluajlFSm45d1ls?= =?utf-8?B?ZGpkZVZiU1BzQWpkWWZjaTM0VmxhSURwQm9Tdm9GSm1ha1BqK0lKTjRqazQr?= =?utf-8?B?SFpUeTNSSVJJc1c5cTIvZDgvZlovTit5cFk5ZUFmMmNaUmJ4SjFUc2dYN20v?= =?utf-8?B?WE1USE9SN0JZQ3JCVXpaMjNEUEpFWkJUT1VmUlBhU1pZRldkNDZGenVmbXZO?= =?utf-8?B?djV3QWxWQUpGTytDZ1FWRGdmcFljMG5TdkpWUmV2bk44YWlFQnNJYmR5QjA4?= =?utf-8?B?bWR3ZDZPZk1OMEcyRWJNZVNkNEVQMWRJTFRkTUg5UnFUT0VpOGxPT01wK2w5?= =?utf-8?B?MWtxM0tiTGg3MDhKNmRZeWwrNkg5UWhlTkpTam5WaUwvSzVpWExxWFJINDlo?= =?utf-8?B?OHVNTDhCVFd1V3B2SlkrTmdxZnVDc1A5NFk5c0lKaTBYVjA3eG5tLytRNWNZ?= =?utf-8?B?VjZYaW55ZGRlb3VmbUFZdGhrRFljVDhlWEFZVUJwdzNmSXppZXpoNVdrVVYv?= =?utf-8?B?UFlpbjczczVkaDZaWERqaWRnbXpYSmNJTTFZNk9Yd2NNMjNVVnA2R1F5eHpI?= =?utf-8?B?ODhtbmF5V1I5Y05kOVB1REdBbDFpZGl3cGFnVGI4cTQ3V2YvQVVuU0NoTzgz?= =?utf-8?B?eG1KUW4rVXJKVVpVVnIwdCtHSGJMY3lDK290Z0lobHovNXVNZHZGOUZiNkNr?= =?utf-8?B?bmhicytGbU5NblRUcm9ITTJqZWsxZnAxQjZweU5aM01FZEFnaUJJZXpTZ2Ns?= =?utf-8?B?ZEpmNzRaNHdlZmdSWTV4ZXMvT1NxVWNLK2RINzh0a05JYVBIbWpxT3RUTGJV?= =?utf-8?B?V2lvdUJFSGpmOE43K0h6NisvSnB6RlFISHZpZHlja3B3bGJrejdiN3pzQlZ6?= =?utf-8?B?NG5QSFBOcnF2dFMyb1pVcWpXYXR3RUpYZGZqSXFJZ09mTG9DYzJGVzM1UFA1?= =?utf-8?B?Vk5rSDlXVlgxZFZZTnFER1hqQjd0eUpjNTVCYXAzcFRYRHV1aFNISzA0MHlh?= =?utf-8?B?VXJIYWhaRTBWcWtUak81TDR0eThHUkxiRHRyOGtGcUJVUE5wV1gyUUo5dkMv?= =?utf-8?B?b0hML293M1pheXJ6bGpSdDZqdy9UUGd3M21WOUg2d2pJb2Q1UXgxcy9kUllP?= =?utf-8?B?VE5ocGlRSmYzMEZqRE8wUFJ4ZEdWSHlPTnM2RnZXcnNXSDV2N2NHdWNaN0ZT?= =?utf-8?B?TVRzb3R1Z2F5YURXSDFucjEwOUdpcGFVUG43VkxLTGtFTEVzR2JQWWtWTFI1?= =?utf-8?B?NURaNTJ4c1p6dTFmMkRNNG1Ya3hYN1haR0tNa3hTdGhOSENhMWsybW9KV21l?= =?utf-8?B?OTJDNG1xV3AzK29pWGNvMDVFRVJPU3pYVVhpNE5ZenNSSDdyYU5MRzJUbFNm?= =?utf-8?B?ekxGOEpZRE92NncwV1dTbXRha29PSXNMOVM5dytyUzVTWEpvcVp6M1d4VjRU?= =?utf-8?B?VGpZUkJ3NUo1dTg0aWhDSndtM1VhZ096Q0Z4Ymowd2FBSkg5YzhrN2NqRSti?= =?utf-8?B?cUJMbVZSVFk1cFhmUzZzV3RVS0RvL0VOU1ZZaDBqeFhicnJkdVhGdExMNEtT?= =?utf-8?B?VVB3aUxKYVNrbWNOU1lZbDhHNjBGbWZyMGt1UmdkUUNVaUltM0JZaUpUV3Nx?= =?utf-8?Q?G3U7YEh8pTEJO2lNOzTsGmu4Gmpjshlf?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y3VldXNIclhISzR0dUdvYlRNSHJDNVMzZy9UQVZjNk9PM1doRXRHUnh4cWI4?= =?utf-8?B?MlBTSnljUFY3T3hqTC9QZktnbm5najloZkIvR1VFUXBTcXdTRXFSVXJoSXNa?= =?utf-8?B?cGRwQlZ0b0Vyd2k0dTFnSklTcGJuODQxRUlSSy9tUGdUMCtxV0ZvN1ZETnBv?= =?utf-8?B?cHVkdXE0MDZieHhYdGF3ZnVFNWtlN002clJsOHV6SC9BZ3JjRUV3UzBXeVJi?= =?utf-8?B?MzhDSmdGZUtuRHd4YmhybS9vVEZhcGNzdHQxenZUalBQNEVaOTdsSGpYem1S?= =?utf-8?B?azNBRFFCWTRsL0F5TnhzVit2MGpNcG45cVRzTHpjV2twdjBVSzJ3Zzl5QUxK?= =?utf-8?B?dUk1ZTBuNU9nVE1jcDhwcmEyK21wZnRwOGFsdzF4bkUzV2dDNTBKOVUrdjJw?= =?utf-8?B?a3BFQXlORkNwVFFwdHFvM2xtQUFsWDA3NzJhcGhLMzFIV3pJUTlaRzF6NWtT?= =?utf-8?B?UkQwT1J3RnZPYmVxUlBDTlczRCt4OHlMYnZacmRKMVlvUkpUbFRyRWdqWDkv?= =?utf-8?B?YkVEVDVJeXIxckl5bHRsZWZvTUwxbDJFVXpSdTlZbUloR2lIR2tEVXo2SU9G?= =?utf-8?B?QWdKWndDdzN6WkRqRjBDelhrTHBFMGx1ZDBMSmlOZ01UTTNmeG1jeXVGZEQx?= =?utf-8?B?c0tBeFl3cEUySXFOZjhYVWw5dVliaHN0L2xRZjhoTm9iWEMrWFlnYkdvRzRl?= =?utf-8?B?cG1aNUU4RWsxMzE5SWRhMkF3WXg5TWN0SWhhbzErNmZKMVB4cDdrbUlielpM?= =?utf-8?B?blBQME1hci8wSFBVanBNV3RiRU1HcjBIbUhJS3BYWUFNbGUzSWk3dGtNaElG?= =?utf-8?B?U0RzbkFLa3h4WkhsbmY3TkZsYjNaNXdYOHUvMTBTcXlOWDJyaUtSeUViQzY2?= =?utf-8?B?K2MzWlVhS1B1RWNhcVAxSnRMa1RRa1ozZHptTmkzV0ZPMzJYVktuUVcrUGdN?= =?utf-8?B?a00yeUthZDlhVUJCS1VoK2Z5b1IzeWowbDFMb091ZXFYUk5TMW04K2ZJZFNy?= =?utf-8?B?anFySStnMzQ4NmQyVGpDRjMvaVZ3Q2VYZnJKWkFpR0c3WnhYK1RIdWVBd2J1?= =?utf-8?B?MWo4U1pkYkJCTEZ1YXlrZ2JxQUNscmxOa1lJZU80Q2tid09MOWNlWGo0bEpm?= =?utf-8?B?UlhnbzRuQm9IZk1uci9uWnprMGJ5N1BsUjNFaXBGNFl6WXlrQTBvZUVRM0VW?= =?utf-8?B?QUNFUmJVbzRYZ1lmODlsME5xRkNZQTBtUGRNa2NyQWxIN1BVRURJUmIwR3hU?= =?utf-8?B?Zms1TnVjekpjMkt4TGNBeENXOE5ZZk4zTE11UU84eEVIVWNyeFA3QXVyOTVw?= =?utf-8?B?UExDa2hXWWhMTlJXZlBkeVdrVDd0RXFLL2pnL3phK2k4eWd5czZJTXAxRURT?= =?utf-8?B?RkExb3hkNUdHMU9seDZrVmU2OS9oT2VkcDFlL0lYVko5c3NnZkR4TnVibVRz?= =?utf-8?B?ekJoajN4cEZSdzA0NStZRlM5eEFFdEFKMHhTUmIzZmVMQmdSTDJKVk1ISGJk?= =?utf-8?B?S2NPT0N1SnJidnJFQTVZSEZwbXROcWFzNnBPM1VJc09zNUdHdzdxR1BNOUt0?= =?utf-8?B?MHJDNmJYN2JtNmFUOVBEWUszVGRtZ3RYSGJRU0RqZTBlbW82eEkxZG1aU1NH?= =?utf-8?B?Z0NZR1VzWDZ2aTRIUWVsWmRvMjduSHNRZFlQK0ZDRnlFS2pBNTRjaUNiVVRY?= =?utf-8?B?M2xjbEk1aHRMM0hJUWxVdG1MbjU5YWpwQXRpQ2tXYXNLOTBqczRRUTE2TmZR?= =?utf-8?B?WDJKK01CQWRjTVgyNERtTDBQL0VVU2o1M09sWEg5TjRrR2lDUHNtWkFHRmsr?= =?utf-8?B?Y3Bxanc1V1YwMzdja2dURTBlUXRTYUhQZkRWdHE4TjZ6MitUR2lYdnk2WXZM?= =?utf-8?B?VkNQd3NiT0h0aVdNbGNzd29iY3BRdlhRL3VBV244YWFCKzRkUW1iYXo1eVc4?= =?utf-8?B?QjdtRlZ0bTdMcVg3TWtSYURhVjdiaFp5bndTRXJCcGdIVnRqVXk4aEFEdFBl?= =?utf-8?B?azVadnJSNy80SjkrYVBlNEQ1Q0hHWnRUTkFUa3llWkc2UHhPdDJ1bFIvb1Bl?= =?utf-8?B?NEFyVzNkanE3RnZ1WU0wY3RnMERvclVra0VFS2pyVjhiY1A1K1Z6enNQdlBq?= =?utf-8?B?blJabDNuVmJBWjZmanBDOXpSbHJQZ1EvRkNuRDhwbkJJVUlpV0w5b3pTTHVn?= =?utf-8?B?Tmc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e18367a-910f-4bc6-8c1a-08de00b7f93d X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:49.6555 (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: AEz75zQmlgDIVrbys26MOTe4UWIBTNHaUnhrmv9ByjHcIDUWbW0RiCVqekXl4oD41CXq2PCpn+0/EiEBROOdRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Add HMM_DMIRROR_FLAG_FAIL_ALLOC flag to simulate large page allocation failures, enabling testing of split migration code paths. This test flag allows validation of the fallback behavior when destination device cannot allocate compound pages. This is useful for testing the split migration functionality. 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 --- lib/test_hmm.c | 61 ++++++++++++++++++++++++++++++--------------- lib/test_hmm_uapi.h | 3 +++ 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index df429670633e..72a8b2f38d8a 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -92,6 +92,7 @@ struct dmirror { struct xarray pt; struct mmu_interval_notifier notifier; struct mutex mutex; + __u64 flags; }; =20 /* @@ -699,7 +700,12 @@ static void dmirror_migrate_alloc_and_copy(struct migr= ate_vma *args, page_to_pfn(spage))) goto next; =20 - dpage =3D dmirror_devmem_alloc_page(dmirror, is_large); + if (dmirror->flags & HMM_DMIRROR_FLAG_FAIL_ALLOC) { + dmirror->flags &=3D ~HMM_DMIRROR_FLAG_FAIL_ALLOC; + dpage =3D NULL; + } else + dpage =3D dmirror_devmem_alloc_page(dmirror, is_large); + if (!dpage) { struct folio *folio; unsigned long i; @@ -959,44 +965,55 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy= (struct migrate_vma *args, =20 spage =3D BACKING_PAGE(spage); order =3D folio_order(page_folio(spage)); - if (order) + *dst =3D MIGRATE_PFN_COMPOUND; + if (*src & MIGRATE_PFN_WRITE) + *dst |=3D MIGRATE_PFN_WRITE; + + if (dmirror->flags & HMM_DMIRROR_FLAG_FAIL_ALLOC) { + dmirror->flags &=3D ~HMM_DMIRROR_FLAG_FAIL_ALLOC; + *dst &=3D ~MIGRATE_PFN_COMPOUND; + dpage =3D NULL; + } else if (order) { dpage =3D folio_page(vma_alloc_folio(GFP_HIGHUSER_MOVABLE, order, args->vma, addr), 0); - else - dpage =3D alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); - - /* Try with smaller pages if large allocation fails */ - if (!dpage && order) { + } else { dpage =3D alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); - if (!dpage) - return VM_FAULT_OOM; - order =3D 0; } =20 + if (!dpage && !order) + return VM_FAULT_OOM; + pr_debug("migrating from sys to dev pfn src: 0x%lx pfn dst: 0x%lx\n", page_to_pfn(spage), page_to_pfn(dpage)); - lock_page(dpage); - xa_erase(&dmirror->pt, addr >> PAGE_SHIFT); - copy_highpage(dpage, spage); - *dst =3D migrate_pfn(page_to_pfn(dpage)); - if (*src & MIGRATE_PFN_WRITE) - *dst |=3D MIGRATE_PFN_WRITE; - if (order) - *dst |=3D MIGRATE_PFN_COMPOUND; + + if (dpage) { + lock_page(dpage); + *dst |=3D migrate_pfn(page_to_pfn(dpage)); + } =20 for (i =3D 0; i < (1 << order); i++) { struct page *src_page; struct page *dst_page; =20 + /* Try with smaller pages if large allocation fails */ + if (!dpage && order) { + dpage =3D alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); + lock_page(dpage); + dst[i] =3D migrate_pfn(page_to_pfn(dpage)); + dst_page =3D pfn_to_page(page_to_pfn(dpage)); + dpage =3D NULL; /* For the next iteration */ + } else { + dst_page =3D pfn_to_page(page_to_pfn(dpage) + i); + } + src_page =3D pfn_to_page(page_to_pfn(spage) + i); - dst_page =3D pfn_to_page(page_to_pfn(dpage) + i); =20 xa_erase(&dmirror->pt, addr >> PAGE_SHIFT); + addr +=3D PAGE_SIZE; copy_highpage(dst_page, src_page); } next: - addr +=3D PAGE_SIZE << order; src +=3D 1 << order; dst +=3D 1 << order; } @@ -1514,6 +1531,10 @@ static long dmirror_fops_unlocked_ioctl(struct file = *filp, dmirror_device_remove_chunks(dmirror->mdevice); ret =3D 0; break; + case HMM_DMIRROR_FLAGS: + dmirror->flags =3D cmd.npages; + ret =3D 0; + break; =20 default: return -EINVAL; diff --git a/lib/test_hmm_uapi.h b/lib/test_hmm_uapi.h index 8c818a2cf4f6..f94c6d457338 100644 --- a/lib/test_hmm_uapi.h +++ b/lib/test_hmm_uapi.h @@ -37,6 +37,9 @@ struct hmm_dmirror_cmd { #define HMM_DMIRROR_EXCLUSIVE _IOWR('H', 0x05, struct hmm_dmirror_cmd) #define HMM_DMIRROR_CHECK_EXCLUSIVE _IOWR('H', 0x06, struct hmm_dmirror_cm= d) #define HMM_DMIRROR_RELEASE _IOWR('H', 0x07, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_FLAGS _IOWR('H', 0x08, struct hmm_dmirror_cmd) + +#define HMM_DMIRROR_FLAG_FAIL_ALLOC (1ULL << 0) =20 /* * Values returned in hmm_dmirror_cmd.ptr for HMM_DMIRROR_SNAPSHOT. --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 F20422749E0 for ; Wed, 1 Oct 2025 06:59:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301947; cv=fail; b=MWI+sHUvyoFOSb0huUYsJ5YCD/rYkPXZS/BaBOG4KTO8yv4021TEa7KzoIsBcu6OiBZM4oWRVtu4dyK0XWVham3+DJJVCS5oP26Hi6CHYI/13JHFtLQtQC5G9/dc+LWS6OtIKjmWAssO0cD0FmY5mmyMWRezGZU/T03pGmyRDXA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301947; c=relaxed/simple; bh=6ko2+REHKxUntbJ7kHm+kLJGCyvA4bzBx4/CawKcgpA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=I3jIwxoIJJvvW8pxNOInLFZ9cQLnrh9xf/8yum4DR2hI+jY5R12sVhEBwk6RZMn/YNReUQRaMsiZ9P/zADA0YSlJcdS0OCs9l0VNR1uO3R3TC1PBpkVZ+YA7WMoroXn9WZhjiRC/5yvm9K40EGAKV3rBpEw3rAmz8DNxjQSH0wM= 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=aEyfW4k9; arc=fail smtp.client-ip=52.101.193.20 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="aEyfW4k9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lmzH4GnnYdjsTjde0FoNEV6Uf7zvHeA5M3SYp5Rw+kcIQWOyp0qetvyey9dMEttwlsxkmBWeaQ2TMOe68syr4V24mZEpXxOAvTj8HCkBcCcVtg/+BtMgC9GCNpk2YHPO+wdi5l+DhP/e0nWH7XBzSo98AHOSgbG6S7hMUFGaxAsWlQP380ju39Ku6AkdjeFepq1nTZd8dSZMmxE48W9QsrSeVAXWBjIINKpQ5jjV1Qntlk34M17BxTHMPPIMunKcXYY9X3tWCIQDrS3gMz3LXCUD1Oou0oYsgUDwsaHOKQ50K7tIUAqUCTEIrx5n6LfSVR+NOvuPzqBgaiRn7nEeUA== 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=Qb1ex7zKroLOvP7sqJVrMKehBtT2BJH4qw0sEkMzNqM=; b=FL6WVQwENdep5Wb4Ox5ECebx07ElX+dx109f05g8QoX7UpDYZ4U7yZnXcEbgdL/LDPCwuCWDMRs1vfVGjjpXgMjOq6S1Amnwb5yA/1UGOzXBH2SW0PsCs0XVwGT3U6wCIPMXtBib052Psv2DHklsOMzTKUtNvug0G4ch7k9QdqvZNXsxgaA61baAxnaxBPr2aGI2D++CgY5obNH7lZJQzflZEROBFEPEycI5rLfII7NAu9DO9CdGdaix0HaN2A9IaSA6SKp2Nh1/8MIvQJXl0QyHn9koj7co0ytjlfznMpFc07mKZd5Xh/aokRCKpgiBmQ7aPoA4QAPyPEM7D9jahw== 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=Qb1ex7zKroLOvP7sqJVrMKehBtT2BJH4qw0sEkMzNqM=; b=aEyfW4k99nctKh/yUHWtyY4rKGQ2Wr8yG+xz4kxz/s1uBwpWKPlmKuXZsozh6VHvHWLixlJKWsIcY2Mv47qCVinRI7plSQEqWhci1KzBRMlwUEGr3RDr+Dq5FVDPCWgeHoe7FXCm/7/ez2hFSo8NkikOUSKcs1NSethT2Nytzv9rftA65/QUpjfUgS5+eLZwRthIY2dt1OpPvS98qODXhsvTzbq5+ZCkVtNtmGu7jD4ojJ15MFnN2bLkal0Db5Gn6ArSxaLFjBNCqwRZn9pr0PyO8LArEc69dg5nFQepfO4IjFp+Jx8jRgzBGK5RQO+BJgnboXav3CTnngbqPgrTUQ== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:53 +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.9160.015; Wed, 1 Oct 2025 06:58:53 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 13/16] selftests/mm/hmm-tests: new tests for zone device THP migration Date: Wed, 1 Oct 2025 16:57:04 +1000 Message-ID: <20251001065707.920170-14-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SA9P221CA0026.NAMP221.PROD.OUTLOOK.COM (2603:10b6:806:25::31) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e19de5c-d741-42ef-3cba-08de00b7fb40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SklQSExXM3JESXd3UUZrcTJ6Y041SVdQS2Q4Lzc3REUzVFh3UXBZSERKUDRQ?= =?utf-8?B?Z1Zra1RlNjhraDFleC9icW1XNlozcDZkWkNOd2kwZ0M3blZ6ZURwd0l3dTFy?= =?utf-8?B?dTloNVV4UHhqdm1WZjJETDNGRWN2UHJWLzdvVmVhVlNPald4WVQrUk1GWDUv?= =?utf-8?B?WGpOeEVNUXdXdnR6b01MWnhFa2ZxTTBpRjlMamxlVytFNXJKeVhqWDFPQmV0?= =?utf-8?B?aE03YkRvTG5ma3NtQk90Y2p4QXZ3YXFCNzdJVWRNTXo0L2RGbXFITVpUTUpz?= =?utf-8?B?TDFvL3JLMDB4enduSWVpTWhmd3dkRzM1blNiZTQrdDNsTkl4eFJUTk8yM0Vl?= =?utf-8?B?Zk9OY3lIS2ZsRzVVbVpXZW9VWjVSTnJCL3psYys1Z0tiRDNNZ2pvNEhLaXpZ?= =?utf-8?B?MTRybDE5VVlQRkt1WnhZOGlta2I4QjdKVU52UmhtWlNUa0loL3d4WGlGVFIw?= =?utf-8?B?RHFaamdOYTV5QmtiK3NmYUwxSHdhNGFJd05NeHI1M3Ayamh1dCthR21PU251?= =?utf-8?B?QnBZUEV0WTA4RVJoakNCRU5BNDNYSmQ2U1p3bkVlNngzT3pUMm5PWWdNdzR1?= =?utf-8?B?MEhFUEZ5MXF4cHplcGVBR2Q0V2t4Rlh4aVU2enVZckRmdEFqZXREdXV4enBw?= =?utf-8?B?U3cwN0NqK0xoWVpJT1J5SmlxS0wxSlFzV3hRSWdmUWhtV0NxWTFzcHZ6b210?= =?utf-8?B?SzFNTVE3SlVrNzc1R1R4YXJobU5wMzNnOTUxakVWQmVFNTNKTUorWU40Ykpo?= =?utf-8?B?SW1yNFI4b04yNXhEVGFQbUhQcWxPcmJlU0VPbFk3TzNySk5vckhHTU91V3l4?= =?utf-8?B?KytrbGRyc1d1WVdEZUJsVGw5RGE2K1RyQ1gyd0VmcURPV2lmNUtHcW9sUE94?= =?utf-8?B?RlV1SHcwU0NsNjMycmVSUDEvWjJvRlFkWGJJYzdQeU1FT3lkaXV6bDE1ZGdN?= =?utf-8?B?L05CaHhFMXlpSGVNbnBueUx3V1dHUzYrQ1crbmQyR0liTjE0VnN4eTFLZjYv?= =?utf-8?B?MHB0Y1hzM3RsZ3NsbnVTdEIrS0l3dk9LZVlpUUpjRFJ3aXo0clJPUVVIYmhS?= =?utf-8?B?eGlpUFcyaHBTVzlJb01HSWFwSDBkTUFVamlwdWF1QTFsQUFaU1F3VVRaUUFF?= =?utf-8?B?Uk1jSHB3Z1Nvd3N3SDlwblB6KzNGOXpXT0JyeXRNWjQ0TElzTDJHQW5YbXN1?= =?utf-8?B?Vm5qTzVpUGJZNWJxb2NCTkF4YUM4ajBLVDFGV0xTdVREZkpCblJUdGhUVWRh?= =?utf-8?B?NXNCVXhxVHBRckZxVnZob2ljVk5QYTZpY0tkanJXTENqSDNkdlJUVkFZK21n?= =?utf-8?B?UHR3QkRic2NPaUl6cTBVZmdtWHJtUXBUSjJmVGljWjZtL3lCekdnK1ZzYVF2?= =?utf-8?B?K0VQWTM1MGNnYkNpeitlSTl2U2dXcUp2T0kxQzVPRHhXQUNTRFhSTC8vei9D?= =?utf-8?B?ZWpicEk1dCtBeTNRWXhydGFZY09WaVpwV2lJWkxrbzNlMFUwSzFwK0xrUUtm?= =?utf-8?B?dlA1anVUZjdGVUhNMDdHOU9rbjh5cjJSRFAzQzF3Si9YcG9KRVRTUjlpcUVl?= =?utf-8?B?U09SYnk1QWJUdnU1NUpXOWxMYkgzYllyLytsYVFteCtSSnRYNkdRMkhhTUs4?= =?utf-8?B?aVBrOWNFQ3RJRXFiSlBRcHh1dDRKeDdWRmlyOEJ2d3FhRis1elhoTlVQOUxE?= =?utf-8?B?b1d2S0VxblVNd3lGQzlsa25wSE1tVzBSM2toaENITjhHZFBmMmxENnFoTkRO?= =?utf-8?B?eEYvUHRSdDBtNVV3ODcwV3VmNWlVUHl5ZU91WHJXd2t4dkF2eHB1NzV1ci9Z?= =?utf-8?B?M1g3ay9jd1hJWmlLZzc3ZFllTHd1cmRWZjJxZk9XN1FQOUtkVWJDck16SzBJ?= =?utf-8?B?WmFNMGlhanErTFV5Ui9qak1HMzl6Y1p4T0g2SmJUSWdpbEt1cGlKaUJ2VUs1?= =?utf-8?Q?/fStr7JKHmwM1H/mw/eYEk4746FMkip1?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bENkMGJ4NWpXUjI2bk5rRnk2dUxyQ1pQRlMycG8zcmQrQXJ4d1krclJmbGEv?= =?utf-8?B?UTFyaTQvWGJMbjdkS1BGSmtKMlFMVGZsbWsveCt0MFFPTllIWHNZMnBoQytR?= =?utf-8?B?RjAvYm4xU0IzdEcwVjVmd1ljTlBUeEhrTW9NWjFob1BmaGFIek1jT0VLU2VR?= =?utf-8?B?UXZMSVp6czR0Q25XRXU1Tit4UXd6Z1BnajdnWU9ZVUhPdTBXUFYxZnQzVnMz?= =?utf-8?B?MG5QaVQ1SCtQYTR1RkFIOFJiekdIS0FNYVpBY0FCclhxaGRMbmZheGlacS9M?= =?utf-8?B?cUFpWDhINDhsekNSOGtCbjFsbjQ0eFluV09iY1psU3A2V0FycjVzcW1OdEdN?= =?utf-8?B?OG1YRE9IR0pJSGpwTFRKbm9VRjFsMlZ4WUZrU2V3OEhvV1NVS1F4T21ISkFE?= =?utf-8?B?VUNxb21RVU5ibEN0N2dSVW14ZXdtQTJZYmlZZHB6Nlk4ZzBBUnVjSkpubXNy?= =?utf-8?B?VUNORFp0N3UzK2IrVVhJSW56eHZ5NXJFc0plKzNvckNHT0JyQ3BTTGJvVU1F?= =?utf-8?B?aWxHRitJdnNpUHpIWHZXblRQRXJVWXJRekwvQTd1bnBHNTk1Z01tRE1NTFFO?= =?utf-8?B?YmErRm1URWRLVFZOdCtRVTIxeHdFakF4cm1ITkZVK3NnYlhWR2tKK0l4SHV5?= =?utf-8?B?K3VLQUE1THNhdkxyWitTdEl3ZmErVldzL0J6Z29lUkZVd21zL21UaDREUG1X?= =?utf-8?B?RnhuOUYzOFZqOVhycDdPd1pwdnlQeUdzdVl5bWNYZWd1QlQ5djcwU3krOU5W?= =?utf-8?B?UlVtNGpvMlJGV29Ub0thSVNZRCtYeFpmdER0cmxWK1JFTmpTaTVHTGlXNzRr?= =?utf-8?B?WExsaFZnRmxsR0ZrWXExNmlmcUhVSFhKbXlTSUttTlNDZFpOejl1NGtVVzU4?= =?utf-8?B?NDJha212TENJU2xSWUJmUGlVR0JIQ3pZN0QvN3gxTVd2RDUyUCtCTkNKOXBn?= =?utf-8?B?UzdkODUyOHRyZmRSTHUyNWRvNHE0QmxjQXpNVStrKytSTlNtZnNxaERyQ29s?= =?utf-8?B?U0xHUEMrY3gvVlZsZmN1eExuRmNKanQrZ3dNaWFpdWZvbFlpb2pIYkFMUWNt?= =?utf-8?B?VTdNaEVuSXhVeXIyRERGaE1Fbm9qZ2pZMlJzZTVEMmhkekFMbFowSGVvcE1H?= =?utf-8?B?akZsWHEwV1g5dGlWNktWdHZiOGR0VnduNW9CUGVWUTJwQmU3bklPMC90bjlT?= =?utf-8?B?ejNwU2REenJ1QVFkOFhTZ0ZYamE1MXFIWHFBVndMZHNTcGdLN0dGbzgyUENm?= =?utf-8?B?MXZLMEFhL3hCd1NleHdhUU9QQlRTdTNpM2JJRi94S0pKNVRCUC83NnRDTk9T?= =?utf-8?B?cE43NlNTdDd6ZzhDUzd2MFQ0Z2ptL0QybHFudm1wRGt1elNkVTR4cHZBeExn?= =?utf-8?B?WUlVU01KYVlVenVUNXY3a084SGxZSWt4ZFV3eDZicE5jQWovMHIvQzFubTkv?= =?utf-8?B?QTVSZ3JmdEUwVFRqZnRycklFV28vQUJsWkh6eTdjWWNRNy84TWJ1UFd4MTVI?= =?utf-8?B?b0dTM1pBOEdkdkhTMkJKa1BNelBZVU5PWFBQNk5rdVJxakdxOWFDaTNQenN2?= =?utf-8?B?LzN0bnhlK2dzMC9YZnRWdW5XUWt1WGdyWUdkL09hbFdFWkttOGZEOExGN1JY?= =?utf-8?B?bWM3c3VnZTM4dEtiM05OSG5KV2l3WUpIU1ZJZXVzYjJFZU9JY1dhNm9VZzYr?= =?utf-8?B?L0pxbjZxV3JoSWEyL3pHWUhBTHF3QnZ5U2U0elpxUWF2bndhK0UzdzNKbnRp?= =?utf-8?B?WmNoN1daNVI2WUtjR3dUSFAvbUgyQlZTNDBTYXlKMm1Mbk1PamtpWm9kMjha?= =?utf-8?B?cEV6dC9KY2VDeXZOWU4ycWlYUno5TTlkbUd6RHZCTkRrSGFsRDI2ZFJNemFz?= =?utf-8?B?Q2JkTHhUblhSOVlLMFNUYlpCbUt4bWpPY2pTYnBGWUpxcXRUNmdUcHdYL2Vn?= =?utf-8?B?NzUwQVlQemNtNnArM1VQTGk3OE8vS1JwckRPclQ0N1R6YnN4Y1AvbHVNVlov?= =?utf-8?B?dkVIOE54THFPQVY1NEhudG5tVVJlcnlkV1RYWU9ZeUIwK3J5OGpYdTIzRkFV?= =?utf-8?B?MTlQVlpKZnhVR2NXbUc0YnE1MjdmNFpCOXBHNkJaVlNTL28vYnVoYjZCbWs5?= =?utf-8?B?WVR5ZjlsM0V3YkZPSmIxVnFCdGNKcW9lbTR3NHpDQTlpWEdkckM1VzhoL1Nu?= =?utf-8?B?L0E9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e19de5c-d741-42ef-3cba-08de00b7fb40 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:53.0647 (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: RMCFpZwT64uolozJ3pX0i1HO5ET+oeDj0/Q16Mg1rUj9hqXIu1dpfrdRldUbBWwS+IvRidm7xK6GqI0wGeb/Gg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Add new tests for migrating anon THP pages, including anon_huge, anon_huge_zero and error cases involving forced splitting of pages during migration. 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 --- tools/testing/selftests/mm/hmm-tests.c | 410 +++++++++++++++++++++++++ 1 file changed, 410 insertions(+) diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftes= ts/mm/hmm-tests.c index 15aadaf24a66..339a90183930 100644 --- a/tools/testing/selftests/mm/hmm-tests.c +++ b/tools/testing/selftests/mm/hmm-tests.c @@ -2055,4 +2055,414 @@ TEST_F(hmm, hmm_cow_in_device) =20 hmm_buffer_free(buffer); } + +/* + * Migrate private anonymous huge empty page. + */ +TEST_F(hmm, migrate_anon_huge_empty) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size; + unsigned long i; + void *old_ptr; + void *map; + int *ptr; + int ret; + + size =3D TWOMEG; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 2 * size; + buffer->mirror =3D malloc(size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, size); + + buffer->ptr =3D mmap(NULL, 2 * size, + PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, + buffer->fd, 0); + ASSERT_NE(buffer->ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + old_ptr =3D buffer->ptr; + buffer->ptr =3D map; + + /* Migrate memory to device. */ + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], 0); + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); +} + +/* + * Migrate private anonymous huge zero page. + */ +TEST_F(hmm, migrate_anon_huge_zero) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size; + unsigned long i; + void *old_ptr; + void *map; + int *ptr; + int ret; + int val; + + size =3D TWOMEG; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 2 * size; + buffer->mirror =3D malloc(size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, size); + + buffer->ptr =3D mmap(NULL, 2 * size, + PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, + buffer->fd, 0); + ASSERT_NE(buffer->ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + old_ptr =3D buffer->ptr; + buffer->ptr =3D map; + + /* Initialize a read-only zero huge page. */ + val =3D *(int *)buffer->ptr; + ASSERT_EQ(val, 0); + + /* Migrate memory to device. */ + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], 0); + + /* Fault pages back to system memory and check them. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) { + ASSERT_EQ(ptr[i], 0); + /* If it asserts once, it probably will 500,000 times */ + if (ptr[i] !=3D 0) + break; + } + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); +} + +/* + * Migrate private anonymous huge page and free. + */ +TEST_F(hmm, migrate_anon_huge_free) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size; + unsigned long i; + void *old_ptr; + void *map; + int *ptr; + int ret; + + size =3D TWOMEG; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 2 * size; + buffer->mirror =3D malloc(size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, size); + + buffer->ptr =3D mmap(NULL, 2 * size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, + buffer->fd, 0); + ASSERT_NE(buffer->ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + old_ptr =3D buffer->ptr; + buffer->ptr =3D map; + + /* Initialize buffer in system memory. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + /* Migrate memory to device. */ + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + + /* Try freeing it. */ + ret =3D madvise(map, size, MADV_FREE); + ASSERT_EQ(ret, 0); + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); +} + +/* + * Migrate private anonymous huge page and fault back to sysmem. + */ +TEST_F(hmm, migrate_anon_huge_fault) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size; + unsigned long i; + void *old_ptr; + void *map; + int *ptr; + int ret; + + size =3D TWOMEG; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 2 * size; + buffer->mirror =3D malloc(size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, size); + + buffer->ptr =3D mmap(NULL, 2 * size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, + buffer->fd, 0); + ASSERT_NE(buffer->ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + old_ptr =3D buffer->ptr; + buffer->ptr =3D map; + + /* Initialize buffer in system memory. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + /* Migrate memory to device. */ + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + + /* Fault pages back to system memory and check them. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); +} + +/* + * Migrate private anonymous huge page with allocation errors. + */ +TEST_F(hmm, migrate_anon_huge_err) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size; + unsigned long i; + void *old_ptr; + void *map; + int *ptr; + int ret; + + size =3D TWOMEG; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 2 * size; + buffer->mirror =3D malloc(2 * size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, 2 * size); + + old_ptr =3D mmap(NULL, 2 * size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, buffer->fd, 0); + ASSERT_NE(old_ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)old_ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + buffer->ptr =3D map; + + /* Initialize buffer in system memory. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + /* Migrate memory to device but force a THP allocation error. */ + ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_FLAGS, buffer, + HMM_DMIRROR_FLAG_FAIL_ALLOC); + ASSERT_EQ(ret, 0); + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) { + ASSERT_EQ(ptr[i], i); + if (ptr[i] !=3D i) + break; + } + + /* Try faulting back a single (PAGE_SIZE) page. */ + ptr =3D buffer->ptr; + ASSERT_EQ(ptr[2048], 2048); + + /* unmap and remap the region to reset things. */ + ret =3D munmap(old_ptr, 2 * size); + ASSERT_EQ(ret, 0); + old_ptr =3D mmap(NULL, 2 * size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, buffer->fd, 0); + ASSERT_NE(old_ptr, MAP_FAILED); + map =3D (void *)ALIGN((uintptr_t)old_ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + buffer->ptr =3D map; + + /* Initialize buffer in system memory. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + /* Migrate THP to device. */ + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* + * Force an allocation error when faulting back a THP resident in the + * device. + */ + ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_FLAGS, buffer, + HMM_DMIRROR_FLAG_FAIL_ALLOC); + ASSERT_EQ(ret, 0); + + ret =3D hmm_migrate_dev_to_sys(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ptr =3D buffer->ptr; + ASSERT_EQ(ptr[2048], 2048); + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); +} + +/* + * Migrate private anonymous huge zero page with allocation errors. + */ +TEST_F(hmm, migrate_anon_huge_zero_err) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size; + unsigned long i; + void *old_ptr; + void *map; + int *ptr; + int ret; + + size =3D TWOMEG; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 2 * size; + buffer->mirror =3D malloc(2 * size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, 2 * size); + + old_ptr =3D mmap(NULL, 2 * size, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, buffer->fd, 0); + ASSERT_NE(old_ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)old_ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + buffer->ptr =3D map; + + /* Migrate memory to device but force a THP allocation error. */ + ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_FLAGS, buffer, + HMM_DMIRROR_FLAG_FAIL_ALLOC); + ASSERT_EQ(ret, 0); + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], 0); + + /* Try faulting back a single (PAGE_SIZE) page. */ + ptr =3D buffer->ptr; + ASSERT_EQ(ptr[2048], 0); + + /* unmap and remap the region to reset things. */ + ret =3D munmap(old_ptr, 2 * size); + ASSERT_EQ(ret, 0); + old_ptr =3D mmap(NULL, 2 * size, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, buffer->fd, 0); + ASSERT_NE(old_ptr, MAP_FAILED); + map =3D (void *)ALIGN((uintptr_t)old_ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + buffer->ptr =3D map; + + /* Initialize buffer in system memory (zero THP page). */ + ret =3D ptr[0]; + ASSERT_EQ(ret, 0); + + /* Migrate memory to device but force a THP allocation error. */ + ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_FLAGS, buffer, + HMM_DMIRROR_FLAG_FAIL_ALLOC); + ASSERT_EQ(ret, 0); + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Fault the device memory back and check it. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], 0); + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); +} TEST_HARNESS_MAIN --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 45CBD2D9EDA for ; Wed, 1 Oct 2025 06:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301952; cv=fail; b=A5Bba8fcFueOylWNDSr90PrOQ+1RmcPvSPivO1d21+NQfTYZ7exgg+FCFRFadWXtMTelNMteXriZGjOO9bfL9ZNGP05xyVkwj3T7iDachJB0vcUCP+LSzQj9Ip+XV8jjs7goXoU8eDzqtghwA7PAyqAdj4zwDMdRYV+9HoNcf4U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301952; c=relaxed/simple; bh=NQSm5dKn6nA9iSyPoV2Bo2Ep8CkDESFTPni/f9q6hvY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=jS9ERdRbgz53Q/LWkNiVYfYHaJyc5+1mYfLmoGWIEpokBoGxMFpHcDdFKmMrS7/Ter54Cg0Fh0rc6kNgRGfEORG/ygUccPT6Mr73kE8ZpwtR2hLGbYa4G0C6tGQV6nH4HuEYEGMN/nEewp12bCR5rxWlBL//+n0lpuKfVoIF5Cc= 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=Gofndjs0; arc=fail smtp.client-ip=52.101.193.20 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="Gofndjs0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u3No7u+hWw2B0ymAqRAKOr1i1r1ncBTmAMOvEAkZqqVsvYKm73pamtu8JMEPJrJLYbjwCAFGsxbo5Qs2qmU3VoHHwWvpmVP2hprGNsD0cCplO9j04Ki0AOTtUtTtcdC5NWrZT0Da8nolTMwPB1iR+ViicJbc61IKGtkOdWY+6HB2mUDbaGkupKrU0e5+hLJPWQJ24m8VuKpriOIkyQWyFJRwMmWTfWLMOj0lwrjIU8qnIWyi7DKI0iW2x7ZeZik12fT2pzrIbjeZutVaE8q95Vib6AWia2f+b6BYdwYjOuINTCgHs32gLIPXYt0idCxFK2zsA6+t7MHjnKTuwYO15g== 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=F1jyZzKTaL2pML2tH1RnxMC3UEPPRCkesBbj7bE3tsU=; b=P/y7XULe8hWAxFDIRTzz/H1B2vtMLWFpW91VBRqfsHSGM6/k23wkhc4aLbaEFZBA4WPDIrp6v6gUxSIuP5rNAf5qLrmhg+1g0t98F7rZ3epeulWe3QSwlGd88AKP1MmzCP8xwIHUAmYgUrlMk7ky8QzwVrXV3IqySCRI3SgI5itThCncwZFWBXCHCI/axC/LeXKW/JAzg5PtettRMrvSkGZMp8DAN0Jc1Za/fJUPOD0gGz1hw0r4coREgTfp6tHVrJvhmoP6IZHdXFMcP1zktGsrra4+ntck/iFWI1SMISpujoSq1wsI/AovCK89HReNzaPZ9wDZ15xxF2J1Sv9IYA== 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=F1jyZzKTaL2pML2tH1RnxMC3UEPPRCkesBbj7bE3tsU=; b=Gofndjs0E4qpEcQnmNQGy/hPtrdSP1gdmcSiUuuud51u+34URHO6trYZ62DLwZtXkVz2leby6VAMa66pusRYDP0/uTf1Gb8EwCu5HokMoBW4niVm/8Pjg+tua4kZgxTyvGAik99+Nx1I3G0SsrKd2JNVbYlgjhgMsER/bq3LVRmo5OOs27pIRCtgVLIhBKyGyEYkiPtyKpytb8l0p2bDi9Pr5Chhp9a4DQOqGrpDTqj12dAev4rf4RrKt5T8fBoUE8+HsuMsTCR9hlOwU5iEZL6MYxyVcQL/tgv5j5jj0Y5TMV+ghUaf4igcUHJqheDRRSFW7oBrMkKCv6pP++MNIw== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:58:56 +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.9160.015; Wed, 1 Oct 2025 06:58:56 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Matthew Brost , 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?= , Francois Dugast , Balbir Singh Subject: [v7 14/16] selftests/mm/hmm-tests: partial unmap, mremap and anon_write tests Date: Wed, 1 Oct 2025 16:57:05 +1000 Message-ID: <20251001065707.920170-15-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SA9PR10CA0016.namprd10.prod.outlook.com (2603:10b6:806:a7::21) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: 85742e99-db2e-42e5-86ab-08de00b7fd54 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WGFsMXhWRi8ydEEwZUJ1UVZ3czdjYlVuZ2Q4bUlCUFB3MWYwaFNuZVllWGZh?= =?utf-8?B?dE5qeHdmQnpBZHZLbVd0QnBrYnQzTFNYQXQxb1lhaVEzbFJmRU1meTJSSzJV?= =?utf-8?B?OUJtM1AzZWZ5VU5tanY3akpVMUJxMEdCeHlZNDRLb0E2RlZqZzNKbFNUeGpQ?= =?utf-8?B?dGErRElpNVFYUkl3RWNVa0pzMEVoWTd2bWxNMllOOFpIVkJTcXc5TTdOcWwr?= =?utf-8?B?dk8wZmEzVkdaRW13QlNuazRZUGNJdGNxTEdGcTRNaXk4Y0FPdTV4RXFlWFNl?= =?utf-8?B?bW1yY0tjRVVpMjBBREpzb3c0cWJVWWRsR1I2TFBDaHB1dC9UQy9TQ2ZLTVlQ?= =?utf-8?B?TGU3TjUvT0U5ZWgvQU5KaHNrbmZQNWFLS0dCYWZZeFY3aGY5S1dtNFFWZHZY?= =?utf-8?B?UWZhc28zMmRienNnQ21ycjFGRHY3SjZjNUdnUExWc0V2ek5taHJOTlp3a3p0?= =?utf-8?B?aW81YktRSzNNRlRVeGhleFZxVXR0TVJFZWlrVEYyQjh6S0xjR0ZqYXFZaE9W?= =?utf-8?B?TVJVQXAzSnJJZ0ZDalhLZXpTblkrS1BqYXd0bk1BRy9wcHRWWTh6azJ1dlV2?= =?utf-8?B?eDBvMDVjK29pVFNWVzU0ZzRSSkFOMmdJNU1WWUowODB2RGNKdVNEanZYeXBB?= =?utf-8?B?aWpLTW4rcllWK0llcUJmZGJpaEhkNXNoS0tlYVhPZUgyTVZINmNCb2lhRFpm?= =?utf-8?B?OU1IcHMvU1ZMRGZtREYzazY2dmpsd0tpUnFrVmZiZTUyM09XVTkyaVV0eDAr?= =?utf-8?B?UG5wYVBYY054MFFiNjFDQTZYRTZ2cFB6NUVqMEtuYVEyZDdhdTNrdUR6M3dt?= =?utf-8?B?WjdQYk9pQ1pjVDloaEp2Qm1ocDdQR2xLSWhBNlR2KzB3YzlBaStiSFlGd1hT?= =?utf-8?B?OVRmU2poYjN0TEFUbk96MFVDYU42QUlPTTVIaENZd25zc0Z1SmxEMGc3bTBI?= =?utf-8?B?bzlvSWlUT0JWNzNWWFByR3I2c2xtdWwzcGdhSDZ1TDk0MnQrZVJMb0paWmhH?= =?utf-8?B?VWFNQmhMVEJlWlArUWxzeUtTVE4wbTlZcHUxVm0zMTdaVytNQTdpWDJaK2lq?= =?utf-8?B?MWVCaHdBY3d2YWJwVWpHdGVSRUV5UnZnVTBMTmFMM3FXallzdmt2STlOeEw3?= =?utf-8?B?dldaRzFid2JNVWNZWmtMTWc0T0RLbUtKYkpYUFJRbmtETEQveE1QMFJJNjBq?= =?utf-8?B?a0JnaVl2MkFuWG9XNXhpYXE3c09hZ3ZmaXhHRm9Kcm5HakZ0QlphRDVESjRt?= =?utf-8?B?UTJkYnA4WUt4SW1rVUZ2M1gwcm1YWVN0NHpVRUlRTFZMZm5PVTNOS2tCcFAr?= =?utf-8?B?NW1GK2V5b0NXZHJUWWEvL3R4L0M1WEkvZGtMMEFXU01WY0xiVmVvWjlBSUh0?= =?utf-8?B?YXM0V0RLMHdaYUZpYm41YVFWWUkrSjlnVytaM0RoNlhsNk03Tjd4MTZVRjNU?= =?utf-8?B?SGovemF5dzhlWkxvSkgvZFlnVDFOWnVBR2poTi9JY3paNFJtam5vaHFqTkw4?= =?utf-8?B?dzhuUmR2MGRrOEVIQ0lPTWozaHptSDd5a0NIQWtqZE5GMk5oVWt2d2c1TXJ3?= =?utf-8?B?UENBa3JUcXYvd09Qb0xnTVNiVGR0SEZGOHRYZURXcjlxQjFVaDU1WXZqdXpr?= =?utf-8?B?Mm1hdXNSamR0TWk4UEdmLzhjUDBURWRYRzRHTThrNERHamNRVUszTEV5NzVM?= =?utf-8?B?VVZ4TXU4cmVWSWRxVkQwR2xXOXlTWlJ6ajJkYXlBVitBNnNqTEFvTGxDQjYw?= =?utf-8?B?Y044aGFKSlRYR1o1UTdHRkw1M2xqS3M5MkRjTGloL1Y3bFZ0eUp3TVpXZkpt?= =?utf-8?B?R3RzRmdpbGNXaGpOTEs4dFljeXJUZUF5QlFSUE1nMmJnbzBFMVdtTW9VTVJF?= =?utf-8?B?eEtkWWdyS2IxSytDbHJNOTQzWHBvL1FmdkNUOGNJL1RWei81eS8xRUY0ZktU?= =?utf-8?Q?Xb1i65iRVy53B5spSis78FCTm/P6Nbu2?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cU5sUkc4WTJ3YXZoTnBzKzVGcStSNUR3bEI3TXgveU45aFVnUDliSU11Znl5?= =?utf-8?B?VjJ0U3JQQWNna1VwMVl3WFJkR2hJcDl5QTdzOG9XTDQ4Q2xSVnkxYm02VVU5?= =?utf-8?B?MFc5T3pKZ1VGaUtBeEVUZm4vejlGRVlBNDd6eUxMcUM3R0k3TklyYW5Dc1Zr?= =?utf-8?B?L0RXWUFUaUd2ZmU3b0xENWE4TUZUQ01kc3hvaEVIakVOV0VVaWdyY0JWTVhM?= =?utf-8?B?ODZIa1lyMG54ZnlYcG5GSytpbVYvRVhzVGZ1UEFkUHpCYUJqS1ozRTl4aE90?= =?utf-8?B?NU1mZk1BY1ZXdk9vVmZyeEU3ZG5mK3o5SEp6QkdDWXZGT0s0d05JZCtzYzZp?= =?utf-8?B?bk9aUHlzRk1LYUF0cUZKeGg1SERMcU5TZ0ZkcEtPcCtIVS9rNStIdHFWREF2?= =?utf-8?B?SDg0anhaMThvL0JVTTFRMGVBbVRnS0tRWHc4S3UyKzNGY1E5N3ZvckViWExV?= =?utf-8?B?SmVBVFRsVERpK3ArMkw1WENMYnB0cXZ3eVpPekxZQ3BDaVp4eHdXRys5cUF3?= =?utf-8?B?RHM4NEEzUzdRaWkvZ0Vnc2xvTXp2QktGTU1kUDlmM0h4TFFmOVk1N1AxdE1u?= =?utf-8?B?aUFUK0FXbld4TkI5VU9QWHVDK2N6dTRtYmhnd1h5aGpuY2xhb3R3OVpyU3Nj?= =?utf-8?B?YkYxYU1lYno5ejlMM0paaG11SkcwOVpuMHBlTzVwY051V0NXV2VoaVJNNFJ2?= =?utf-8?B?RGdZYUozbU1SclpJQ1VQM3lPd01YWURnY1ZyTmljR3VRZXpJbG4yUXZFT1BU?= =?utf-8?B?Y1k5QTJKU1FTenRsYWtEK0d1cU9HMEN2eC9rNUFrOW9uYjM0bnZaSnFaWllp?= =?utf-8?B?cTNWUktCUEg0K0xjQ00wWCtZN1NkeFhBQWxEU1dNVnI1ME02YWErcHZEbldm?= =?utf-8?B?Q3dNRHJTOHpJR1JIellBdG11NGw3THB2bzA2SGxkZWs3QnZBL3oyNDBTdUs4?= =?utf-8?B?S2xTWVIyVE9yTS81d2dPdU9rQUNqYWVSMlYzeWlBUnliTXVxTEJ6V25ma2lQ?= =?utf-8?B?dmUwV2o1OWp3ajNmS1N1eWhkZlVVdTljL3RtWVo0ZFF2dGpEVWpCTWl3cDhP?= =?utf-8?B?cVZSZWlvRndORmdENW9saTR6Mm81dk92VEZNekwxRlJwU3R1N2Z6M2N0bWxQ?= =?utf-8?B?bkJCMGEzUFhTVVo1ZjZ3ZWtSVk9yNU8yN2YyYnBwR1Y4Z1hucVNmcTZySkpk?= =?utf-8?B?NzlZMUNTdnVORmVPK0N4M0RvaUx3bTFVcjV5eHpETVpiTWZrN3dYY3Nndzlo?= =?utf-8?B?amVBVThJMlZnNDBIcFBjR2xubGdRTEhURTFXNGtvZjJNWVdSMFd6c1pCSE5W?= =?utf-8?B?U3NtOWZFL2pibEVXNjJ5YUQvb3hvWWJFTUVQOFlBU2I4UVlxRjV3MFhDOWVa?= =?utf-8?B?V2RRTDZUSHZVVDdpYmtHWTN4cXRLZzRXS3kwRWxlSGlrcmpRZWQxNkpPVEg5?= =?utf-8?B?UzZCYWpvbE5aR0RzREd5MXRyZDIxaWtmSkJtZVRtRXROWjlOK1NjODZoZWdy?= =?utf-8?B?VmpJMXNjUXRPS3E5YnZNdG8rSEZmUFR5aC91dVV6NlQvdGNuaHBXWXV6SWNG?= =?utf-8?B?bjNCOEtrR0ZjVWJZdk5hOFhpUHkzZHRha0FoNnQ3WllZNmNOUklQNE41Ymxo?= =?utf-8?B?QTduZThXVUZnSVYvL0ZwSDRVNXIxNWVSSENFWWV4dzBQdk0vejZHZHhxRTli?= =?utf-8?B?WlFTcStBamdVSFdsc0xuUGUySThRakJxWlRzVDJ5OUJKQ01BdWlPWDdoWW0v?= =?utf-8?B?L0JrVXB6MW5UY0V3amRQc05GSG5YWVVoRXNmdERYZXJnM1VRZzd4NWFWTmZT?= =?utf-8?B?NUZYSDk4bFZqd0dxZ1AzU3ZRV0g1Zmd4NlYxRm1mMzhiTDFGOHp6Z1Q4QTBB?= =?utf-8?B?bzJoTDkzOURqOG9VNjYyTC95RkNtK3I2RWpTMXhKL0U5RGRWV0VudVVvMEJj?= =?utf-8?B?Y3MydENPRTdyVzZFa05CQ2tNZmhjdmlYZ2dOaVozbHg5VG93YzN0eURwaDQ4?= =?utf-8?B?OUQ4ZWpqTjdHc29MNXlscmcxQitFUCthWlkzTEVoNDJhM1QvblRNMHVoamxw?= =?utf-8?B?ZFMvL2VveDhPY1dFSzBrYVFWYlVBVDJod0tSL0lEcW9La0pxNVIxQkFOSmtU?= =?utf-8?B?V1NneTh1WEpqTGt2cUczRFBISFZ1NTY2ZlZpTVRaVmlHRzYyamN6dExCb0Ns?= =?utf-8?B?bWc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85742e99-db2e-42e5-86ab-08de00b7fd54 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:58:56.6004 (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: rceUeM4j9M5V72v5SqzlZDJJ/p2nBShisQS4ukKZ3Xq7wk/3Xe8XCxPwsQW19yxL7cw1mrORD1ZpNXCSpcYfrg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 From: Matthew Brost Add partial unmap test case which munmaps memory while in the device. Add tests exercising mremap on faulted-in memory (CPU and GPU) at various offsets and verify correctness. Update anon_write_child to read device memory after fork verifying this flow works in the kernel. Both THP and non-THP cases are updated. 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 Signed-off-by: Matthew Brost --- tools/testing/selftests/mm/hmm-tests.c | 312 ++++++++++++++++++++----- 1 file changed, 252 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftes= ts/mm/hmm-tests.c index 339a90183930..dedc1049bd4d 100644 --- a/tools/testing/selftests/mm/hmm-tests.c +++ b/tools/testing/selftests/mm/hmm-tests.c @@ -50,6 +50,8 @@ enum { HMM_COHERENCE_DEVICE_TWO, }; =20 +#define ONEKB (1 << 10) +#define ONEMEG (1 << 20) #define TWOMEG (1 << 21) #define HMM_BUFFER_SIZE (1024 << 12) #define HMM_PATH_MAX 64 @@ -525,6 +527,8 @@ TEST_F(hmm, anon_write_prot) /* * Check that a device writing an anonymous private mapping * will copy-on-write if a child process inherits the mapping. + * + * Also verifies after fork() memory the device can be read by child. */ TEST_F(hmm, anon_write_child) { @@ -532,72 +536,101 @@ TEST_F(hmm, anon_write_child) unsigned long npages; unsigned long size; unsigned long i; + void *old_ptr; + void *map; int *ptr; pid_t pid; int child_fd; - int ret; - - npages =3D ALIGN(HMM_BUFFER_SIZE, self->page_size) >> self->page_shift; - ASSERT_NE(npages, 0); - size =3D npages << self->page_shift; - - buffer =3D malloc(sizeof(*buffer)); - ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - - /* Initialize buffer->ptr so we can tell if it is written. */ - for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) - ptr[i] =3D i; + int ret, use_thp, migrate; + + for (migrate =3D 0; migrate < 2; ++migrate) { + for (use_thp =3D 0; use_thp < 2; ++use_thp) { + npages =3D ALIGN(use_thp ? TWOMEG : HMM_BUFFER_SIZE, + self->page_size) >> self->page_shift; + ASSERT_NE(npages, 0); + size =3D npages << self->page_shift; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D size * 2; + buffer->mirror =3D malloc(size); + ASSERT_NE(buffer->mirror, NULL); + + buffer->ptr =3D mmap(NULL, size * 2, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, + buffer->fd, 0); + ASSERT_NE(buffer->ptr, MAP_FAILED); + + old_ptr =3D buffer->ptr; + if (use_thp) { + map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); + ret =3D madvise(map, size, MADV_HUGEPAGE); + ASSERT_EQ(ret, 0); + buffer->ptr =3D map; + } + + /* Initialize buffer->ptr so we can tell if it is written. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + /* Initialize data that the device will write to buffer->ptr. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ptr[i] =3D -i; + + if (migrate) { + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + } + + pid =3D fork(); + if (pid =3D=3D -1) + ASSERT_EQ(pid, 0); + if (pid !=3D 0) { + waitpid(pid, &ret, 0); + ASSERT_EQ(WIFEXITED(ret), 1); + + /* Check that the parent's buffer did not change. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); + continue; + } + + /* Check that we see the parent's values. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + if (!migrate) { + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], -i); + } + + /* The child process needs its own mirror to its own mm. */ + child_fd =3D hmm_open(0); + ASSERT_GE(child_fd, 0); + + /* Simulate a device writing system memory. */ + ret =3D hmm_dmirror_cmd(child_fd, HMM_DMIRROR_WRITE, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + ASSERT_EQ(buffer->faults, 1); =20 - /* Initialize data that the device will write to buffer->ptr. */ - for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) - ptr[i] =3D -i; + /* Check what the device wrote. */ + if (!migrate) { + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], -i); + } =20 - pid =3D fork(); - if (pid =3D=3D -1) - ASSERT_EQ(pid, 0); - if (pid !=3D 0) { - waitpid(pid, &ret, 0); - ASSERT_EQ(WIFEXITED(ret), 1); - - /* Check that the parent's buffer did not change. */ - for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) - ASSERT_EQ(ptr[i], i); - return; + close(child_fd); + exit(0); + } } - - /* Check that we see the parent's values. */ - for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) - ASSERT_EQ(ptr[i], i); - for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) - ASSERT_EQ(ptr[i], -i); - - /* The child process needs its own mirror to its own mm. */ - child_fd =3D hmm_open(0); - ASSERT_GE(child_fd, 0); - - /* Simulate a device writing system memory. */ - ret =3D hmm_dmirror_cmd(child_fd, HMM_DMIRROR_WRITE, buffer, npages); - ASSERT_EQ(ret, 0); - ASSERT_EQ(buffer->cpages, npages); - ASSERT_EQ(buffer->faults, 1); - - /* Check what the device wrote. */ - for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) - ASSERT_EQ(ptr[i], -i); - - close(child_fd); - exit(0); } =20 /* @@ -2289,6 +2322,165 @@ TEST_F(hmm, migrate_anon_huge_fault) hmm_buffer_free(buffer); } =20 +/* + * Migrate memory and fault back to sysmem after partially unmapping. + */ +TEST_F(hmm, migrate_partial_unmap_fault) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size =3D TWOMEG; + unsigned long i; + void *old_ptr; + void *map; + int *ptr; + int ret, j, use_thp; + int offsets[] =3D { 0, 512 * ONEKB, ONEMEG }; + + for (use_thp =3D 0; use_thp < 2; ++use_thp) { + for (j =3D 0; j < ARRAY_SIZE(offsets); ++j) { + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 2 * size; + buffer->mirror =3D malloc(size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, size); + + buffer->ptr =3D mmap(NULL, 2 * size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, + buffer->fd, 0); + ASSERT_NE(buffer->ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); + if (use_thp) + ret =3D madvise(map, size, MADV_HUGEPAGE); + else + ret =3D madvise(map, size, MADV_NOHUGEPAGE); + ASSERT_EQ(ret, 0); + old_ptr =3D buffer->ptr; + buffer->ptr =3D map; + + /* Initialize buffer in system memory. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + /* Migrate memory to device. */ + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + + munmap(buffer->ptr + offsets[j], ONEMEG); + + /* Fault pages back to system memory and check them. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + if (i * sizeof(int) < offsets[j] || + i * sizeof(int) >=3D offsets[j] + ONEMEG) + ASSERT_EQ(ptr[i], i); + + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); + } + } +} + +TEST_F(hmm, migrate_remap_fault) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size =3D TWOMEG; + unsigned long i; + void *old_ptr, *new_ptr =3D NULL; + void *map; + int *ptr; + int ret, j, use_thp, dont_unmap, before; + int offsets[] =3D { 0, 512 * ONEKB, ONEMEG }; + + for (before =3D 0; before < 2; ++before) { + for (dont_unmap =3D 0; dont_unmap < 2; ++dont_unmap) { + for (use_thp =3D 0; use_thp < 2; ++use_thp) { + for (j =3D 0; j < ARRAY_SIZE(offsets); ++j) { + int flags =3D MREMAP_MAYMOVE | MREMAP_FIXED; + + if (dont_unmap) + flags |=3D MREMAP_DONTUNMAP; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->fd =3D -1; + buffer->size =3D 8 * size; + buffer->mirror =3D malloc(size); + ASSERT_NE(buffer->mirror, NULL); + memset(buffer->mirror, 0xFF, size); + + buffer->ptr =3D mmap(NULL, buffer->size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, + buffer->fd, 0); + ASSERT_NE(buffer->ptr, MAP_FAILED); + + npages =3D size >> self->page_shift; + map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); + if (use_thp) + ret =3D madvise(map, size, MADV_HUGEPAGE); + else + ret =3D madvise(map, size, MADV_NOHUGEPAGE); + ASSERT_EQ(ret, 0); + old_ptr =3D buffer->ptr; + munmap(map + size, size * 2); + buffer->ptr =3D map; + + /* Initialize buffer in system memory. */ + for (i =3D 0, ptr =3D buffer->ptr; + i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + if (before) { + new_ptr =3D mremap((void *)map, size, size, flags, + map + size + offsets[j]); + ASSERT_NE(new_ptr, MAP_FAILED); + buffer->ptr =3D new_ptr; + } + + /* Migrate memory to device. */ + ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device read. */ + for (i =3D 0, ptr =3D buffer->mirror; + i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + + if (!before) { + new_ptr =3D mremap((void *)map, size, size, flags, + map + size + offsets[j]); + ASSERT_NE(new_ptr, MAP_FAILED); + buffer->ptr =3D new_ptr; + } + + /* Fault pages back to system memory and check them. */ + for (i =3D 0, ptr =3D buffer->ptr; + i < size / sizeof(*ptr); ++i) + ASSERT_EQ(ptr[i], i); + + munmap(new_ptr, size); + buffer->ptr =3D old_ptr; + hmm_buffer_free(buffer); + } + } + } + } +} + /* * Migrate private anonymous huge page with allocation errors. */ --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 A3D10273D9F for ; Wed, 1 Oct 2025 06:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301954; cv=fail; b=aOB/HKmqneKg3eQQKRQVWgKA5pYZOOehFQ8nJNntLUga0+S0qa14tRqh15hGhbMXypFreVKUgbAW0JAoJU/Y47VhJEE9XnFYvfalsdyu6FTg7dIgt4sA5yk5aUQ4rFpIsqR+rRnHoT1AVZ8xcp1sOo5U/1nQ95EdKVMe20l1epE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301954; c=relaxed/simple; bh=uNuUDnCUJUFBV1boFF9PNHLwX6rgSfX7DEqJ2J3EvaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=aAoy4rvGWKLVlbmCfgUNIMDaxzC3Rh0rR7o7vrH6pG2GNKPPvGGTYGFlNXE9XRRo0qGnh4+9Hrzub0SAcoDDUijMCLWyJbBftHaY+gwgB9WirSm/zYOzgHUapevstDKqpYRxYg4IM8wucM/ckZTaLe+HHVTHJdOu4KHJSl32vcs= 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=ikwtSQ5m; arc=fail smtp.client-ip=52.101.193.20 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="ikwtSQ5m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f84DJQzKw28KaO8Y150wjK1h4vKkCLMfwH/Mg22VJVcVQWn9q7on/d/mplfaW8QlV/f5aiwGQD555ryKocNJp21Ku1p/c+jFRGdkqS+nkTx9exXxVQmxjCx2uP9rMP8AR0dBbuhc3Txyn3FUdjx9/TeWT/b8XH6hmf6KiOF78gAT7Q+beRqMroppGI+XG4o4EnUwzTI+I0sfEHw+JRs0ICWrzBn+NFMoKpFOh4a7jbUG/BsYvRqpub+2LzcqzfMmpbIJIR5JprCp6mTLjtK2xqQ++rlzZrmtf41/mk9HEn5uDmV0R9sJvk5yRomWkLu71WiJH20F801X1tBqdI+RHQ== 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=8y9rkXr19BPcfATeFuC6hTaQVrI4WrDfcxacrk7C9Zk=; b=dYjXySeAvAiD6VJUmCGNFjPh+WnHl/BnQP+KlKUIbdBFpvGa3Udzq7VfREsz6hTB8Auy7xbuu6CxDZj9Yoms1eF929OhqcXQlX2XnoeSqSLwjAKQnpQDIPRizVrYmAOKxGdgeHEp4ETDvia+wNnRfAgM5YVdd3ErthPvv9SYUS07nYqqwMKYovG+e1SIFLKHUQCe2QYzoseNFXNW1h3llwnxCib7vCwqYjiyzDqTL4gIOF3Be2556Rb0B3HYO3bmGQsEUtbeycgIYmr5Mzpyzevh9nRg3BUbl4Mxf+gnxLpNQtW3nPfb07gt3LQ59Mmj2ciTPswc7+dd/BESOfSWpw== 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=8y9rkXr19BPcfATeFuC6hTaQVrI4WrDfcxacrk7C9Zk=; b=ikwtSQ5mWjPjFnhNPZse6a7PMzUFUupt1tLMYHQh3sdTVneVooGPMfhQdE9U2IOEmWV3fiB3ozJNwlLN0vKdqcAS8ISWpiCltg15h5We/AHqCWHwecL7b8X9Xw2vdxFL5ZlQlOO1So6ZEs1m8UOimf52SDK1QTGK3yFRGybiFmmLwtoVRjKbz40Pc0zMMWsK3mYVqAgixhWCKqs419e/i6rn0PjWruaTOmTE4Jwrzo5ss6ilRgcnE1vyEKzXhEdBacNEyfLLyfZxdgFYAog8ks4+H/jx3Ppk26VgIAtFpmAVwm9RdBC+nTk2yO4xnFZaampm4iNY6HwS44BQePTBEA== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:59: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.9160.015; Wed, 1 Oct 2025 06:59:00 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 15/16] selftests/mm/hmm-tests: new throughput tests including THP Date: Wed, 1 Oct 2025 16:57:06 +1000 Message-ID: <20251001065707.920170-16-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SA0PR11CA0095.namprd11.prod.outlook.com (2603:10b6:806:d1::10) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: b35cd213-d8c7-4b2c-6f18-08de00b7ff67 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?TjlKY3Z4UktYRFU3QzI5QU0zdDBzVURiMDdxUUg4TlFWbnBNejBmMWZtUFdk?= =?utf-8?B?Qm8rQ3RqYndCY09mSEU0UzBnUFB2dzJ0a0p4cWRoUlZISnNaMkRLUzExMWZC?= =?utf-8?B?T01EUDZXWUZvdzJJZWVXcnR4VWE3VWU3dnhQaWJGZi8xeGNmUVNnU3krU2dy?= =?utf-8?B?QlBiTzMvL1Urb2xiVTFicWxJSkhIeXhvZWkxcFJybHlXVXljMVZUNWM1cnRt?= =?utf-8?B?cWFXSGRMMEZZSGk1RXhYS3BGZ3BHVyt6bis5ejVoc0F3SXhudkZZUUQ2R3pa?= =?utf-8?B?QU4zZ2N6UU0vM1lSRHpHWkFSNm1qWXArOGN2UFpnc1NsaUhjSXJrR0FteEo0?= =?utf-8?B?MitMckI2bWxUMEtTMDh6UWtCMnFDRVh6Mm1IdkxRb3J1RkZQSDVmbXZSTUFW?= =?utf-8?B?aE05Y3lMWDVuR1hkU0hPQjRlN0RBZ1dWakFmdWUyM1dEYWEyMU9ESDYvUFpJ?= =?utf-8?B?Q29WbnVHdUM0amc3cmY3Zi9qYTNiZEF3M3FNckFnNklGQkRLT2VlZUM2V2s3?= =?utf-8?B?bGRkSEdZWXJoanpQNlhwaW9zeWpmOVlBb3RIelVLS1h1M1U2SDAyTFZsYzRK?= =?utf-8?B?MHRhOER0VXFyK0h0U0w3RVZ0OEpxaEJhREtMWUlXdmZZaVRpaUtlcVFwWllY?= =?utf-8?B?Z0Q0R0U3OG14VE9tZVlpaXNrNithWkFsQ2VFclRoaDM1TXdMa0JtbFJKYld0?= =?utf-8?B?cHJvWUVDeDVRK3VrWGZhS0xMa28vOFdQU215TUQrT3dTQ3N5Z1lLd1FXaTF6?= =?utf-8?B?YU9BVE5taTBzeWgzdndGcTdJMThzd3NLNzJkOTdjRjBPYzVXT2VITlJuSXhR?= =?utf-8?B?LzYwdHh3QlBzdFlQSS9OUkd0NU5GMkNVcTQrQitqVFZ3LzhpMUhRMlBuZEY5?= =?utf-8?B?KzMzeWc4QzQ1S2cvamdQOHFlWW1peW1UTDFpdmRkTGMrcFlvZ0s4QmRWY1l2?= =?utf-8?B?RnFzdDNtbGtNYmRlMU5FRFBkSHZJRDFoZGc0TUY1M0tzOER6cnFzNHNuYmpF?= =?utf-8?B?alRoZUNvVjRCYjl3Nk5McG1Zcm9uSHB2UEZkeFVENHBSN0txSjdQMWd3TGM4?= =?utf-8?B?aUQrSEJ6UzRaU0xVbGxjakhCWWFMT2svaW5ldkFtZURjZE4xa0xVY1U3eWRX?= =?utf-8?B?Y0c3RjBVZkhwYkVUSVhza01PUklQMWdSNVp6MWRrRXU1UUVvckdCbVlSNmF6?= =?utf-8?B?dkY1QlBqMmJCRlJ4aXBIYmZsZyttZ1FNK2JSQlVoVndvaHBSbmh1Rk9Mam5i?= =?utf-8?B?NlVjU3pyMmpnUzVrSm1tTU5HaTRZYU5mM0tHd1lUWjgvYXJnZ1V0eW5TcTFt?= =?utf-8?B?cGQ3UUQ3SXpxWnJtZi8wZ2wvKzdHK3Z4MERIWXltaWF5cDJGclFtNXdaR3pU?= =?utf-8?B?UGVqdmk4bWM5djBSNTcrZG05RitOdjZ6U2ZETElZaVQwdkRvaldHQTJPRWlB?= =?utf-8?B?dytpdGxoRzB2azFyNmdCTjdkM253enhQMTkxSmIxclYrT1hueVo5UW9UMnZX?= =?utf-8?B?MmhETUErS2pPcVlQY24rdW1pTGY2bDRkU3VWUWlmSnpST1lnMlBBTUF5dk0r?= =?utf-8?B?R1E0cEkwR1pHbFBzZEV5ejJZdHIyRllBdGliL0cwRG5SMVJxdzgvUWVndXN2?= =?utf-8?B?b1pRcjFlang0THo4Q1JGQkFXeldhbTNsbnBOMnlBbmsranROcmpSMnpzalgz?= =?utf-8?B?eXZBbEdmWnRzMDVYVzhUQlp1OEtLMFBxNlB6ZnV1eEVDSHVKdHY4ZHZVTzZy?= =?utf-8?B?ZkZEN1dQMk1PSFlFZmcvMng5YTMwajczNjJiSGwwWnorOVVyYmxXK2dWWVlp?= =?utf-8?B?M205d1ZyVDdWL1YzV2lPcU5kQ1kveGorem1HYWRsdlVPSDFUOGtmQlp3alFr?= =?utf-8?B?aFh2T3BnUGNzSWdLejhNMTRsQTVtcHd0N1BpQ2hJKzhZODc4VEdYL21ncngy?= =?utf-8?Q?YjkJDArBZK6WcGHlKP4qz8645noEeSgh?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MlFtY0llNTg0NDJnNnY3NWJ2dE5QRWJ3dWtwZkJiRklmRUtBazQwUUR4WSt3?= =?utf-8?B?ZllUNTRoTlNnNmZ4T3c5NmVjd3B6RW1Id1pTaHRrQTRtYWNBdm5DU1BSUDNw?= =?utf-8?B?azh6WGl3dHdncjlqbWUvMzRENHRXQ29VR2FXb0pNdEJGU241K0ptc3g2S0hr?= =?utf-8?B?d3Z5NnoxSkNPRmo3c2xkMTB0MXgzVUxQeXFsTmphazgxcFpNK0g4UXdGWGNh?= =?utf-8?B?MHIvUktIOHA4dEtuUWVOWG1ucjFxb2MybHNhVmlpZWYzcSt6bHRUOGluMG4w?= =?utf-8?B?MWJmRlBlTnpoMmUwSmRsdW11ZEQ2bTlXa0RLV1FpOGE5YUZEQkZIanJQQWlS?= =?utf-8?B?MnFnVkV6a0hzQkRaQTNrdnlnRUZLMlp6U0xxUDBQWXkwVGlZOGkydWJ5NVoz?= =?utf-8?B?VVkxdGVoRDRiVTRKK01jMittYTU1blFMd1UzNERmVlVGbFE1OGNybXIvelZP?= =?utf-8?B?T2dKcHRZSnoyQXM0NnhROWJjdSs4WStRdENzdEdwbFdvalcwSFlGR3VkV3pU?= =?utf-8?B?ekYyM3poZGQzRDVody9JWDdWMVhtRGxwc0ZyeG9zR29pUlJlSXJQSW54T3RZ?= =?utf-8?B?MXY2WkZGckRJN213UFV1d2xpOFJLM0tpcXBVcmVxajdyeThCUU1oRjJnalp4?= =?utf-8?B?Q2t2MFI4RU5Tc0lCWnp0ZXRzYUM0SDlsVVhSNWJ1bEw3Q3g3R25NbG9oZXFL?= =?utf-8?B?WVE4aUtMSkdpekM2eUhBYU1DZ01HWGFQQ3E4emtBelRiZmdDRnpUZW1UUnBN?= =?utf-8?B?WDhSZUhMUW5aSVF4dW4rek1mVVlmbDJRVlpvZ2ZGWkl5WWFxUmhHZ2krMmt0?= =?utf-8?B?NHhpaVk0QTdlcXhZQkdtUm1wRWd4T1lBcEhtVGhUTnp0RkxWMVhhYllYMVla?= =?utf-8?B?cEhRT1c1SzUzdGhqQ0ZLeTZ0cVFsbTViTHpoZ25xcThGZjRsOTNoOWxFTXg1?= =?utf-8?B?bGdTTnkzVlNkUExDMDZZZ0hta1pZRU15VWpLTS9kYVUrSThESVkwVkc4UWkw?= =?utf-8?B?clJmTGlBMURvTEt6TEtDMGhkOTVTWnR2MjZqM3JwQzZ6Y216eUcxbmIwWWJl?= =?utf-8?B?Q0xyaXNhUTRuTHJJU3AvNy9kQ00va1BpS0VHbDNITE1LWnFiNDV1aUhHQ241?= =?utf-8?B?cG9ZT0l0ckpRZTJCSm81K1Nab0plb0lDNW9wWmNFRTdOQng5UG1CMVNhY0pF?= =?utf-8?B?TC9nWWlNeFF6NXFCdkNKZVRBNjdiTDVkR3lhK3BUQ3FsSVZFMktiQlB3eE9F?= =?utf-8?B?QzVVYmprWXY2N1h4MmxSZ2FyTytsblNEL3NzN2c4QnFQOEpyb1dUeDJLR2tx?= =?utf-8?B?UDRWWStGaHMySTc4d0pMU1dYZDZCQjlTTG0wNHQ5TVVvSzhHYVVWQkh3aWdY?= =?utf-8?B?Y3lpNDV0aDlTZTVabFBzcGZDSy8rcTZxSFNNd3lDY1ZUK2RNZlNaYkk1N0Vm?= =?utf-8?B?Y3k0cFQrK0RsTWlnYnJKMDBXRjV2dWp2QzNJSnlPck9HZTB5S1Z2ZHozTHk5?= =?utf-8?B?SmQ2UGJRMDJ1K2hERnFFdWYwY3FIbUNialhFOExsbngxdDdMcjBRdU8vMjVp?= =?utf-8?B?bWQzMkJ4aGpxKzBkWE9ieklWMDJuTFEwN2w5VHplYk5ndWZqNDdEYzNRM28x?= =?utf-8?B?VENLa29NejFaM2VkVWxsYzllVEVNdXNEVllDZlVUNUNMOFZIS2YxQ24zd0V6?= =?utf-8?B?bVhhbFdQVDNlR0preXJzUUE5U0FxUU1nZ01VTVdEcnh1UERpNytLdGRaQnhD?= =?utf-8?B?SXFhRmFxWks5T2VLYjNWSEltSTNJNXMyL3pJMERXUWdCQkVSSk1sT0NyV01l?= =?utf-8?B?MGpCUFh4RDFmb0hOSVdDQ2ZnanFod3FKK2pxVThRMzlWUTdWOG1rUFVkQ1hH?= =?utf-8?B?SHJjK0lxMzlHQWJ3VUtjVHNUeG9xTStGOUdWd1cyV3E4Y1dFYUdDdE01U3dr?= =?utf-8?B?Tzd4NjJWb2V0dUpPTStadmpHT2pRVjNMdlVsUG1tVzlrVE9qVytvYWtIRVRu?= =?utf-8?B?OThFYk1YYlFDajJNbmNSQ3NQbjVUZWRYUzJEbW51M2NobXg4Vi92RThGalh4?= =?utf-8?B?MXhjQkFQNEUyU09pelhyU0JTZmtqVmtHTGxZUGRJdk9uQzJYZUs4TUR5UHFQ?= =?utf-8?B?d3VEZnNWSmkwTW8rSkYyVlViSlZTQmw2NlVzOEk5UkpWdWpCS2F6SlMzZDhL?= =?utf-8?B?Vmc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b35cd213-d8c7-4b2c-6f18-08de00b7ff67 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:59:00.1461 (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: +5uPUgYW7WnlWjEdwo7XD8HI9SB5UIPnc9zuvBOCo1XmH35oxaBlY+ghv1soG7QmIpGtDE21628kngp7LftCbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Add new benchmark style support to test transfer bandwidth for zone device memory operations. 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 Cc: Andrew Morton Signed-off-by: Balbir Singh --- tools/testing/selftests/mm/hmm-tests.c | 197 ++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftes= ts/mm/hmm-tests.c index dedc1049bd4d..5a1525f72daa 100644 --- a/tools/testing/selftests/mm/hmm-tests.c +++ b/tools/testing/selftests/mm/hmm-tests.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 =20 /* @@ -209,8 +210,10 @@ static void hmm_buffer_free(struct hmm_buffer *buffer) if (buffer =3D=3D NULL) return; =20 - if (buffer->ptr) + if (buffer->ptr) { munmap(buffer->ptr, buffer->size); + buffer->ptr =3D NULL; + } free(buffer->mirror); free(buffer); } @@ -2657,4 +2660,196 @@ TEST_F(hmm, migrate_anon_huge_zero_err) buffer->ptr =3D old_ptr; hmm_buffer_free(buffer); } + +struct benchmark_results { + double sys_to_dev_time; + double dev_to_sys_time; + double throughput_s2d; + double throughput_d2s; +}; + +static double get_time_ms(void) +{ + struct timeval tv; + + gettimeofday(&tv, NULL); + return (tv.tv_sec * 1000.0) + (tv.tv_usec / 1000.0); +} + +static inline struct hmm_buffer *hmm_buffer_alloc(unsigned long size) +{ + struct hmm_buffer *buffer; + + buffer =3D malloc(sizeof(*buffer)); + + buffer->fd =3D -1; + buffer->size =3D size; + buffer->mirror =3D malloc(size); + memset(buffer->mirror, 0xFF, size); + return buffer; +} + +static void print_benchmark_results(const char *test_name, size_t buffer_s= ize, + struct benchmark_results *thp, + struct benchmark_results *regular) +{ + double s2d_improvement =3D ((regular->sys_to_dev_time - thp->sys_to_dev_t= ime) / + regular->sys_to_dev_time) * 100.0; + double d2s_improvement =3D ((regular->dev_to_sys_time - thp->dev_to_sys_t= ime) / + regular->dev_to_sys_time) * 100.0; + double throughput_s2d_improvement =3D ((thp->throughput_s2d - regular->th= roughput_s2d) / + regular->throughput_s2d) * 100.0; + double throughput_d2s_improvement =3D ((thp->throughput_d2s - regular->th= roughput_d2s) / + regular->throughput_d2s) * 100.0; + + printf("\n=3D=3D=3D %s (%.1f MB) =3D=3D=3D\n", test_name, buffer_size / (= 1024.0 * 1024.0)); + printf(" | With THP | Without THP | Improv= ement\n"); + printf("-----------------------------------------------------------------= ----\n"); + printf("Sys->Dev Migration | %.3f ms | %.3f ms | %.1f%%\n= ", + thp->sys_to_dev_time, regular->sys_to_dev_time, s2d_improvement); + printf("Dev->Sys Migration | %.3f ms | %.3f ms | %.1f%%\n= ", + thp->dev_to_sys_time, regular->dev_to_sys_time, d2s_improvement); + printf("S->D Throughput | %.2f GB/s | %.2f GB/s | %.1f%%\n= ", + thp->throughput_s2d, regular->throughput_s2d, throughput_s2d_impro= vement); + printf("D->S Throughput | %.2f GB/s | %.2f GB/s | %.1f%%\n= ", + thp->throughput_d2s, regular->throughput_d2s, throughput_d2s_impro= vement); +} + +/* + * Run a single migration benchmark + * fd: file descriptor for hmm device + * use_thp: whether to use THP + * buffer_size: size of buffer to allocate + * iterations: number of iterations + * results: where to store results + */ +static inline int run_migration_benchmark(int fd, int use_thp, size_t buff= er_size, + int iterations, struct benchmark_results *results) +{ + struct hmm_buffer *buffer; + unsigned long npages =3D buffer_size / sysconf(_SC_PAGESIZE); + double start, end; + double s2d_total =3D 0, d2s_total =3D 0; + int ret, i; + int *ptr; + + buffer =3D hmm_buffer_alloc(buffer_size); + + /* Map memory */ + buffer->ptr =3D mmap(NULL, buffer_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + if (!buffer->ptr) + return -1; + + /* Apply THP hint if requested */ + if (use_thp) + ret =3D madvise(buffer->ptr, buffer_size, MADV_HUGEPAGE); + else + ret =3D madvise(buffer->ptr, buffer_size, MADV_NOHUGEPAGE); + + if (ret) + return ret; + + /* Initialize memory to make sure pages are allocated */ + ptr =3D (int *)buffer->ptr; + for (i =3D 0; i < buffer_size / sizeof(int); i++) + ptr[i] =3D i & 0xFF; + + /* Warmup iteration */ + ret =3D hmm_migrate_sys_to_dev(fd, buffer, npages); + if (ret) + return ret; + + ret =3D hmm_migrate_dev_to_sys(fd, buffer, npages); + if (ret) + return ret; + + /* Benchmark iterations */ + for (i =3D 0; i < iterations; i++) { + /* System to device migration */ + start =3D get_time_ms(); + + ret =3D hmm_migrate_sys_to_dev(fd, buffer, npages); + if (ret) + return ret; + + end =3D get_time_ms(); + s2d_total +=3D (end - start); + + /* Device to system migration */ + start =3D get_time_ms(); + + ret =3D hmm_migrate_dev_to_sys(fd, buffer, npages); + if (ret) + return ret; + + end =3D get_time_ms(); + d2s_total +=3D (end - start); + } + + /* Calculate average times and throughput */ + results->sys_to_dev_time =3D s2d_total / iterations; + results->dev_to_sys_time =3D d2s_total / iterations; + results->throughput_s2d =3D (buffer_size / (1024.0 * 1024.0 * 1024.0)) / + (results->sys_to_dev_time / 1000.0); + results->throughput_d2s =3D (buffer_size / (1024.0 * 1024.0 * 1024.0)) / + (results->dev_to_sys_time / 1000.0); + + /* Cleanup */ + hmm_buffer_free(buffer); + return 0; +} + +/* + * Benchmark THP migration with different buffer sizes + */ +TEST_F_TIMEOUT(hmm, benchmark_thp_migration, 120) +{ + struct benchmark_results thp_results, regular_results; + size_t thp_size =3D 2 * 1024 * 1024; /* 2MB - typical THP size */ + int iterations =3D 5; + + printf("\nHMM THP Migration Benchmark\n"); + printf("---------------------------\n"); + printf("System page size: %ld bytes\n", sysconf(_SC_PAGESIZE)); + + /* Test different buffer sizes */ + size_t test_sizes[] =3D { + thp_size / 4, /* 512KB - smaller than THP */ + thp_size / 2, /* 1MB - half THP */ + thp_size, /* 2MB - single THP */ + thp_size * 2, /* 4MB - two THPs */ + thp_size * 4, /* 8MB - four THPs */ + thp_size * 8, /* 16MB - eight THPs */ + thp_size * 128, /* 256MB - one twenty eight THPs */ + }; + + static const char *const test_names[] =3D { + "Small Buffer (512KB)", + "Half THP Size (1MB)", + "Single THP Size (2MB)", + "Two THP Size (4MB)", + "Four THP Size (8MB)", + "Eight THP Size (16MB)", + "One twenty eight THP Size (256MB)" + }; + + int num_tests =3D ARRAY_SIZE(test_sizes); + + /* Run all tests */ + for (int i =3D 0; i < num_tests; i++) { + /* Test with THP */ + ASSERT_EQ(run_migration_benchmark(self->fd, 1, test_sizes[i], + iterations, &thp_results), 0); + + /* Test without THP */ + ASSERT_EQ(run_migration_benchmark(self->fd, 0, test_sizes[i], + iterations, ®ular_results), 0); + + /* Print results */ + print_benchmark_results(test_names[i], test_sizes[i], + &thp_results, ®ular_results); + } +} TEST_HARNESS_MAIN --=20 2.51.0 From nobody Wed Oct 1 21:27:09 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010020.outbound.protection.outlook.com [52.101.193.20]) (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 EE0A12DAFA5 for ; Wed, 1 Oct 2025 06:59:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301957; cv=fail; b=OmKo4V2cdX8v47My7Hg8vXtxQJBI9+jF8yyjN2nfIsdN5FWxU/m3/4DJ4VGXNuauxsSB4WlFmVHUyNKzDb2ZLtq050OdAgu/AZYidP5o3Lu7JR2qT40Af//VM3AHsWzD2Vg9Z/MbkNy7yyqMMOBkM3BC3OYhrm21agLQxVzhp7U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759301957; c=relaxed/simple; bh=nRagOofese3Y/TOGMKoTZn2i/huwQvD29s+Cp5zIASk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=MSYYn59pxynopl0kJqn937Z4J/zmgTxvDmrIUm2Ek1bX3wKPZm11PqSPhS0tHdYo7m2Yokgqpfqk1epNV0QpXKM3EAbXEHD8vAAnt9GC4xLVnOXgcqPbrcwMFsrXYpWdzNGpJ29XPV88aiQV6+gXzUXW+5+JZSVBtATlHxZ69VI= 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=uq/4YVDP; arc=fail smtp.client-ip=52.101.193.20 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="uq/4YVDP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZrgwdMkNw3urY45iIgqOTAB2MN9SToVnQU4qbC7CNbNFi8gSee/GdXpuwpugqDo1b4F2LXqhVO68e9UfaVDK6wXy4TQ+SaCQeWk+vAAHiOPDnfWD45DpU3vFQ9iUpGIUqVQriJD2tbqHH+nuiDCqDvOWkZQRmdA4PCvRLiUccu5FY00Fingt+wym7xJ0Q1bWKUyUvPLuOfxoU/M687UQsdgBt3klKAWWyZhXhw0vXUdk0KBFt94FoG3DPLlvoYnCvs+TnuP8PGPq5jqdYVjCnaWAdhcAWhS9UMqAcWxAlczjXEPtxgVngoAtDvF3emfvHkrcOKEDoWCut3jWCjbuYA== 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=XigfTE9kFgchjsvKXVHaHK2WyVy+8UAVmn4vuI9u5wo=; b=tcHhpe6zrZmEjVmomdOLqaaEe70U5Kjh2BXUB+NcNmDeTaOIUa0d3R9lVzrbZQjUPWKvcM9TEb7H9c6iHhNjrUmbYawrEg2GsLqFDRIE4vzx/1R4JCbSaZF/CSzgTEsL8Pn9GmG5ogktGm0rgbsy0KNzrCDy3YAiqkWVnNslWspU9XNzPg48oYn+iIYexQRA8tZrvTXqcMDdI0id6lniqMG/o+4bNZwXleugpt405q3AXOVO46J5b2Fv86TdFzOFab8evkBQArmyABFelRwQToAppyNIQzwXkeXN6KSepKtlKzo6gz9CO0Rm7GNnqKIaTjcI/aQizNoV8sZ1s97IgQ== 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=XigfTE9kFgchjsvKXVHaHK2WyVy+8UAVmn4vuI9u5wo=; b=uq/4YVDPIa3WCmjal6x8Z3UtGPK0ZLatAMfxWQ01+F8IZKUEAaNh7hoPrRJT3SuA8p+kYRKSAYPEO5UEid2Y/gp55qh7kgg8lQNGJcKgyY7Y8/zJ1hk6EqW1SHshLrtgH+NA/9V8XPXeLzpUxIGS79QcW61Jw9jUq8COoJrTJ4YzaWp+Z9m7AeibJ6QvgktmilU/TNLbsuodzOM1QCeCEsyEnOjTRrNKscd4AIe2OT/fJrd1yIe0VrCjaUlzIDgSN/x+ofOamtIMnnbIMMlho77+V4kRAtZxhadtzJe8WQx92YWJPPw+OQzTHqSgrBEzfMFFMG+5OGyghvTmJ37qVA== 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 CY5PR12MB6299.namprd12.prod.outlook.com (2603:10b6:930:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Wed, 1 Oct 2025 06:59:03 +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.9160.015; Wed, 1 Oct 2025 06:59:03 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Balbir Singh , 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: [v7 16/16] gpu/drm/nouveau: enable THP support for GPU memory migration Date: Wed, 1 Oct 2025 16:57:07 +1000 Message-ID: <20251001065707.920170-17-balbirs@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001065707.920170-1-balbirs@nvidia.com> References: <20251001065707.920170-1-balbirs@nvidia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SA1PR04CA0011.namprd04.prod.outlook.com (2603:10b6:806:2ce::18) 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_|CY5PR12MB6299:EE_ X-MS-Office365-Filtering-Correlation-Id: 70971075-b7e3-4c8c-8851-08de00b80174 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?YjI0UGtncm9tREZOdG9UN1dxR0tRRldLc0Y5TlJaQnhiQ1hPWVRtWGJFM3Jt?= =?utf-8?B?R0d4QnFyL2lRcE9qMGFWalRKRkNDZGJ1eVQwOGw0VnByUVlzTGpudGxWRW15?= =?utf-8?B?dDAxTjJHRnU3OE4zdnorUUV4MjVONVRFYW1iWmIyU3FVWmVmdE41UjRWeExW?= =?utf-8?B?cFdlQUFCSWxtekVvaC9QQXdMbzVvbHppMUVNSTFGRGhwdzFEU25weVZWbkNs?= =?utf-8?B?ZUdGQ3Vmb1pqaTVhSU52U1pqRWhkMTZBTmV0MWt4UWFKZjB1Wi9yZFFFc3lK?= =?utf-8?B?TU9VZWNpaGN3WVhYUG9NMVU5L2VyMkttWkgrQmJhdHlEUjNOUXNBZUpVSjg5?= =?utf-8?B?TFBZY21ZVmF0N0dtNEN3VGZvZHNvMGpkT2RzTHJBbVFqZEozWUpkVWF0ZVp4?= =?utf-8?B?MDRXZTgwNTYwc1BZczhHWWdWSUh1T0FkdVkwQXNTQlVmTXhDQkZuRHk4V3U5?= =?utf-8?B?Zmp2eERmY1VJQThHc1pQVUh4NzlCZ1FPQW5uMEg3a0gzMVlwSVlqSGxORUFF?= =?utf-8?B?K2Rzb2lQaUR2dVhyQlB0a3JicyttN0o4RVNYeVRZRkZVakt2anRDQkJyc2dl?= =?utf-8?B?Y0phMzRvTVhDL2xDNDd3TVpMVVVCSFhmTDdzd0pDdlYxaXFwWTdMdndQakJH?= =?utf-8?B?ZC92bk00MmhjdTQzYXRnTkFrOXFkclNLdU1Ja2R1RFRwKzAzcW5nOFlCRDZx?= =?utf-8?B?b1ZCUVlpOXN0Y296cHp5dUwrcUJuWjdIUjBMbDJ4QjJYTmhWMDVWRDc3QWFw?= =?utf-8?B?alRDSERWcEtPZGN0WVNYaE5PK0dxRnNwSElFUk1NVjMyM2MyUS8wTHN6Q0xC?= =?utf-8?B?VkcwN045QkJXMHZmZHN1L3FLQzFWbXJrV2grVk1uNmJydjhPVmh2Q29Xb2tQ?= =?utf-8?B?b0hqcERUK2NjVm1jbUUveTdaNVkxRkJ3OVpQSm9JT3h3Yy9TUmkwTmY2bGpY?= =?utf-8?B?cGxJd3lVZ0V3dWZYanlGZUhRNDRVZDhocDVSWkg5aFpyNTFLblFNVUxPbDQy?= =?utf-8?B?eXlZTm0xYUZ4eW0zZHdXU2Uxdjd6cXgwd0dqd0JDSW1yU01BTHYvc3JzeXNv?= =?utf-8?B?WlVoWUtFYWE3TEtUTlFqYzVNcGxSakluWDVEdTdsd0hoZnpFQkFIY1ZPNXJi?= =?utf-8?B?bVZPMEZrV3MzM3p4YUNpQ1JxQ1BiWFdiWDE3Rm1maWFtbzA3eHZHN01ub0Np?= =?utf-8?B?T21tQXdySjNqZUdOQXVnS3dvK1BOa3laaWcvYS9HZCt0dmtoZW9vNUZlekNZ?= =?utf-8?B?RFZtMHNGY3FxVmYyNzZ6KzlrV2JPREJ2Y0VtRVBTdWhXQkxlQmVpUDRadktR?= =?utf-8?B?UHZSSWpKUUNyRE1tT0wxMDUxUmNvdStRYUJkUkdhTm5yeU02OWgwZW40OWxz?= =?utf-8?B?OXhGejRQeWUvcEZpeDVlaHpLZWVxd3lxQ2Zsa3dFc0Y5bmJObVJNUTJRWDl3?= =?utf-8?B?ZmlTa1A4TEJZeFZWL0NRZ25jdTVUaGFjRUVCY2VaWU5nd0RSK0ZKYmZIYTFV?= =?utf-8?B?T05UVy9NRGplNTc3bVM3QkRYc1VkU1l4THNCTkFlMlh2ZGJVVHdnbW1qdDk5?= =?utf-8?B?SnkwMy9kS0xGZDQ4cWxPRHoxK0ZLdTl1WWpmRFRxcVkxNHFpSzYxMkxVb2N6?= =?utf-8?B?bVpHcW55eFQyMktEQ0g5SUxzRXNaZUhuTzRrQmlKdC9RRFJDYXhlaU1DUnRF?= =?utf-8?B?dVY1K2h0OVVqd2psZitybU9ORk4rS05BYS9zQXlkMUk3TWN3M21Va05nZGVs?= =?utf-8?B?eFJRNlR3TG5GUnR3R2ZrUG1LcXFXNjYvdGJISXRpS3BMQVUrWUpoemZiMkxF?= =?utf-8?B?UFNBdGpGbzQxc29ObDEydUJQMEFuSUNyb0Rpczg1VFl1MndDQ3I5OE9ZQTdt?= =?utf-8?B?VWRKeUZDOW9ycUZWc3lUQUwxd09XcTRkMlNHb3VkTkJxNEc5RkV1TEljbzF4?= =?utf-8?Q?onJ40qg4s9vuZg51rZTFpCcwkwzIZGSe?= 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)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZkU3OGNwSGpoMldsanlQbXIwQjRuKzkyVktISEdld28ycitQWE10K3BVRWps?= =?utf-8?B?NzNTVVpyTU53Qms3aHYxcWZMZDB2d1lGQ01ZK0Z1c0RLeitMaDllSUZwT1cx?= =?utf-8?B?UW1JeFU2a0RKMjAvMlR1Y3Rwc2R4SWVQdXFJcDMrWFFJbENXSkhjV3U3RHJ2?= =?utf-8?B?VVRMLzA1YUppeTlTR0xERmYxOG1FS2xTYUNaZ2daMjBGUW5NRmRaTDNzZEgx?= =?utf-8?B?ZEg4ZWRZaURVc2FtaitkR09rTU5GcVRESGt0S29sMVdhVm5UemF6Mk9ZN3dQ?= =?utf-8?B?T2dXbUFTODlnRlRMWHdUOEt1NnJTWW1mZ1REdHNLYm52MmUrMlBQdDY0bDNh?= =?utf-8?B?OERBT0tLZm9iOCtHL3N4dkFicElKaEtpd0ljQzNScWdnV1hjWmw2WElkVTV3?= =?utf-8?B?aWhabHI5a3ZwcVUrdElWYmhxYWZ3ZWhVb2xCc25MMGJtL3VscWJscTZ6Zi9G?= =?utf-8?B?NzArKytiS21oRnljWUFnUUVRQnM3eFhETzVFZjNvTHVoWEd6ZUlsTk5QSzBS?= =?utf-8?B?VTVERjMzWWxNaStabHZNUThQRmlGZ1hBVTBPcGl6Y25hQ1VCL0V0WFdYQmoz?= =?utf-8?B?ZWZocTNtcjlJSjh1TTJVNUJhakY0S1Badmdzbmp0VjhMWWdIc2IvV0pJbGIx?= =?utf-8?B?b050WHV4QmVobWFQbmEvQ2V0YWxFN1hUczNGL29JeDAweDdPMHpEQk1xSjNF?= =?utf-8?B?L0JVMUhablVtK0FnMDRXcHhHRGREV1ZYNnJqelpYTTNOcE5Wby9xLytic3Rp?= =?utf-8?B?TUlBLzBpUVhlZHNyMmFBMmo0YWd2OUpMNEtMVmRkZlZ0TVZrd3dwU0NlRGxP?= =?utf-8?B?SHA0dnpHSE05UWtTYWxpMW1pTGVHc3J2T0tKUVc4SjYwU3hmRjdzWWs2WjBm?= =?utf-8?B?L1MvVHRWVkRkd3VYemVHdUVWTHltSEp4Z0dEc2JIeU9US003SEVDcFlrRWdS?= =?utf-8?B?cXEvK3MyRFNWNjFVODNDbzd5NDlSL3JYc2xOZUxCcGFNTzJyV1VIYzBjQWZW?= =?utf-8?B?a016MzhuL0FjeTlpeWF2K0FrNlg2UTJjRjExeGttem0rTXAwY1ZNK0ZyYWpP?= =?utf-8?B?MDN3V0JySnBaU3lGYm9ISnhFMTVwZ0x1OFpiTnZJdWdEbjdWZktSandHQlhh?= =?utf-8?B?eHdaWDFpYitWYjVPVEU4R2Uvc3dYTTEwWWFKeTF5UWVnT2hTM1hPRnRsQ2Qw?= =?utf-8?B?NVcrTWVnbFFqYS91SVJqNzVjSGI4bVFkMS9TeG5TTS9rOGYyWkJHNVQ5c1Rl?= =?utf-8?B?UDFDOHMvbTdxOWFpYXpZQStBVlk5U0l1THltSDNkUm5oRGo5b3dPQ0h1eStD?= =?utf-8?B?aUlNdEMrNFNMVmRkSWtTOG1Ja0FjYTBzUWIwQlQ1S3ZVMTFaSTlwM0xialpZ?= =?utf-8?B?cGRQU2tMYWVMR3BoTDlBRDVjeVNvV0QwU2pOWDAydUkxV0N6cmlKZGdBQTAx?= =?utf-8?B?YWkrVC9GOHNqRFZmc2c0NjB1a3ZsUGYyRVRXRkZzb1E3U3RLTWhpbXM0d1J0?= =?utf-8?B?VWtYbDY2YWY5Sy9WQ3lCdk5YeHlzVFlQb21idzNRQVhET0R2M0xqbExKMmVj?= =?utf-8?B?Z2ZqZWVXL0c3VmtJTmZyVTd1dlhsdEhScUgxTXVFYUlHaFR0c2FvbUphR1Fw?= =?utf-8?B?Z1MzMnUyR2ZOd29FWXZoeDFSSnZacDYyV210aFJ3VXVveEJDMkhtdkljZWdr?= =?utf-8?B?TkthdjFxcGZPcjFCN21YTExVRE1QQ0RLcXFiL3ZGaXBVRWdTblhmeUJ4dFhL?= =?utf-8?B?Slp1L3paUVRPZCtyb2hNRHVBb254a3IyLzFwNHpkYy9KdGZjQi83cWVzOGNz?= =?utf-8?B?MFdwMlFTRnp2V0NSS0ZNVUlhKys4VFVHN0piUFFMbDZkamQ1WGk1N3lUdUU3?= =?utf-8?B?MFVIUWJRQWVyWmpLaGtVaDRhbnRLVmluUVphT2FuMzBBUkFIMXlPaEZTeGlu?= =?utf-8?B?L3ZVYU5ObnhtdkNUQXNMb0ozVWdSbDhad0wycEpUcSt1MUJxb1VUMldtRWQr?= =?utf-8?B?clB2aGpialJLaFpMd3JwSlN5Vm5EdVdnWVRNNVAzM2IwWmkwdkttRXpnajFH?= =?utf-8?B?eTJ2RWcyc1VLSU9ORklQcGVVSU5RVUFpYmVsV1BYd3pGU04vL3A1akV3T3Jw?= =?utf-8?B?MExKR0M2eUtNVTYrbDZLbzlhdUhybkdXRHpkMjBnZWZGb0YyM3VrSW5RMmdG?= =?utf-8?B?eGc9PQ==?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70971075-b7e3-4c8c-8851-08de00b80174 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2025 06:59:03.4870 (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: m5gpp2RA2sSpMg8XUEwONPdHJjemw6OGrm70/jjC6JDuUBB6cBNntI3YZM+78vT+S7ZWi3dAGv67L63x6lbjeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6299 Enable MIGRATE_VMA_SELECT_COMPOUND support in nouveau driver to take advantage of THP zone device migration capabilities. Update migration and eviction code paths to handle compound page sizes appropriately, improving memory bandwidth utilization and reducing migration overhead for large GPU memory allocations. 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 --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 303 ++++++++++++++++++------- drivers/gpu/drm/nouveau/nouveau_svm.c | 6 +- drivers/gpu/drm/nouveau/nouveau_svm.h | 3 +- 3 files changed, 229 insertions(+), 83 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouve= au/nouveau_dmem.c index d34288ebe7d2..244812e7dd69 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -50,6 +50,7 @@ */ #define DMEM_CHUNK_SIZE (2UL << 20) #define DMEM_CHUNK_NPAGES (DMEM_CHUNK_SIZE >> PAGE_SHIFT) +#define NR_CHUNKS (128) =20 enum nouveau_aper { NOUVEAU_APER_VIRT, @@ -83,9 +84,15 @@ struct nouveau_dmem { struct list_head chunks; struct mutex mutex; struct page *free_pages; + struct folio *free_folios; spinlock_t lock; }; =20 +struct nouveau_dmem_dma_info { + dma_addr_t dma_addr; + size_t size; +}; + static struct nouveau_dmem_chunk *nouveau_page_to_chunk(struct page *page) { return container_of(page_pgmap(page), struct nouveau_dmem_chunk, @@ -115,8 +122,13 @@ static void nouveau_dmem_folio_free(struct folio *foli= o) struct nouveau_dmem *dmem =3D chunk->drm->dmem; =20 spin_lock(&dmem->lock); - page->zone_device_data =3D dmem->free_pages; - dmem->free_pages =3D page; + if (folio_order(folio)) { + page->zone_device_data =3D dmem->free_folios; + dmem->free_folios =3D folio; + } else { + page->zone_device_data =3D dmem->free_pages; + dmem->free_pages =3D page; + } =20 WARN_ON(!chunk->callocated); chunk->callocated--; @@ -140,20 +152,28 @@ static void nouveau_dmem_fence_done(struct nouveau_fe= nce **fence) } } =20 -static int nouveau_dmem_copy_one(struct nouveau_drm *drm, struct page *spa= ge, - struct page *dpage, dma_addr_t *dma_addr) +static int nouveau_dmem_copy_folio(struct nouveau_drm *drm, + struct folio *sfolio, struct folio *dfolio, + struct nouveau_dmem_dma_info *dma_info) { struct device *dev =3D drm->dev->dev; + struct page *dpage =3D folio_page(dfolio, 0); + struct page *spage =3D folio_page(sfolio, 0); =20 - lock_page(dpage); + folio_lock(dfolio); =20 - *dma_addr =3D dma_map_page(dev, dpage, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); - if (dma_mapping_error(dev, *dma_addr)) + dma_info->dma_addr =3D dma_map_page(dev, dpage, 0, page_size(dpage), + DMA_BIDIRECTIONAL); + dma_info->size =3D page_size(dpage); + if (dma_mapping_error(dev, dma_info->dma_addr)) return -EIO; =20 - if (drm->dmem->migrate.copy_func(drm, 1, NOUVEAU_APER_HOST, *dma_addr, - NOUVEAU_APER_VRAM, nouveau_dmem_page_addr(spage))) { - dma_unmap_page(dev, *dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); + if (drm->dmem->migrate.copy_func(drm, folio_nr_pages(sfolio), + NOUVEAU_APER_HOST, dma_info->dma_addr, + NOUVEAU_APER_VRAM, + nouveau_dmem_page_addr(spage))) { + dma_unmap_page(dev, dma_info->dma_addr, page_size(dpage), + DMA_BIDIRECTIONAL); return -EIO; } =20 @@ -166,21 +186,47 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct = vm_fault *vmf) struct nouveau_dmem *dmem =3D drm->dmem; struct nouveau_fence *fence; struct nouveau_svmm *svmm; - struct page *spage, *dpage; - unsigned long src =3D 0, dst =3D 0; - dma_addr_t dma_addr =3D 0; + struct page *dpage; vm_fault_t ret =3D 0; struct migrate_vma args =3D { .vma =3D vmf->vma, - .start =3D vmf->address, - .end =3D vmf->address + PAGE_SIZE, - .src =3D &src, - .dst =3D &dst, .pgmap_owner =3D drm->dev, .fault_page =3D vmf->page, - .flags =3D MIGRATE_VMA_SELECT_DEVICE_PRIVATE, + .flags =3D MIGRATE_VMA_SELECT_DEVICE_PRIVATE | + MIGRATE_VMA_SELECT_COMPOUND, + .src =3D NULL, + .dst =3D NULL, }; + unsigned int order, nr; + struct folio *sfolio, *dfolio; + struct nouveau_dmem_dma_info dma_info; + + sfolio =3D page_folio(vmf->page); + order =3D folio_order(sfolio); + nr =3D 1 << order; + + /* + * Handle partial unmap faults, where the folio is large, but + * the pmd is split. + */ + if (vmf->pte) { + order =3D 0; + nr =3D 1; + } + + if (order) + args.flags |=3D MIGRATE_VMA_SELECT_COMPOUND; =20 + args.start =3D ALIGN_DOWN(vmf->address, (PAGE_SIZE << order)); + args.vma =3D vmf->vma; + args.end =3D args.start + (PAGE_SIZE << order); + args.src =3D kcalloc(nr, sizeof(*args.src), GFP_KERNEL); + args.dst =3D kcalloc(nr, sizeof(*args.dst), GFP_KERNEL); + + if (!args.src || !args.dst) { + ret =3D VM_FAULT_OOM; + goto err; + } /* * FIXME what we really want is to find some heuristic to migrate more * than just one page on CPU fault. When such fault happens it is very @@ -191,20 +237,26 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct = vm_fault *vmf) if (!args.cpages) return 0; =20 - spage =3D migrate_pfn_to_page(src); - if (!spage || !(src & MIGRATE_PFN_MIGRATE)) - goto done; - - dpage =3D alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO, vmf->vma, vmf->addres= s); - if (!dpage) + if (order) + dpage =3D folio_page(vma_alloc_folio(GFP_HIGHUSER | __GFP_ZERO, + order, vmf->vma, vmf->address), 0); + else + dpage =3D alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO, vmf->vma, + vmf->address); + if (!dpage) { + ret =3D VM_FAULT_OOM; goto done; + } =20 - dst =3D migrate_pfn(page_to_pfn(dpage)); + args.dst[0] =3D migrate_pfn(page_to_pfn(dpage)); + if (order) + args.dst[0] |=3D MIGRATE_PFN_COMPOUND; + dfolio =3D page_folio(dpage); =20 - svmm =3D spage->zone_device_data; + svmm =3D folio_zone_device_data(sfolio); mutex_lock(&svmm->mutex); nouveau_svmm_invalidate(svmm, args.start, args.end); - ret =3D nouveau_dmem_copy_one(drm, spage, dpage, &dma_addr); + ret =3D nouveau_dmem_copy_folio(drm, sfolio, dfolio, &dma_info); mutex_unlock(&svmm->mutex); if (ret) { ret =3D VM_FAULT_SIGBUS; @@ -214,25 +266,40 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct = vm_fault *vmf) nouveau_fence_new(&fence, dmem->migrate.chan); migrate_vma_pages(&args); nouveau_dmem_fence_done(&fence); - dma_unmap_page(drm->dev->dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); + dma_unmap_page(drm->dev->dev, dma_info.dma_addr, PAGE_SIZE, + DMA_BIDIRECTIONAL); done: migrate_vma_finalize(&args); +err: + kfree(args.src); + kfree(args.dst); return ret; } =20 +static void nouveau_dmem_folio_split(struct folio *head, struct folio *tai= l) +{ + if (tail =3D=3D NULL) + return; + tail->pgmap =3D head->pgmap; + tail->mapping =3D head->mapping; + folio_set_zone_device_data(tail, folio_zone_device_data(head)); +} + static const struct dev_pagemap_ops nouveau_dmem_pagemap_ops =3D { .folio_free =3D nouveau_dmem_folio_free, .migrate_to_ram =3D nouveau_dmem_migrate_to_ram, + .folio_split =3D nouveau_dmem_folio_split, }; =20 static int -nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage) +nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struct page **ppage, + bool is_large) { struct nouveau_dmem_chunk *chunk; struct resource *res; struct page *page; void *ptr; - unsigned long i, pfn_first; + unsigned long i, pfn_first, pfn; int ret; =20 chunk =3D kzalloc(sizeof(*chunk), GFP_KERNEL); @@ -242,7 +309,7 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, struc= t page **ppage) } =20 /* Allocate unused physical address space for device private pages. */ - res =3D request_free_mem_region(&iomem_resource, DMEM_CHUNK_SIZE, + res =3D request_free_mem_region(&iomem_resource, DMEM_CHUNK_SIZE * NR_CHU= NKS, "nouveau_dmem"); if (IS_ERR(res)) { ret =3D PTR_ERR(res); @@ -275,16 +342,40 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, str= uct page **ppage) pfn_first =3D chunk->pagemap.range.start >> PAGE_SHIFT; page =3D pfn_to_page(pfn_first); spin_lock(&drm->dmem->lock); - for (i =3D 0; i < DMEM_CHUNK_NPAGES - 1; ++i, ++page) { - page->zone_device_data =3D drm->dmem->free_pages; - drm->dmem->free_pages =3D page; + + pfn =3D pfn_first; + for (i =3D 0; i < NR_CHUNKS; i++) { + int j; + + if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) || !is_large) { + for (j =3D 0; j < DMEM_CHUNK_NPAGES - 1; j++, pfn++) { + page =3D pfn_to_page(pfn); + page->zone_device_data =3D drm->dmem->free_pages; + drm->dmem->free_pages =3D page; + } + } else { + page =3D pfn_to_page(pfn); + page->zone_device_data =3D drm->dmem->free_folios; + drm->dmem->free_folios =3D page_folio(page); + pfn +=3D DMEM_CHUNK_NPAGES; + } } - *ppage =3D page; + + /* Move to next page */ + if (is_large) { + *ppage =3D &drm->dmem->free_folios->page; + drm->dmem->free_folios =3D (*ppage)->zone_device_data; + } else { + *ppage =3D drm->dmem->free_pages; + drm->dmem->free_pages =3D (*ppage)->zone_device_data; + } + chunk->callocated++; spin_unlock(&drm->dmem->lock); =20 - NV_INFO(drm, "DMEM: registered %ldMB of device memory\n", - DMEM_CHUNK_SIZE >> 20); + NV_INFO(drm, "DMEM: registered %ldMB of %sdevice memory %lx %lx\n", + NR_CHUNKS * DMEM_CHUNK_SIZE >> 20, is_large ? "THP " : "", pfn_first, + nouveau_dmem_page_addr(page)); =20 return 0; =20 @@ -299,27 +390,41 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm *drm, str= uct page **ppage) } =20 static struct page * -nouveau_dmem_page_alloc_locked(struct nouveau_drm *drm) +nouveau_dmem_page_alloc_locked(struct nouveau_drm *drm, bool is_large) { struct nouveau_dmem_chunk *chunk; struct page *page =3D NULL; + struct folio *folio =3D NULL; int ret; + unsigned int order =3D 0; =20 spin_lock(&drm->dmem->lock); - if (drm->dmem->free_pages) { + if (is_large && drm->dmem->free_folios) { + folio =3D drm->dmem->free_folios; + page =3D &folio->page; + drm->dmem->free_folios =3D page->zone_device_data; + chunk =3D nouveau_page_to_chunk(&folio->page); + chunk->callocated++; + spin_unlock(&drm->dmem->lock); + order =3D ilog2(DMEM_CHUNK_NPAGES); + } else if (!is_large && drm->dmem->free_pages) { page =3D drm->dmem->free_pages; drm->dmem->free_pages =3D page->zone_device_data; chunk =3D nouveau_page_to_chunk(page); chunk->callocated++; spin_unlock(&drm->dmem->lock); + folio =3D page_folio(page); } else { spin_unlock(&drm->dmem->lock); - ret =3D nouveau_dmem_chunk_alloc(drm, &page); + ret =3D nouveau_dmem_chunk_alloc(drm, &page, is_large); if (ret) return NULL; + folio =3D page_folio(page); + if (is_large) + order =3D ilog2(DMEM_CHUNK_NPAGES); } =20 - zone_device_page_init(page, 0); + zone_device_folio_init(folio, order); return page; } =20 @@ -370,12 +475,12 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *c= hunk) { unsigned long i, npages =3D range_len(&chunk->pagemap.range) >> PAGE_SHIF= T; unsigned long *src_pfns, *dst_pfns; - dma_addr_t *dma_addrs; + struct nouveau_dmem_dma_info *dma_info; struct nouveau_fence *fence; =20 src_pfns =3D kvcalloc(npages, sizeof(*src_pfns), GFP_KERNEL | __GFP_NOFAI= L); dst_pfns =3D kvcalloc(npages, sizeof(*dst_pfns), GFP_KERNEL | __GFP_NOFAI= L); - dma_addrs =3D kvcalloc(npages, sizeof(*dma_addrs), GFP_KERNEL | __GFP_NOF= AIL); + dma_info =3D kvcalloc(npages, sizeof(*dma_info), GFP_KERNEL | __GFP_NOFAI= L); =20 migrate_device_range(src_pfns, chunk->pagemap.range.start >> PAGE_SHIFT, npages); @@ -383,17 +488,28 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *c= hunk) for (i =3D 0; i < npages; i++) { if (src_pfns[i] & MIGRATE_PFN_MIGRATE) { struct page *dpage; + struct folio *folio =3D page_folio( + migrate_pfn_to_page(src_pfns[i])); + unsigned int order =3D folio_order(folio); + + if (src_pfns[i] & MIGRATE_PFN_COMPOUND) { + dpage =3D folio_page( + folio_alloc( + GFP_HIGHUSER_MOVABLE, order), 0); + } else { + /* + * _GFP_NOFAIL because the GPU is going away and there + * is nothing sensible we can do if we can't copy the + * data back. + */ + dpage =3D alloc_page(GFP_HIGHUSER | __GFP_NOFAIL); + } =20 - /* - * _GFP_NOFAIL because the GPU is going away and there - * is nothing sensible we can do if we can't copy the - * data back. - */ - dpage =3D alloc_page(GFP_HIGHUSER | __GFP_NOFAIL); dst_pfns[i] =3D migrate_pfn(page_to_pfn(dpage)); - nouveau_dmem_copy_one(chunk->drm, - migrate_pfn_to_page(src_pfns[i]), dpage, - &dma_addrs[i]); + nouveau_dmem_copy_folio(chunk->drm, + page_folio(migrate_pfn_to_page(src_pfns[i])), + page_folio(dpage), + &dma_info[i]); } } =20 @@ -404,8 +520,9 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chu= nk) kvfree(src_pfns); kvfree(dst_pfns); for (i =3D 0; i < npages; i++) - dma_unmap_page(chunk->drm->dev->dev, dma_addrs[i], PAGE_SIZE, DMA_BIDIRE= CTIONAL); - kvfree(dma_addrs); + dma_unmap_page(chunk->drm->dev->dev, dma_info[i].dma_addr, + dma_info[i].size, DMA_BIDIRECTIONAL); + kvfree(dma_info); } =20 void @@ -608,31 +725,36 @@ nouveau_dmem_init(struct nouveau_drm *drm) =20 static unsigned long nouveau_dmem_migrate_copy_one(struct nouveau_drm *drm, struct nouveau_svmm *svmm, unsigned long src, - dma_addr_t *dma_addr, u64 *pfn) + struct nouveau_dmem_dma_info *dma_info, u64 *pfn) { struct device *dev =3D drm->dev->dev; struct page *dpage, *spage; unsigned long paddr; + bool is_large =3D false; + unsigned long mpfn; =20 spage =3D migrate_pfn_to_page(src); if (!(src & MIGRATE_PFN_MIGRATE)) goto out; =20 - dpage =3D nouveau_dmem_page_alloc_locked(drm); + is_large =3D src & MIGRATE_PFN_COMPOUND; + dpage =3D nouveau_dmem_page_alloc_locked(drm, is_large); if (!dpage) goto out; =20 paddr =3D nouveau_dmem_page_addr(dpage); if (spage) { - *dma_addr =3D dma_map_page(dev, spage, 0, page_size(spage), + dma_info->dma_addr =3D dma_map_page(dev, spage, 0, page_size(spage), DMA_BIDIRECTIONAL); - if (dma_mapping_error(dev, *dma_addr)) + dma_info->size =3D page_size(spage); + if (dma_mapping_error(dev, dma_info->dma_addr)) goto out_free_page; - if (drm->dmem->migrate.copy_func(drm, 1, - NOUVEAU_APER_VRAM, paddr, NOUVEAU_APER_HOST, *dma_addr)) + if (drm->dmem->migrate.copy_func(drm, folio_nr_pages(page_folio(spage)), + NOUVEAU_APER_VRAM, paddr, NOUVEAU_APER_HOST, + dma_info->dma_addr)) goto out_dma_unmap; } else { - *dma_addr =3D DMA_MAPPING_ERROR; + dma_info->dma_addr =3D DMA_MAPPING_ERROR; if (drm->dmem->migrate.clear_func(drm, page_size(dpage), NOUVEAU_APER_VRAM, paddr)) goto out_free_page; @@ -643,10 +765,13 @@ static unsigned long nouveau_dmem_migrate_copy_one(st= ruct nouveau_drm *drm, ((paddr >> PAGE_SHIFT) << NVIF_VMM_PFNMAP_V0_ADDR_SHIFT); if (src & MIGRATE_PFN_WRITE) *pfn |=3D NVIF_VMM_PFNMAP_V0_W; - return migrate_pfn(page_to_pfn(dpage)); + mpfn =3D migrate_pfn(page_to_pfn(dpage)); + if (folio_order(page_folio(dpage))) + mpfn |=3D MIGRATE_PFN_COMPOUND; + return mpfn; =20 out_dma_unmap: - dma_unmap_page(dev, *dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); + dma_unmap_page(dev, dma_info->dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); out_free_page: nouveau_dmem_page_free_locked(drm, dpage); out: @@ -656,27 +781,38 @@ static unsigned long nouveau_dmem_migrate_copy_one(st= ruct nouveau_drm *drm, =20 static void nouveau_dmem_migrate_chunk(struct nouveau_drm *drm, struct nouveau_svmm *svmm, struct migrate_vma *args, - dma_addr_t *dma_addrs, u64 *pfns) + struct nouveau_dmem_dma_info *dma_info, u64 *pfns) { struct nouveau_fence *fence; unsigned long addr =3D args->start, nr_dma =3D 0, i; + unsigned long order =3D 0; + + for (i =3D 0; addr < args->end; ) { + struct folio *folio; =20 - for (i =3D 0; addr < args->end; i++) { args->dst[i] =3D nouveau_dmem_migrate_copy_one(drm, svmm, - args->src[i], dma_addrs + nr_dma, pfns + i); - if (!dma_mapping_error(drm->dev->dev, dma_addrs[nr_dma])) + args->src[i], dma_info + nr_dma, pfns + i); + if (!args->dst[i]) { + i++; + addr +=3D PAGE_SIZE; + continue; + } + if (!dma_mapping_error(drm->dev->dev, dma_info[nr_dma].dma_addr)) nr_dma++; - addr +=3D PAGE_SIZE; + folio =3D page_folio(migrate_pfn_to_page(args->dst[i])); + order =3D folio_order(folio); + i +=3D 1 << order; + addr +=3D (1 << order) * PAGE_SIZE; } =20 nouveau_fence_new(&fence, drm->dmem->migrate.chan); migrate_vma_pages(args); nouveau_dmem_fence_done(&fence); - nouveau_pfns_map(svmm, args->vma->vm_mm, args->start, pfns, i); + nouveau_pfns_map(svmm, args->vma->vm_mm, args->start, pfns, i, order); =20 while (nr_dma--) { - dma_unmap_page(drm->dev->dev, dma_addrs[nr_dma], PAGE_SIZE, - DMA_BIDIRECTIONAL); + dma_unmap_page(drm->dev->dev, dma_info[nr_dma].dma_addr, + dma_info[nr_dma].size, DMA_BIDIRECTIONAL); } migrate_vma_finalize(args); } @@ -689,20 +825,27 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm, unsigned long end) { unsigned long npages =3D (end - start) >> PAGE_SHIFT; - unsigned long max =3D min(SG_MAX_SINGLE_ALLOC, npages); - dma_addr_t *dma_addrs; + unsigned long max =3D npages; struct migrate_vma args =3D { .vma =3D vma, .start =3D start, .pgmap_owner =3D drm->dev, - .flags =3D MIGRATE_VMA_SELECT_SYSTEM, + .flags =3D MIGRATE_VMA_SELECT_SYSTEM + | MIGRATE_VMA_SELECT_COMPOUND, }; unsigned long i; u64 *pfns; int ret =3D -ENOMEM; + struct nouveau_dmem_dma_info *dma_info; =20 - if (drm->dmem =3D=3D NULL) - return -ENODEV; + if (drm->dmem =3D=3D NULL) { + ret =3D -ENODEV; + goto out; + } + + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) + if (max > (unsigned long)HPAGE_PMD_NR) + max =3D (unsigned long)HPAGE_PMD_NR; =20 args.src =3D kcalloc(max, sizeof(*args.src), GFP_KERNEL); if (!args.src) @@ -711,8 +854,8 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm, if (!args.dst) goto out_free_src; =20 - dma_addrs =3D kmalloc_array(max, sizeof(*dma_addrs), GFP_KERNEL); - if (!dma_addrs) + dma_info =3D kmalloc_array(max, sizeof(*dma_info), GFP_KERNEL); + if (!dma_info) goto out_free_dst; =20 pfns =3D nouveau_pfns_alloc(max); @@ -730,7 +873,7 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm, goto out_free_pfns; =20 if (args.cpages) - nouveau_dmem_migrate_chunk(drm, svmm, &args, dma_addrs, + nouveau_dmem_migrate_chunk(drm, svmm, &args, dma_info, pfns); args.start =3D args.end; } @@ -739,7 +882,7 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm, out_free_pfns: nouveau_pfns_free(pfns); out_free_dma: - kfree(dma_addrs); + kfree(dma_info); out_free_dst: kfree(args.dst); out_free_src: diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouvea= u/nouveau_svm.c index 6fa387da0637..b8a3378154d5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_svm.c +++ b/drivers/gpu/drm/nouveau/nouveau_svm.c @@ -921,12 +921,14 @@ nouveau_pfns_free(u64 *pfns) =20 void nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct *mm, - unsigned long addr, u64 *pfns, unsigned long npages) + unsigned long addr, u64 *pfns, unsigned long npages, + unsigned int page_shift) { struct nouveau_pfnmap_args *args =3D nouveau_pfns_to_args(pfns); =20 args->p.addr =3D addr; - args->p.size =3D npages << PAGE_SHIFT; + args->p.size =3D npages << page_shift; + args->p.page =3D page_shift; =20 mutex_lock(&svmm->mutex); =20 diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.h b/drivers/gpu/drm/nouvea= u/nouveau_svm.h index e7d63d7f0c2d..3fd78662f17e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_svm.h +++ b/drivers/gpu/drm/nouveau/nouveau_svm.h @@ -33,7 +33,8 @@ void nouveau_svmm_invalidate(struct nouveau_svmm *svmm, u= 64 start, u64 limit); u64 *nouveau_pfns_alloc(unsigned long npages); void nouveau_pfns_free(u64 *pfns); void nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct *mm, - unsigned long addr, u64 *pfns, unsigned long npages); + unsigned long addr, u64 *pfns, unsigned long npages, + unsigned int page_shift); #else /* IS_ENABLED(CONFIG_DRM_NOUVEAU_SVM) */ static inline void nouveau_svm_init(struct nouveau_drm *drm) {} static inline void nouveau_svm_fini(struct nouveau_drm *drm) {} --=20 2.51.0