From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00C80CA101F for ; Mon, 8 Sep 2025 00:06:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B4258E0009; Sun, 7 Sep 2025 20:06:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 564E38E0001; Sun, 7 Sep 2025 20:06:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DE078E0009; Sun, 7 Sep 2025 20:06:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2263E8E0001 for ; Sun, 7 Sep 2025 20:06:48 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DACBD1608B5 for ; Mon, 8 Sep 2025 00:06:47 +0000 (UTC) X-FDA: 83864142054.12.1C73E67 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2055.outbound.protection.outlook.com [40.107.223.55]) by imf13.hostedemail.com (Postfix) with ESMTP id 1F47420009 for ; Mon, 8 Sep 2025 00:06:44 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=aamuynAO; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf13.hostedemail.com: domain of balbirs@nvidia.com designates 40.107.223.55 as permitted sender) smtp.mailfrom=balbirs@nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1757290005; a=rsa-sha256; cv=pass; b=IvNxEuCY9pnFQNE1RtAF8UchBThdxH3igeq3fCWHRJnYBUleUZ0hU3MaZuZsK18yJtkQPC Lgn9LJDRxpT1Zhy4dWyYBh3TjrC4oz6Dq/YB6d25MwJNbC2cUgJuMlEyGgNq2ao96fbtbl oqjLUfq8af1Ic6iDNVVUiKLnwo9zhWo= ARC-Authentication-Results: i=2; imf13.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=aamuynAO; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf13.hostedemail.com: domain of balbirs@nvidia.com designates 40.107.223.55 as permitted sender) smtp.mailfrom=balbirs@nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1757290005; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cLjfVj2EmhaMfIpfuIq3M76AWRGDlAD4qZMMjaOo7zg=; b=zSQH6rtDt8/gE+o3b9mB0FrxCE+meM04TUeKAsSS3f//kpNN1HJ7tZYJVjS2pFu1QCwfIb LtLIJO4rrwQZ/+mQZVYwMRaupllah2oHlOznhWOWQbCnqM2ihMf0MRKLvU9nKs4CdzJIT/ zccSZJBu8sby7Alu0huRlx6/IWdD0p0= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SYaJj0bKIW13rIgLDdKOfEB09IDlmPVRZMTuhsNDF/HCFI7DMKIfAIsTugLoEy+URgTehjcTmokyY4L8QxCVBzR/P9ZL0fYVNhAYR5/WhgvA5lLCesXr5+dxxxi0WG+96lmlSfnZsxhcg6jzq56X4s+hNTOCWJQ4m8s6hbiiOrwnEU79ZpvSueaYRcRcirv1whj4qtcwXpXKWh3PrFQuGJ/ytahrBIO5e/TOOwuGOklxrYVrIL/Fw9SxkXXhaO/W2Lh8wPBCaTyRRcpx2Pbkjge7snrjBq4/DCumNmK/mobv3a+e6InMY5AINexrTm3/1KD49N72b8qeRHcDjxGq/Q== 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=cLjfVj2EmhaMfIpfuIq3M76AWRGDlAD4qZMMjaOo7zg=; b=wPtKPfTrf4dRH4k1lSxJjqvJFGuwis2nni2ia5xGsBd0aQZexX2dbUjtMTPi7uRpXRiY6N1Hgcppz+3QDWGjqddOnrcOGKPSJ5eHwlGdW2VU080SKulPBbbTJUY0m83j56Q2c+JHm4ZFcTd62/njwLTfXWfAMJ4sc/J3K1lo44dVDLuWTMVfEH5XSXsZCZZ0VRCjTzS7gRVy/l2VgFzByTGxSyAbzNQGwPNUWUgqcvWV8Nk+SAZheKZZsLteHdyRW9qxqvC6C0idonZY0EE15jHscHrPza1pDU5mOflKFQtyQtDP65G2OAuNn4XjJOdLcpKPedi59tuC8qkqn8ptWQ== 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=cLjfVj2EmhaMfIpfuIq3M76AWRGDlAD4qZMMjaOo7zg=; b=aamuynAOtutLMyZELCnzftEQe6wwRVS2iW4Qkymd4u+vzH5KeGx3+Bg6BtpTfXA2Ad02UeLdyMHgdOFteZmB1v/gYndwL/KnEEUwzSfHAaKOGllmK6nHb/Wv8AYrZG50DNoNluMxN24pfGYJAaW4AuaDnNEzy8PJ9I/3rqhP6V3EdgFc/u30SpMzR75NHfyluARbs3QcouWaBuuWVb1hWFT9Q6K6hxMjd5XWTkU/8yXwC0Eg11HFdYl4H81VWNCedA95MwWTS48i0rgWI+U6dT88w4OQ7p5hWUVYTAq3wozFz9xaLB1FHdRxiGQmITcBz/fiyllP7TfH/rWe/UcaPQ== Received: from PH8PR12MB7277.namprd12.prod.outlook.com (2603:10b6:510:223::13) by DS7PR12MB5887.namprd12.prod.outlook.com (2603:10b6:8:7a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.19; Mon, 8 Sep 2025 00:05:29 +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.9094.018; Mon, 8 Sep 2025 00:05:29 +0000 From: Balbir Singh To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: damon@lists.linux.dev, dri-devel@lists.freedesktop.org, Balbir Singh , Andrew Morton , David Hildenbrand , Zi Yan , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Oscar Salvador , Lorenzo Stoakes , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Ralph Campbell , =?UTF-8?q?Mika=20Penttil=C3=A4?= , Matthew Brost , Francois Dugast Subject: [v5 08/15] lib/test_hmm: add zone device private THP test infrastructure Date: Mon, 8 Sep 2025 10:04:41 +1000 Message-ID: <20250908000448.180088-9-balbirs@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250908000448.180088-1-balbirs@nvidia.com> References: <20250908000448.180088-1-balbirs@nvidia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SY5P282CA0193.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:249::16) To PH8PR12MB7277.namprd12.prod.outlook.com (2603:10b6:510:223::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH8PR12MB7277:EE_|DS7PR12MB5887:EE_ X-MS-Office365-Filtering-Correlation-Id: 0bac0ed5-7d11-427f-4e71-08ddee6b6bb1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?V3FzbVhHTEpHVGhGQTBhd1pqdStzbHpxNDVzdHExbGpDeGJJV0x5dzIvQzdR?= =?utf-8?B?Y2tEUFUwdnBaejk0NCtsZEUxbEx0NlBOTU9qR0dsOFpQQS9YOHhnemhkSTBY?= =?utf-8?B?aTh4a3VCdThwSFlGSEFNUFd4MUdLUk82Qlc0Q0J4NnFTM3RHbU5lMzZGb3ln?= =?utf-8?B?UkdFQW1wNTRnVTlrTFVmV0gzVW0yWW16VHJpd2UzR3hzclE0TW10WDZEZlBY?= =?utf-8?B?bkdHYStPRnh5U0NQR2hVYXcza1J2VCtJVDlqUmxkaEVCMTc2MjFjZjlIUmJ1?= =?utf-8?B?bC83TjV2cDJjSC9OcmFZajQ1WnRhcVRTZDNvTlpFVld4cHRrZC9vcHp4S0Fy?= =?utf-8?B?NEMvYkZuN0hIUGk3QzNzVmlQUGdkbUlzS0xmVXFTbTVIaFNBdjBqQ2NXT2Rr?= =?utf-8?B?RFdMTzNMaFg4LzU3V0JJVXo1cDZLdjRYbFgwOHdTZWtucmVMNnF0UmhsU1BN?= =?utf-8?B?VGtSU1R5MjJuczN6NC9RVi8zaEsyVkx0ckhLRmx2RVphV1Ivc00xU1RFRHVX?= =?utf-8?B?UGdXc0p5dCsxTVBFMkl3Z2Y5c0pBZjZqVXZzNWtCK1UvbWYyWWxYcWp0QkRz?= =?utf-8?B?UWwrdG9IY2dGMmFRekVoVWlpUnUxdW9ETHhYK3FtRk9ocnkvSEprd2pmckpx?= =?utf-8?B?RTJvM3ZoWC80WEc0b241bEM0UUxEZ25sYnJYYVpmWHZscFJCQ1d2ZEgwQWha?= =?utf-8?B?UzcxT0Q3VWNGSXVHbkZGZHpaYWZBSFhmdTllKy9qZVErQXVUZHlrMG9Wdkwz?= =?utf-8?B?KzZKN2JFR3JUaHlYWTJINU0wU1daR3FsdUxaZFpMdHRlNXZURjZYUFovT1dM?= =?utf-8?B?UmV2RDJQdCs1a1JHYSsrekFmcUI2YXBTQ3lxUmVkL0lPZ3RqR1dlUEh2VitT?= =?utf-8?B?Ylp4SEUxeERybUZyZkEzZld1Q0lpMjNwVVJzSUtzYVphbllPdzV1d2ttSkV1?= =?utf-8?B?bHlDdkJRaW9wRVUvakhVZkdzL1l5bjhyaEFvZW9iSUVFenh2a2ZGMFplN0do?= =?utf-8?B?UHhDcFRMNWZ3QmoxalRFVE9yYW9kcDYzM3E3SWNQdU1BUkM5WDR4N3NqTkc5?= =?utf-8?B?LzNPUDVVTExqcitJN2lPcHh2elNXUjhsQ0JXM1Rqdzl3cGV4Y2tMQmdyZ01q?= =?utf-8?B?MFFVNnNkaUlHUFRYMURLTWdGUldRNFNQYXF1cDFkajhTNXhkNEdHeXk2dGVK?= =?utf-8?B?YkZjVVdVWFV1ZXZsZ2djUU51b3F6SkIxeDdRQTcwUVlvR1NHWXBxVTlMSUhm?= =?utf-8?B?SGNja0x5YmdkakgzOUYyZzJmUC84NEMzemhSbUtsSG9tTVJaSjNqb0FESlVy?= =?utf-8?B?TmRTOXB1WHR1bkREQW9xMWJoQjZNQlFDdHZsZGkzTUtGUE9VZm9DSVp3bTYw?= =?utf-8?B?c0JKb3Z1VmdjWDRoeFBteGlaZWZXRUFQTlpObTJ0b0lkMEpuN05zU0JXdVZS?= =?utf-8?B?SERrTUVQYk4vNWtBSW9WUExnZHc1N3E2Uk5LeE0rb2FITDFneEJIMC9JRm83?= =?utf-8?B?Y2VLMlhZbi92UHVySEVCM1hKb0k2VE1NbXcwMzhqMjVNbXI4Zm5KSDhXdE1M?= =?utf-8?B?OFplOE8zNkpWWkVVQnQzWjh3OWg4SFd4UVYxQXNNbTNWUUUway8waUR3VXcr?= =?utf-8?B?aTU1ZWFkc0JwVWFsTTBxUno4UHg2WHFENCtHalNIZ1BVckFHMk5SdGpwL3lu?= =?utf-8?B?cVBZMytpYmtVR0ZKUXk1dHVPSWJOb3daQXEzeWc0ZTJvaU9OYUxFUExyd3I0?= =?utf-8?B?VFIrcGRHVjFKRWx1aGdNdHRIK3cwZStMbXp1Zm1hMmtZMmFUaFgvTEUyUE5K?= =?utf-8?B?NW9nS1RHeEtwaFBjR2d6T2dDS3FXNFZFVi9kSzdRaWlSWSt2NHRUb09UTmRV?= =?utf-8?B?dFJFQW5NWDgzWDd2SGp1WWhKRGFvMlBFeG80TXBUL0NraUd5bDJSQmlac2dt?= =?utf-8?Q?EMrvpTlTsnc=3D?= 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)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YkNvcVBtYURWb2J5T283VGRnWUd6ampEbGdCVXZhY3N2YlRtajJWc0kydDNy?= =?utf-8?B?L2tRcTFQQS9ZbWg0MU5CWDNpSEh2UHBqRHNDUXlyRkZnUC9EQy9qMyt4Q1Ay?= =?utf-8?B?TjhYRktiaEJTNUdsUWxHdUgzekI5ZUJnZzRJY01GbEpTZ3lSckpudkVYTlB3?= =?utf-8?B?dEUxa0Q2bk5tdnZHVVA4SE5KcUx2UW9CUlFYdXNmR2lhWkNFNXdZYkJUMzU3?= =?utf-8?B?SVlmOXlxcjkrYXFxVmMzM0Y2M0VJd282TGh1VlRiOGR6SnF3VDNMOHRiekVk?= =?utf-8?B?VGxPaC9HN2RYc1F0ZjBDdkpzODRDcW1vM2ZOVU9lbmlPdEtsTTRaMUxSb1RO?= =?utf-8?B?U3l5eW56aVJ0YmNvcStmRWN2a1dOMERTUloxVTU5L1F0eWxzZlhQZ01yUThw?= =?utf-8?B?T0VGeDQ0M3JJa2w0Q2RUcm90eU1lcmFWVFE1YU5XSUJ5QmdXQkhpOE45QUlP?= =?utf-8?B?aGlOZ1BwbFdOWXlmRTdKQjd6TGFtcHh5WmpPU2w2aC9zak1VNS91WXM1K253?= =?utf-8?B?YmNQeW5OcHBTSmtQV0cvamhGbi9GdGRzc0czZFhRL05vdUYzQ1ErNG5XMVFE?= =?utf-8?B?akNXN3pUT1VYL0hhWmtHN0JJZm5pRjdsL1g5Y3I2QUVJUXRhMWI0VDMrbmRQ?= =?utf-8?B?b1M5TWdFcEx6bTJNZzUxbFVuazMzcVhMSk5xY1IwUVZ4RUZOMWxLMmJoSTBa?= =?utf-8?B?ZkEzNkdrbFVQMUdEZ2dHakZ2d3ZwMU11aXhiVUdvS25pV0p3VTEvWmlRZDdO?= =?utf-8?B?bjc3a05NUjZEb09CMjNUTS9qcmg1VGxsY0s3QkNkanRvL2ZlN0dnVHA1WmJ4?= =?utf-8?B?cWNQUE5xZjl6cXE2TEdUdVdJRWlndTlXN3U3OG5tem9TUDNwWmQ4R2trZzg0?= =?utf-8?B?cHMyeW51YXlHZ01pdkcvM3lpV0pEMWRDZUtrRCtBRFZJU2preWpJME5KRXBz?= =?utf-8?B?SzRRcU9JTzJlMXFQbmdWWHI5SWUwMG9BekhVN2szMFBBbEorUzkybzkrRGt1?= =?utf-8?B?dmlDWDFTanFvOHBSUXhQQUJiL3BGbGNIS0lacVkwRmtEVy9UTlB5QTZLT3VP?= =?utf-8?B?SHJkR0RNNzBjU0tqdFk2bnZpNWVTYkRkeU1xcytWR1VyNHV3cHpEdkgxc2N3?= =?utf-8?B?ekVVTGE2YTdVdHFBQ0x2YTgybEptVldEeTV4bDc2cnB5c2VKYkN1UTdCM2RD?= =?utf-8?B?WUROckRrRDVyMnNjNGpuYWRwbnJoSW5idFowUDlacDlNWm90ek9wUzhsU0Jn?= =?utf-8?B?amtSM20wUzltNTdqVGpiZ1dGTzBjYjNDVXk2ckcwMVozVjRBN3A2VTJpN2Zi?= =?utf-8?B?MXpSQm04SDlBa3ExdGNBcmtMT1pjOVhTTWpjZGdmalZuL1A5eHNDS2JHVGha?= =?utf-8?B?MGZucHlycnlzMURLcFZiQmNBckU5RFhwRmxiaVBvbkx2UFB4ekgyakpxSUdj?= =?utf-8?B?ZURRT2dOTURwdVRlVTY2d2RDcGlxaVBRSXprcVR0WUZHTWpsVStrTXQya1FP?= =?utf-8?B?VFpiSUk2NWdGNytzRDIrbDBsaDVtT1UwQUVIMHRnRTB6TklZMC9rK0NjT1hP?= =?utf-8?B?ZW5Tc3h4WlFPK21yWTRxcjVIS0QxdnRxdUhGM0VEd3oyU01uWXVtZHhkZmhN?= =?utf-8?B?WWhJbzRtK2tqS3RpSWxOb01NbFNlM1ZVRVZKSGU5TFhiV2M3WHZJVExzbFdo?= =?utf-8?B?d2ZTSm9JTVQwWXkvRjBOL2I3c3puNzZiOTliSEZ3c25HRmZUdnpDeGViVUdB?= =?utf-8?B?QWlVcjJqZEJxVFd5MWhJWmwvbndDNExldWNxajg1TXFtbTF0S3BNUTFCa0Vl?= =?utf-8?B?ZHNsRmk4aitWaTlaVm1RZEd4SU1rUldud1RSbjFEMVRUckZqYmI3YWFjNWg1?= =?utf-8?B?S3dINCtyU0RYM3JnVkVLNC9qOU5vM3VWWUlvbWFhd0lQbysxRDRScTZkTDlj?= =?utf-8?B?VmU5a3FCNlArVjh4Nyt5MTZJSmZOeXBGM0k5cWRuaFdmVEZVWTZ0K1EzOExz?= =?utf-8?B?eXFpaFBGV2xpYUNPVTl0UHdWRFFyQjU5S1gvQ2VXRjAxb01xcXovNlZOOWpS?= =?utf-8?B?N1czUnA2NGFTNEhpbUUrL1pFUnErV05vME10NXVpRExTTTFPbFZiZ2U3cUlE?= =?utf-8?Q?m3+XBaQplK2fka4CKSWXthefa?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0bac0ed5-7d11-427f-4e71-08ddee6b6bb1 X-MS-Exchange-CrossTenant-AuthSource: PH8PR12MB7277.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2025 00:05:29.5251 (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: 3rz0P4zJvbR+1G9fHROhScIJLeVn6Q7ISzfztJo90b72ID/nc4Pe/a/RSuVfb21n/wTw5ii9bug5bGvAVwxJGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5887 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 1F47420009 X-Stat-Signature: gqaqgs7tkw9878qqm4cspkt64bdc3167 X-HE-Tag: 1757290004-230063 X-HE-Meta: U2FsdGVkX195typW1U9MxoruEefkgyjAOEuTeivGij5oaZyssT7Fp4n3PrB9LxstMTDKPU4mWZ0MZvAvG9aAgH+cEeKm7RB9uyfe+4B0K9A83K6mro+5mmFkMMQTyea1x8yht4FzYTzlejo7sGFluJhAmFBU6NaVBWNp8i25LQ+mFyPn1di+kFLDqgcSeexqk3nSb1D1Hgn78hyIcQRa8Y9t44w9IaDXjtOy7laqI4C0L+HkB3rHXIrgywa7WnIfcoUNjHe/kZIhPst0qZrNglQy1e2U/dfE82xQyDqqLDbhKQm/e5wNfnywp2vmUjS0Tyf46MOLf6iXrGnYhxZPA5hQrX0JLJjO3qccjQJiJLlPe6PVmJEqBIdabGj1ib3eCONr2S7STHm1SOFQxgVzTnFi6zXaawPrJtUs45Iiuday+W/kaqjraNQB94SEZG++F1vv4wbFdonT64VU4x06NqNT2stuHpwVFp1s9ssCsR02uMkIYXH0pv3/qbunsALBECU2PmPWdF36bHYIkijaqJPMp/AO11dU/QhzF3jiWfMRJOtL8EbG1y4i40Vn21hgGZmacHLBSirbC6aZXud5MB2y7FOW7j0msWaJs136DPaVEJlZjyzdTshofS0txoag04+J1E//9ET/x6DRstD0Vdhrn9KBS8rEir8C+wWxeLHhlOecxKcI69EIU/I0nNs6jAb2Xh7ctohADleycnh7quNhLJ/JtvdyrSwh8zqgVZylU5s/GosUaLtK/+dfcjsAY5o77h9pCzrviQ0dI4hm5GexYeNqmvyxiplBHTStSoH/0STuocqaLT+0R8SJJA6cJTdS7iqqSPUbvE0fa5nPWsy5fXzz5wPnt1a0MEGNWRXvliUc1ALAvIYAMgOl+9jLiGNuiPE4QLatlig46gaULjHDB43p3pIKeXaxsy1jTjQkn8gQ0Z8FScPjnShlYGO07nGg/3MOpjeghTDvsuP KkxzqxVP u0Q8sOeFFV/eiUn051V3ORyMq8Mkh2jxyBtUJs5kspfTMjZf+thChsZ1a6rWEBarCjbjFuvBXitZeFMuRQvZ7lLRATwhRw5FVuHaSRZSklZ46u6dNElpkJI9ZZud4gFMnEBAoHWXeHoY9/KxDXTOFJPB9YwATYu68iv9SKxTmFok1WzXcFTz6i46sd5eGMOKjSsjq2foc8GANLYHr0mb+OcrCSzdx5csAvkAnIJLA6dBRG3BT5tF7HmVhueL0gO0zuQSPWyt4P0YDQOWZytm/icGTH5j8SRKwYDdrhLV4Iih84WtvMsE4sWL64pBAIG+76ZoLDZidY7qQ/2rl2Ngio60PZdAnelPPOJHM+LINbR+e0Ert32Mb/QzjikgaUvzXfa+MS67Fv2QELo8qlEgU7P6LQyNBUYo+NLUeX5sEmit5+Pa/rBk9S80+fA3x9pJCcRY2eu+lenWQlZrISF2uPk9wITfVZvyw9jQ8pH5NbFX0Rw5bfIvHgBPzZA2wqeiTo7ziuT1GdU46W3uYbDU9UB5R7Jv25YuiQYk3lSd97UHMPWRX/ji7/FE202XT/Pi47wSm/7i0iWWKMGP+uVOo5garpW9Ax1rsTNUSlBPFFjiYhpCMmoNzww3yJcIFVx/1U5iBwbT6gFn64k1ZfRZaqYDzFUDuRK/ekFMzDaaahE0O6vWzBuKTMci1l6YTHxvzQdE08cCcSy3rbMKBzOa4cs6tB+xrBu5yuY92PQ0+iAbeX4O2pFpRiGxFZ2apQv/xNvj6+ugxY2tuZA3t8gjXQqhyMR9NvQfXgW2i59TMErMAniWtJFJTPPnEmDa2cEpR/vi8acp+MuoO0tsDvMsvKPrsYtCAjNiOcOnbsWldf35D7bHF0t6AFxemN6rKGGhehYxYydEpRiBAR6tWShCI4lIXDqZm+HpGoWdDk4tPu7T+zu1YSDd0fBvm0UU1g1XazP6FP3P5W9yiqBOSZS9UryZ4oocE t6gMFwN7 pIzf3E/Vilbxk92WQIfly37EEBXGtNTnDBPMInyZycmYoZNHtE7XQR86nn5wIC1EF24g1iZykGkvo2xQjboKule8VadKbQHmAUEN/39a7afG2ZW++wheMy88l0AsKILrZT6P4LYHcdDPMzUQfI29CuVqTQEUosI5 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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ä 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 9c20327c2be5..75987a8cfc6b 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -177,6 +177,18 @@ static inline bool folio_is_pci_p2pdma(const struct folio *folio) folio->pgmap->type == MEMORY_DEVICE_PCI_P2PDMA; } +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 *data) +{ + VM_WARN_ON_FOLIO(!folio_is_device_private(folio), folio); + folio->page.zone_device_data = 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 83e3d8208a54..50e175edc58a 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 */ }; @@ -492,7 +493,7 @@ static int dmirror_write(struct dmirror *dmirror, struct hmm_dmirror_cmd *cmd) } 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 = NULL; @@ -572,20 +573,45 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice, pfn_first, pfn_last); spin_lock(&mdevice->lock); - for (pfn = pfn_first; pfn < pfn_last; pfn++) { + for (pfn = pfn_first; pfn < pfn_last; ) { struct page *page = pfn_to_page(pfn); + if (is_large && IS_ALIGNED(pfn, HPAGE_PMD_NR) + && (pfn + HPAGE_PMD_NR <= pfn_last)) { + page->zone_device_data = mdevice->free_folios; + mdevice->free_folios = page_folio(page); + pfn += HPAGE_PMD_NR; + continue; + } + page->zone_device_data = mdevice->free_pages; mdevice->free_pages = page; + pfn++; } + + ret = 0; if (ppage) { - *ppage = mdevice->free_pages; - mdevice->free_pages = (*ppage)->zone_device_data; - mdevice->calloc++; + if (is_large) { + if (!mdevice->free_folios) { + ret = -ENOMEM; + goto err_unlock; + } + *ppage = folio_page(mdevice->free_folios, 0); + mdevice->free_folios = (*ppage)->zone_device_data; + mdevice->calloc += HPAGE_PMD_NR; + } else if (mdevice->free_pages) { + *ppage = mdevice->free_pages; + mdevice->free_pages = (*ppage)->zone_device_data; + mdevice->calloc++; + } else { + ret = -ENOMEM; + goto err_unlock; + } } +err_unlock: spin_unlock(&mdevice->lock); - return 0; + return ret; err_release: mutex_unlock(&mdevice->devmem_lock); @@ -598,10 +624,13 @@ static int dmirror_allocate_chunk(struct dmirror_device *mdevice, return ret; } -static struct page *dmirror_devmem_alloc_page(struct dmirror_device *mdevice) +static struct page *dmirror_devmem_alloc_page(struct dmirror *dmirror, + bool is_large) { struct page *dpage = NULL; struct page *rpage = NULL; + unsigned int order = is_large ? HPAGE_PMD_ORDER : 0; + struct dmirror_device *mdevice = dmirror->mdevice; /* * 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 = alloc_page(GFP_HIGHUSER); + rpage = folio_page(folio_alloc(GFP_HIGHUSER, order), 0); if (!rpage) return NULL; } spin_lock(&mdevice->lock); - if (mdevice->free_pages) { + if (is_large && mdevice->free_folios) { + dpage = folio_page(mdevice->free_folios, 0); + mdevice->free_folios = dpage->zone_device_data; + mdevice->calloc += 1 << order; + spin_unlock(&mdevice->lock); + } else if (!is_large && mdevice->free_pages) { dpage = mdevice->free_pages; mdevice->free_pages = 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; } - zone_device_page_init(dpage); + zone_device_folio_init(page_folio(dpage), order); dpage->zone_device_data = rpage; return dpage; error: if (rpage) - __free_page(rpage); + __free_pages(rpage, order); return NULL; } static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args, struct dmirror *dmirror) { - struct dmirror_device *mdevice = dmirror->mdevice; const unsigned long *src = args->src; unsigned long *dst = args->dst; unsigned long addr; - for (addr = args->start; addr < args->end; addr += PAGE_SIZE, - src++, dst++) { + for (addr = args->start; addr < args->end; ) { struct page *spage; struct page *dpage; struct page *rpage; + bool is_large = *src & MIGRATE_PFN_COMPOUND; + int write = (*src & MIGRATE_PFN_WRITE) ? MIGRATE_PFN_WRITE : 0; + unsigned long nr = 1; if (!(*src & MIGRATE_PFN_MIGRATE)) - continue; + goto next; /* * 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 migrate_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 = dmirror_devmem_alloc_page(dmirror, is_large); + if (!dpage) { + struct folio *folio; + unsigned long i; + unsigned long spfn = *src >> MIGRATE_PFN_SHIFT; + struct page *src_page; + + if (!is_large) + goto next; + + if (!spage && is_large) { + nr = HPAGE_PMD_NR; + } else { + folio = page_folio(spage); + nr = folio_nr_pages(folio); + } + + for (i = 0; i < nr && addr < args->end; i++) { + dpage = dmirror_devmem_alloc_page(dmirror, false); + rpage = BACKING_PAGE(dpage); + rpage->zone_device_data = dmirror; + + *dst = migrate_pfn(page_to_pfn(dpage)) | write; + src_page = pfn_to_page(spfn + i); + + if (spage) + copy_highpage(rpage, src_page); + else + clear_highpage(rpage); + src++; + dst++; + addr += PAGE_SIZE; + } continue; - - dpage = dmirror_devmem_alloc_page(mdevice); - if (!dpage) - continue; + } rpage = BACKING_PAGE(dpage); - if (spage) - copy_highpage(rpage, spage); - else - clear_highpage(rpage); /* * Normally, a device would use the page->zone_device_data to @@ -684,10 +747,42 @@ static void dmirror_migrate_alloc_and_copy(struct migrate_vma *args, 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 = migrate_pfn(page_to_pfn(dpage)); - if ((*src & MIGRATE_PFN_WRITE) || - (!spage && args->vma->vm_flags & VM_WRITE)) - *dst |= MIGRATE_PFN_WRITE; + + *dst = migrate_pfn(page_to_pfn(dpage)) | write; + + if (is_large) { + int i; + struct folio *folio = page_folio(dpage); + *dst |= MIGRATE_PFN_COMPOUND; + + if (folio_test_large(folio)) { + for (i = 0; i < folio_nr_pages(folio); i++) { + struct page *dst_page = + pfn_to_page(page_to_pfn(rpage) + i); + struct page *src_page = + pfn_to_page(page_to_pfn(spage) + i); + + if (spage) + copy_highpage(dst_page, src_page); + else + clear_highpage(dst_page); + src++; + dst++; + addr += PAGE_SIZE; + } + continue; + } + } + + if (spage) + copy_highpage(rpage, spage); + else + clear_highpage(rpage); + +next: + src++; + dst++; + addr += PAGE_SIZE; } } @@ -734,14 +829,17 @@ static int dmirror_migrate_finalize_and_map(struct migrate_vma *args, const unsigned long *src = args->src; const unsigned long *dst = args->dst; unsigned long pfn; + const unsigned long start_pfn = start >> PAGE_SHIFT; + const unsigned long end_pfn = end >> PAGE_SHIFT; /* Map the migrated pages into the device's page tables. */ mutex_lock(&dmirror->mutex); - for (pfn = start >> PAGE_SHIFT; pfn < (end >> PAGE_SHIFT); pfn++, - src++, dst++) { + for (pfn = start_pfn; pfn < end_pfn; pfn++, src++, dst++) { struct page *dpage; void *entry; + int nr, i; + struct page *rpage; if (!(*src & MIGRATE_PFN_MIGRATE)) continue; @@ -750,13 +848,25 @@ static int dmirror_migrate_finalize_and_map(struct migrate_vma *args, if (!dpage) continue; - entry = BACKING_PAGE(dpage); - if (*dst & MIGRATE_PFN_WRITE) - entry = xa_tag_pointer(entry, DPT_XA_TAG_WRITE); - entry = 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 = folio_nr_pages(page_folio(dpage)); + else + nr = 1; + + WARN_ON_ONCE(end_pfn < start_pfn + nr); + + rpage = BACKING_PAGE(dpage); + VM_WARN_ON(folio_nr_pages(page_folio(rpage)) != nr); + + for (i = 0; i < nr; i++) { + entry = folio_page(page_folio(rpage), i); + if (*dst & MIGRATE_PFN_WRITE) + entry = xa_tag_pointer(entry, DPT_XA_TAG_WRITE); + entry = xa_store(&dmirror->pt, pfn + i, entry, GFP_ATOMIC); + if (xa_is_err(entry)) { + mutex_unlock(&dmirror->mutex); + return xa_err(entry); + } } } @@ -829,31 +939,66 @@ static vm_fault_t dmirror_devmem_fault_alloc_and_copy(struct migrate_vma *args, unsigned long start = args->start; unsigned long end = args->end; unsigned long addr; + unsigned int order = 0; + int i; - for (addr = start; addr < end; addr += PAGE_SIZE, - src++, dst++) { + for (addr = start; addr < end; ) { struct page *dpage, *spage; spage = migrate_pfn_to_page(*src); - if (!spage || !(*src & MIGRATE_PFN_MIGRATE)) - continue; + if (!spage || !(*src & MIGRATE_PFN_MIGRATE)) { + addr += PAGE_SIZE; + goto next; + } if (WARN_ON(!is_device_private_page(spage) && - !is_device_coherent_page(spage))) - continue; + !is_device_coherent_page(spage))) { + addr += PAGE_SIZE; + goto next; + } + spage = BACKING_PAGE(spage); - dpage = 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 = folio_order(page_folio(spage)); + if (order) + dpage = folio_page(vma_alloc_folio(GFP_HIGHUSER_MOVABLE, + order, args->vma, addr), 0); + else + dpage = alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); + + /* Try with smaller pages if large allocation fails */ + if (!dpage && order) { + dpage = alloc_page_vma(GFP_HIGHUSER_MOVABLE, args->vma, addr); + if (!dpage) + return VM_FAULT_OOM; + order = 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 = migrate_pfn(page_to_pfn(dpage)); if (*src & MIGRATE_PFN_WRITE) *dst |= MIGRATE_PFN_WRITE; + if (order) + *dst |= MIGRATE_PFN_COMPOUND; + + for (i = 0; i < (1 << order); i++) { + struct page *src_page; + struct page *dst_page; + + src_page = pfn_to_page(page_to_pfn(spage) + i); + dst_page = pfn_to_page(page_to_pfn(dpage) + i); + + xa_erase(&dmirror->pt, addr >> PAGE_SHIFT); + copy_highpage(dst_page, src_page); + } +next: + addr += PAGE_SIZE << order; + src += 1 << order; + dst += 1 << order; } return 0; } @@ -879,11 +1024,14 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror, unsigned long size = cmd->npages << PAGE_SHIFT; struct mm_struct *mm = dmirror->notifier.mm; struct vm_area_struct *vma; - unsigned long src_pfns[32] = { 0 }; - unsigned long dst_pfns[32] = { 0 }; struct migrate_vma args = { 0 }; unsigned long next; int ret; + unsigned long *src_pfns; + unsigned long *dst_pfns; + + src_pfns = kvcalloc(PTRS_PER_PTE, sizeof(*src_pfns), GFP_KERNEL | __GFP_NOFAIL); + dst_pfns = kvcalloc(PTRS_PER_PTE, sizeof(*dst_pfns), GFP_KERNEL | __GFP_NOFAIL); start = cmd->addr; end = start + size; @@ -902,7 +1050,7 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror, ret = -EINVAL; goto out; } - next = min(end, addr + (ARRAY_SIZE(src_pfns) << PAGE_SHIFT)); + next = min(end, addr + (PTRS_PER_PTE << PAGE_SHIFT)); if (next > vma->vm_end) next = vma->vm_end; @@ -912,7 +1060,7 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror, args.start = addr; args.end = next; args.pgmap_owner = dmirror->mdevice; - args.flags = dmirror_select_device(dmirror); + args.flags = dmirror_select_device(dmirror) | MIGRATE_VMA_SELECT_COMPOUND; ret = migrate_vma_setup(&args); if (ret) @@ -928,6 +1076,8 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror, out: mmap_read_unlock(mm); mmput(mm); + kvfree(src_pfns); + kvfree(dst_pfns); return ret; } @@ -939,12 +1089,12 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror, unsigned long size = cmd->npages << PAGE_SHIFT; struct mm_struct *mm = dmirror->notifier.mm; struct vm_area_struct *vma; - unsigned long src_pfns[32] = { 0 }; - unsigned long dst_pfns[32] = { 0 }; struct dmirror_bounce bounce; struct migrate_vma args = { 0 }; unsigned long next; int ret; + unsigned long *src_pfns = NULL; + unsigned long *dst_pfns = NULL; start = cmd->addr; end = start + size; @@ -955,6 +1105,18 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror, if (!mmget_not_zero(mm)) return -EINVAL; + ret = -ENOMEM; + src_pfns = kvcalloc(PTRS_PER_PTE, sizeof(*src_pfns), + GFP_KERNEL | __GFP_NOFAIL); + if (!src_pfns) + goto free_mem; + + dst_pfns = kvcalloc(PTRS_PER_PTE, sizeof(*dst_pfns), + GFP_KERNEL | __GFP_NOFAIL); + if (!dst_pfns) + goto free_mem; + + ret = 0; mmap_read_lock(mm); for (addr = start; addr < end; addr = next) { vma = vma_lookup(mm, addr); @@ -962,7 +1124,7 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror, ret = -EINVAL; goto out; } - next = min(end, addr + (ARRAY_SIZE(src_pfns) << PAGE_SHIFT)); + next = min(end, addr + (PTRS_PER_PTE << PAGE_SHIFT)); if (next > vma->vm_end) next = vma->vm_end; @@ -972,7 +1134,8 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror, args.start = addr; args.end = next; args.pgmap_owner = dmirror->mdevice; - args.flags = MIGRATE_VMA_SELECT_SYSTEM; + args.flags = MIGRATE_VMA_SELECT_SYSTEM | + MIGRATE_VMA_SELECT_COMPOUND; ret = migrate_vma_setup(&args); if (ret) goto out; @@ -992,7 +1155,7 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror, */ ret = dmirror_bounce_init(&bounce, start, size); if (ret) - return ret; + goto free_mem; mutex_lock(&dmirror->mutex); ret = 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 = bounce.cpages; dmirror_bounce_fini(&bounce); - return ret; + goto free_mem; out: mmap_read_unlock(mm); mmput(mm); +free_mem: + kfree(src_pfns); + kfree(dst_pfns); return ret; } @@ -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 = 0; src_pfns = kvcalloc(npages, sizeof(*src_pfns), GFP_KERNEL | __GFP_NOFAIL); dst_pfns = kvcalloc(npages, sizeof(*dst_pfns), GFP_KERNEL | __GFP_NOFAIL); @@ -1215,13 +1382,25 @@ static void dmirror_device_evict_chunk(struct dmirror_chunk *chunk) if (WARN_ON(!is_device_private_page(spage) && !is_device_coherent_page(spage))) continue; + + order = folio_order(page_folio(spage)); spage = BACKING_PAGE(spage); - dpage = alloc_page(GFP_HIGHUSER_MOVABLE | __GFP_NOFAIL); + if (src_pfns[i] & MIGRATE_PFN_COMPOUND) { + dpage = folio_page(folio_alloc(GFP_HIGHUSER_MOVABLE, + order), 0); + } else { + dpage = alloc_page(GFP_HIGHUSER_MOVABLE | __GFP_NOFAIL); + order = 0; + } + + /* TODO Support splitting here */ lock_page(dpage); - copy_highpage(dpage, spage); dst_pfns[i] = migrate_pfn(page_to_pfn(dpage)); if (src_pfns[i] & MIGRATE_PFN_WRITE) dst_pfns[i] |= MIGRATE_PFN_WRITE; + if (order) + dst_pfns[i] |= 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 = devmem->mdevice; struct page *page; + struct folio *folio; + + for (folio = mdevice->free_folios; folio; folio = folio_zone_device_data(folio)) + if (dmirror_page_to_chunk(folio_page(folio, 0)) == devmem) + mdevice->free_folios = folio_zone_device_data(folio); for (page = mdevice->free_pages; page; page = page->zone_device_data) if (dmirror_page_to_chunk(page) == devmem) mdevice->free_pages = page->zone_device_data; @@ -1265,6 +1449,7 @@ static void dmirror_device_remove_chunks(struct dmirror_device *mdevice) mdevice->devmem_count = 0; mdevice->devmem_capacity = 0; mdevice->free_pages = NULL; + mdevice->free_folios = NULL; kfree(mdevice->devmem_chunks); mdevice->devmem_chunks = NULL; } @@ -1378,18 +1563,30 @@ static void dmirror_devmem_free(struct page *page) { struct page *rpage = BACKING_PAGE(page); struct dmirror_device *mdevice; + struct folio *folio = page_folio(rpage); + unsigned int order = folio_order(folio); - if (rpage != page) - __free_page(rpage); + if (rpage != page) { + if (order) + __free_pages(rpage, order); + else + __free_page(rpage); + rpage = NULL; + } mdevice = dmirror_page_to_device(page); spin_lock(&mdevice->lock); /* Return page to our allocator if not freeing the chunk */ if (!dmirror_page_to_chunk(page)->remove) { - mdevice->cfree++; - page->zone_device_data = mdevice->free_pages; - mdevice->free_pages = page; + mdevice->cfree += 1 << order; + if (order) { + page->zone_device_data = mdevice->free_folios; + mdevice->free_folios = page_folio(page); + } else { + page->zone_device_data = mdevice->free_pages; + mdevice->free_pages = page; + } } spin_unlock(&mdevice->lock); } @@ -1397,36 +1594,52 @@ static void dmirror_devmem_free(struct page *page) static vm_fault_t dmirror_devmem_fault(struct vm_fault *vmf) { struct migrate_vma args = { 0 }; - unsigned long src_pfns = 0; - unsigned long dst_pfns = 0; struct page *rpage; struct dmirror *dmirror; - vm_fault_t ret; + vm_fault_t ret = 0; + unsigned int order, nr; /* * 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 = vmf->page->zone_device_data; + rpage = folio_zone_device_data(page_folio(vmf->page)); dmirror = rpage->zone_device_data; /* FIXME demonstrate how we can adjust migrate range */ + order = folio_order(page_folio(vmf->page)); + nr = 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 = ALIGN_DOWN(vmf->address, (PAGE_SIZE << order)); args.vma = vmf->vma; - args.start = vmf->address; - args.end = args.start + PAGE_SIZE; - args.src = &src_pfns; - args.dst = &dst_pfns; + args.end = args.start + (PAGE_SIZE << order); + + nr = (args.end - args.start) >> PAGE_SHIFT; + args.src = kcalloc(nr, sizeof(unsigned long), GFP_KERNEL); + args.dst = kcalloc(nr, sizeof(unsigned long), GFP_KERNEL); args.pgmap_owner = dmirror->mdevice; args.flags = dmirror_select_device(dmirror); args.fault_page = vmf->page; + if (!args.src || !args.dst) { + ret = VM_FAULT_OOM; + goto err; + } + + if (order) + args.flags |= MIGRATE_VMA_SELECT_COMPOUND; + if (migrate_vma_setup(&args)) return VM_FAULT_SIGBUS; ret = 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 @@ -1434,7 +1647,10 @@ static vm_fault_t dmirror_devmem_fault(struct vm_fault *vmf) * invalidated the device page table. */ migrate_vma_finalize(&args); - return 0; +err: + kfree(args.src); + kfree(args.dst); + return ret; } static const struct dev_pagemap_ops dmirror_devmem_ops = { @@ -1465,7 +1681,7 @@ static int dmirror_device_init(struct dmirror_device *mdevice, int id) return ret; /* Build a list of free ZONE_DEVICE struct pages */ - return dmirror_allocate_chunk(mdevice, NULL); + return dmirror_allocate_chunk(mdevice, NULL, false); } static void dmirror_device_remove(struct dmirror_device *mdevice) -- 2.50.1