From patchwork Tue Feb 4 22:47:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960031 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6871AC02193 for ; Tue, 4 Feb 2025 22:48:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED7706B0088; Tue, 4 Feb 2025 17:48:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E61446B0089; Tue, 4 Feb 2025 17:48:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB2C76B008A; Tue, 4 Feb 2025 17:48:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AE2CA6B0088 for ; Tue, 4 Feb 2025 17:48:48 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5C22F160113 for ; Tue, 4 Feb 2025 22:48:48 +0000 (UTC) X-FDA: 83083753536.06.133A422 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) by imf25.hostedemail.com (Postfix) with ESMTP id 57FD9A000C for ; Tue, 4 Feb 2025 22:48:45 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=I4C2yu11; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709325; 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=9nROz+ZU1a5sA3Z/7oGyOeNO8z4rOU+FFR+QfAhYlhE=; b=J6k0E6nV7wgF0phL9CJ2eElzkwhjMMWim1dZvV7oGJ8TECX63kRGrB/h1+KZCTORlp0cCx 0KRn2j9zhT7ORynorgz4YtMQ8Z3bSWKiz2tpx3OpUdWUMb7l5W3tZxE82aManBbpRHafTJ DOI8izozRmhitMBeTJDskW3nhx6d/VM= ARC-Authentication-Results: i=2; imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=I4C2yu11; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709325; a=rsa-sha256; cv=pass; b=tEehMILNqhRvslQVQPQKY/C6ZCX3w11hdbKDY1JAE5Fx19fja6n3DK5TYWo+3HOqM3n3VX HbsWCBHri5F4i+VIg+4wAilq41KIWIPXz2YN1ZrTmfIY1tmHyHcJWF1XZM4NTTyyeevXpx 979bWPqwYoxkLhsuT4HZHD5Jx61IMTs= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JEeXGCxQoDhqAZWH6ZO3LFFWKOGKXfG47pHXke2JvIVxuLzRSMwpRznRh9q0ELcJ0w1/hQDfgJEPbhemBiHrTX2EPRYxXzsZLeQlDng5WZmA+Da5vC190w9woxAwKe1jnMv0HLdWj+MH54AEC2TpyB2SvqI5dx+YNgnEvnXtBSZjGykLp7pS1dx4gu+ZqTB63w+tZXaOooNBpG+iCbqgTGJfUH62d4CzRlVyUWbcrqbfOh6JxT0wIm0Sx8lRsD/S1bZyR4xBcEF5Jz86EDOvvbEVN2tVnBPGkgh3QxBEdzrcfaKNE2mznx5nUS251TkqVQ3HaO6tQLpknDsmGZQ9zw== 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=9nROz+ZU1a5sA3Z/7oGyOeNO8z4rOU+FFR+QfAhYlhE=; b=urHyK8dAl9HviYCpnj9DUuoSpZQ9c+dI4MVVwVZceOI6KZTaS0EfRoLAk2hitM17iQdurGTRAdEfA/GBtby3k/sUGsVbY2ydZnE8TtueWMeVDlBX0/q+v1Z7C4VP0ntXEnn+B0lvpjPVfdA3+hr1OtbMv72YFBFlBPdZGrSr8FsDwG4SM6ctOr1vjaJbhHpyy9lLAqIGDKxGzo58a1C6bvQLWMK9Q6a+60F0xlEsFrQ7TxF/18S5w1mEJmYlw7nsZVCaf3QKBaGFzjHgAvjAizXIjStKe67OFgPwm2QyrRmITFLQ1Tf834KPiEpa3DUr+HYUeacaw5h8ULdzdIOpew== 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=9nROz+ZU1a5sA3Z/7oGyOeNO8z4rOU+FFR+QfAhYlhE=; b=I4C2yu11QKuxQWX2BOJnZ2dHaUNoCNOWqkG3xLYQ8YkVJHDbgp+7ehOKsbVlbBzfiZp98eph931HS3lOD/VHjynI+7UQKc/IXd2VZvqO7koUNlQjPYJTGwD/f0TmcZH8tPyL4uSmjzQFl/5mpuZBLIeYvWbvn38xwXMJy33zxeVz09tENqB5KQnwJ9GDTbwGv3IJcvTV3Exv+ZK/bKy0sHaaxLFmMOHW7ZaTZh7rfGHjuVoIHQxkK291NXeaPJhpR/HCQ8yHRIikKTnqyG+R5PaLRJEEIIL3QqSUrBOAlGL9FlCazjre5ibdeqDUwjCKgapeuHtRv1B5hMCPfaxxww== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:48:41 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:48:41 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev, Vivek Goyal Subject: [PATCH v7 01/20] fuse: Fix dax truncate/punch_hole fault path Date: Wed, 5 Feb 2025 09:47:58 +1100 Message-ID: <8aa3a20b072f60344e1d7e9b77a95aaa4b6dfceb.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P282CA0149.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:205::13) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 521e4fc6-0596-4f8b-b002-08dd456e1246 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: d7hsMRvoa3b9JPINSyKfeYMoDTgLnZEmlCFSiH/2LslWTEwNh8c14lrcmORVDqdMVDm1Nkp/vAGoJ4bteNP1vkRqvQTxM9VGqNAJCcrgvn5M3QfzhevWl6uRFtraS5zMdUAC5pTac3O4Xlvd/PCLUbjB/7X6V4OaJnI9LOVQ+3QWUn4yR5fn3p+S/COdKueCI/1K+7zdj4LA/TbE4tuj7wjA3aj5wxoe6BCsM1B0OguiLKru6UM/co05yyjKFTUlzehuFv2tWU+6/Obfjkn07CMfKzKLnTV5kBBsefQ9l1zEBg/2xvm9tZUL8T7uVbbtLsezm5BRrOBtRnqUwOPURy9elAXaEVKAEMp+vb4RDAwfUQ98fcSuaCNuUVYhqrMkkqR3azS4ZiJZJfLrV5898264rKJo4xUBLLLWXgbyWeI//rzxBiJnUNz8Xpjw3lGaG0l4pC5cF5EHkqF95Jv6BUZSRFcYXccVo34u2deoN3dQ1DCcxFKdQH7cr+uWnUbT9utHCCMlHndD7Z5i8ffetD4SB7LjECnh13yvUVQnm0NbbyEGplXrzSWvEMOVCxQe1oI5YP9RsHqBYyrGIBvQ+UUVf+tifbev8SwCUX4gDrN0Jt3SpcDY5+HIPA8XP90uKPeOAHNYo0UWTDmF7yw3MuIlVBS7neIBKa51eLJZzgvUx5MaMXM3ZG2fAaEUH1CBkmxkOSkJXPsnCTNRscbfsw4gshhIgsEMgagjgPg2mB9iKv9q9IooIuRB3TRejNLVWUFwJ4fVxY/stBJaBaEOiTr+AHIoxHiJqGzGgfFpJu/uRkUWaH5gnbjtsr4JoUJjOmm0tY7NW1QFcDMoR3EBxUPY6xdGhuyfwxV1Wz5VXEhXLKG2vHYXVsY4SmcMQt1s8d7+n0KF13miZcNKzekShF8gCaBErmtmeC5R6EbgDyK335FNibSaCvbDF8MrBh2xmvs55RiTnDbrobKjswhOOZdooN6vXilAtB6nFGJ28W0Knfzv1jJ565LSXdtclwzrjaNLz2f0grWRg2gGssAvKyur/i03CpSh2raW3hr8XJzuIO4nl6lFgER/OoCID3tQ68U4qWyqI9BFc3AV/waDy2GA8tsXorbkcum79op96kuiNT3r6EJ6Jxk8tOYhW8JDZeQslzZv61Cgb4lNT5uRIEeyUAo50+FEXoyVSd1g68XujSDzngAJayhn833M9C0FEIRaildfsCaM9BsuewwbW4fx1heO+XqxSFwlEZTijYULU7uT8UTGjv9yXwZNnqXZSACzEppP+ea59ozXHTfL7Q/7556QrFASr4T7CMxrmMqA2/zgU2t6zUzMv0iQPyI2RqOPUfggeMgT+E4RO3+TD4z4LdSUkPjCB1lNcTQHVE0nS6ZH9UkNtPDiTeF06rOG X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AYK5LzGbZtHy34PzYKIgpSdhz1eaWHoqd8fP21lBt2TvGC+gk6rPfArvYymCM/Nn76tAs8X1JgpdidkCG3hWF/SfvGMgzA7fivs1Vin5OruJ05zoi1jQxh5BbKdPxq3u0bE1c4+KQezW72VP88LZqYTblZn/T27xm+kZlVKOfTWRaQxS0WGkIGGzF/aqGY2OidIMCcLuB0X2yaC1+D1f/Y4dGIu38R0WguGTR2PF+vrJZNMVUzQZScwYU6Dy8NxP6BjmdYj2ACx4dg6qWJ/49l2BrHY95GeHpwMze7rI9cNtSVCrTc1723hPgKp61dBZ5mXYabCKW0kSpehsPTzurD6rG/U3GJBLEYfVpyOP3z55j8cZB0d6TDo5nwekc5S2KlfO1qVlU3NFqxPJzFPBOgP8TbMYizcxysqR/VzCRXTiwqqJ66F/6FNX/f+4NNHPr+A9XQwLNLY0ZJMJCX3R0MVw14S+miCGLJNdRFwrhGLLkwep8J9U59mwqfOzuH4RxTZyQn3qA+qeyz0MTXOnNOmZLsBepOvAzXBgb3UFdeIz1jc2+uHEV/qIKmLfCsOqLn2X/GSxsp3iaBdQWj2T4IEw0Xs9fkPu/bgBjKlRzV6Aa0YBZFfdFh4yFDB55YPkr8lzIn9tiWpPkWIPhaJ+4OyIPDI7UsOve0tUAcq2tTZZ8E1lNOxGYdukGEe+OUhpLRGbzmpF7J8ZJkEV7sXYxdO3nEMxlExNu6DTl3ye/EpR923Vvri7QEJ6zY8NFcXHuiqepAOUkM9zAVdlym2Ad3AThqm+zNJQbLOpUGfqr5LLM7mF6+3nXtECtn9lVr9BsmMnWbY0b8NpXapBssq7yvv/tlTlTcPP9Cqhlh4HCq3ll4cKt7Pw30GtCv5//hH48csWmC0xkF+GpY13HnvTQtCp62kX0V7KRH9Tb2Wwgt765pD8fmJiEMGbafSIV/WugoIJ40Yf9/60SD5cAwlz10+Q7TivpNjh9IoXOWtrV2fxoPSNm46fEvRT1iKbm4CXlR4rDZMbsI+A+eR3wtnQWEO84ufKoCDfg0TR99VkCkTNqAqPfWMpMpywszPIuRLkWo46FkS9K5ctoYFpWG/MOfvO1FR4NMulHpmqLd6hpTH5I+FV9zAR2z3AyTicX/bvqYftqLyfpFPCi26asT5DT5v2E1W/nXq3bxbMhKNq/0PCaQVCOd4eETR/0TbRHPhSGx0cNZRPup+b8Qbd+mN8lA28vEB89gIlcvm2tK1MmgBetmnnYmMsRUpkA1lDeyba99CgX7vnxoYxgsQ2qUK453s61qu1rFLHLxINVF/WEss8Hvm9fXI2ebOylrkM94JEtsJkDYehX7jk69AYDqriacrw1K8IgcJOUFMOJX9MWaYjYXXQcgo7UgVUX8W++S3EWnTwTclEsLHkMGCBRWA4i/YgPsjuNWn04uOj53B4oX1zeGB4Q7THmYJwTysQy09YqMMP5IGexsbT9DgvqDEJ2ZnFuP8uZVWylbaYiZOj2V7CJTEzFu/ul1BZJKABnmQ1K66hbzloBMcujB3BgbJ0+QGzlngoTlnYiuuVbrn6jvt2vbyMGmtKpOmEQFyak+Ss X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 521e4fc6-0596-4f8b-b002-08dd456e1246 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:48:41.5096 (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: tbczPBwemThEbdhuCaAl0YMMwEjsjPWe0zUs6B0x/O3Ze/2HjdO9ujtKYDT7ef2WQaNfFsBKu1TmnQkz8guAbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 57FD9A000C X-Stat-Signature: cto331u5yw4sfx5n1c4rq8cxo3fhxpue X-Rspam-User: X-HE-Tag: 1738709325-774179 X-HE-Meta: U2FsdGVkX1+mPDRCN5cquqjLByaLjABGSiUsUQeQIZHT19Rf/YVjZe/+AQ83HxMx5ujwAG/nBMAComLLQ4+aYWWxXyQtPU59EYomXLZpfNQRnStKDO9ShNnBhyVofLHODap2VKBuL+4MBLmiKA86KTU2q0iN60okX2k7Ypw43/gqaSCpATOqgGyuOL2Y1zHa8gWJTgYMqEYyLYsWRTSR8YptJcAh4Y1dFm6TC43fAzfqjCLC1hR/iv2PGa0AqQREj1sLVazNaPyiP30RpDqXPcacRt/xsASZXNksX87aBjzCpcrTS04XP/H2wD61vX0wnXRYib6jNrOH2PMEMpapr7aIiYkdFpW/1xfjxgfgQbYoPOI/IopmbkrQTjhUKP1W2dmd9DUu/PhYngwv+JYdF+03VvdUkgldVjTi7/Eb1h1AcF1PpuDp9icimeHrd33/TIyMVoejeb3Nksq8F9YBaNdDUBUYeV15PjQuXeJsaBxL9DNruYDdBKA5LZPWQ5umgj5cZPf1oMThRvhzIraJou75bybvb8lIcN7FQrFgRRohx/vW7pi/G0AKkMmJmeICR91dCu4gAR57mh/Ze0UXDhOVVjkDiH/oXWHD60T+K9atFvAXfIH8IFTSxJ+F0faRpoBE2wXUACPRrjAQqgJIQiZPXm1vInXfPZ8h30ER0MGIB7FBbZvMMspdq1BoaIU3fbWEn0ixXVPM1Gz2VxM1Z2+JCYyd0004g7xIKWXUf12NBSfkbqhsYRDqkcG9AuKBuvnJGVX52WM8eEqrpcUbJA8KgWpzOhcgKdJCcetrvTBDCkQ2xD1JZprUS/MGeWhucQ9ll/XlN5p81U4/RP7s1XgRp/X1gDRE+BtJEqSD4W160SWehsQacV/s9imML/4k/yQhpHXbWp5Si61ROYdOFSi38FlkwdhUSK1ZeUFtaFYEhbuJ1TMmojHr11dm1okTpMqBGi1YevAOlMDQo2D BYPQ4PeH Al7vk0zgOU6Wemql5sbzNsAwqckDxz7IgvpqqJUrfcjn2cOoKnNnEDI3LHwJtEHqHKHncIfn/hX60wL8aWMgMTNVuRWA0Q0F9ioO8FjznBlqLh73ElvjtECCKoPa4Vv/wx6srMFz6J/mas1+eGz+WV9vKdbdHUnK+ddg4A5cLPYpj/tanprpBWtxF/3TUCrrX59/kyjmGccTAkD46IVbOYD5G2X1MaRjfCeZu7FpR4XXZ2Hyz9fHAsQ7KEOLS802UjYDlvRngQSJJlpU8b744iDC2PbDjL9uwimnL3Cmb5TkBndxJotf5M9jQ926NjsmKBmR2RSNVIGuDnYW5n20HDQ84wd493Xs33NWc3AltlAG4XMfT34E6bmOLSZH/AU/HKqTZFjw07T299C0TUShfv1cUDSS6dEZyFCMUjiFEI59X76UGisccJneo6CLbclECxjD3ktcRNPvKLNJXyYsPC5BaBa+HZ22w/74ASefa9hjVZRMKIC3VVVo8LB/P35LpM1+b 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: FS DAX requires file systems to call into the DAX layout prior to unlinking inodes to ensure there is no ongoing DMA or other remote access to the direct mapped page. The fuse file system implements fuse_dax_break_layouts() to do this which includes a comment indicating that passing dmap_end == 0 leads to unmapping of the whole file. However this is not true - passing dmap_end == 0 will not unmap anything before dmap_start, and further more dax_layout_busy_page_range() will not scan any of the range to see if there maybe ongoing DMA access to the range. Fix this by passing -1 for dmap_end to fuse_dax_break_layouts() which will invalidate the entire file range to dax_layout_busy_page_range(). Signed-off-by: Alistair Popple Co-developed-by: Dan Williams Signed-off-by: Dan Williams Fixes: 6ae330cad6ef ("virtiofs: serialize truncate/punch_hole and dax fault path") Cc: Vivek Goyal Reviewed-by: Balbir Singh --- Changes for v6: - Original patch had a misplaced hunk due to a bad rebase. - Reworked fix based on Dan's comments. --- fs/fuse/dax.c | 1 - fs/fuse/dir.c | 2 +- fs/fuse/file.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index 0b6ee6d..b7f805d 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -682,7 +682,6 @@ static int __fuse_dax_break_layouts(struct inode *inode, bool *retry, 0, 0, fuse_wait_dax_page(inode)); } -/* dmap_end == 0 leads to unmapping of whole file */ int fuse_dax_break_layouts(struct inode *inode, u64 dmap_start, u64 dmap_end) { diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 198862b..6c5d441 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1940,7 +1940,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry, if (FUSE_IS_DAX(inode) && is_truncate) { filemap_invalidate_lock(mapping); fault_blocked = true; - err = fuse_dax_break_layouts(inode, 0, 0); + err = fuse_dax_break_layouts(inode, 0, -1); if (err) { filemap_invalidate_unlock(mapping); return err; diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 7d92a54..dc90613 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -253,7 +253,7 @@ static int fuse_open(struct inode *inode, struct file *file) if (dax_truncate) { filemap_invalidate_lock(inode->i_mapping); - err = fuse_dax_break_layouts(inode, 0, 0); + err = fuse_dax_break_layouts(inode, 0, -1); if (err) goto out_inode_unlock; } @@ -3196,7 +3196,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, inode_lock(inode); if (block_faults) { filemap_invalidate_lock(inode->i_mapping); - err = fuse_dax_break_layouts(inode, 0, 0); + err = fuse_dax_break_layouts(inode, 0, -1); if (err) goto out; } From patchwork Tue Feb 4 22:47:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960032 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7640FC02193 for ; Tue, 4 Feb 2025 22:48:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E62BC6B008A; Tue, 4 Feb 2025 17:48:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E11726B008C; Tue, 4 Feb 2025 17:48:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3D816B0092; Tue, 4 Feb 2025 17:48:53 -0500 (EST) 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 A43716B008A for ; Tue, 4 Feb 2025 17:48:53 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 47EF7A025E for ; Tue, 4 Feb 2025 22:48:53 +0000 (UTC) X-FDA: 83083753746.21.97CDADE Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2076.outbound.protection.outlook.com [40.107.243.76]) by imf25.hostedemail.com (Postfix) with ESMTP id 7F9B7A0006 for ; Tue, 4 Feb 2025 22:48:50 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=iYXWRh0k; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.76 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709330; 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=xy8qh7i3mZHDo6zytroBAIKc7I21BKCOmZX9uuIf+jc=; b=2YVAjrOc1B+ZyuGLvf+joRDBrWRF492ujG+hTkwFCJAmuwH9M1Y/jrmWi+LPVvM6SUHpGG Tudqo76OPj1ANmk8D9toYcb530r4t/N/5wRG/vUmnrX+ZeaVBx4Q3zCRRRbd0A1xuccnMu PzIE/0UiidfT5EhJnEzrK7Jf+ZPVPZc= ARC-Authentication-Results: i=2; imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=iYXWRh0k; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.76 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709330; a=rsa-sha256; cv=pass; b=OF/inHvNgJPkbMkCBQkY0tdR8XUD5XJs0lLEq3GVVJsnXZ/Yl9z0I7TAQUHvbT1D72rx/w 1HBUl6aEBEtiSjN8ZiW3UklmHb1c+Y60oj6WhkmQINqj4Ffybn5npN0bHznV9TNIGhZfzq zYI6aZ7P26DOT0wLSJyalXjK9d5Aj3E= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=igbXI7AwUY+/zcXGmse+b6AjzXtTc81D6u7pFVkVD1ZLd92Wh31E7xjoucbYrcOeRKDBjIRePmYza8SZrS1ae03dn4m4lR9BRraXU5Pwdu269S+ZJqB55+vngfKRL/Smn3DJ1Eiy3MopEOSl0zaZVmIEjL8lsOfz0jEgQCBHSIyqWdpNGP2hag12XJuUsp/ZGv5Kwq2SyaE7Gi9J+/TZpLeEPAbVMQ29I+wiirjdeppEiHjnnWbo4XJcnYkWVhCMd8OJqMb0f/soqFbFa3/qXaPok13bI9AC6/K0SxL2P7LY/SrFlBesYiGeSe7gjaUOKb8xeD7CMZyE5aI3Zvuv6A== 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=xy8qh7i3mZHDo6zytroBAIKc7I21BKCOmZX9uuIf+jc=; b=vD52Z/5IQ26a+f4d2F/wlhOpm5tEOcB4BhvzYz2tJYYwbfI6UAAuoSj0pBaEx6UgcXy/8L01wolPoh9Zphj2s4Kfdt11L2gPLmqrUiJfOLCSlE7K6eACgLZmRnr8v2KjpYGaH5gCEGZ19CnBBH6Cu1otXdMMTyfIu+t2H7oQed+dRGWDQVlNnkv+0Tk6+JWiW0Q+p39aIeXG2Kyd1NKUBrIMp1CAl0sQ2gkJWLbcRIukGz0c6O2me9enbHHrAJ31ABSInkSaDC+yLIrVssF4kp7P8K1sxU9KwhTgKaiXQaOPnzmwjDTWiDZH9vaNcTBv6hY5selNJ84TH+OFRKb0kg== 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=xy8qh7i3mZHDo6zytroBAIKc7I21BKCOmZX9uuIf+jc=; b=iYXWRh0kdopltWs0Bmv3QN7bS792gQ8iunuLfKaZm9sJOAmhWpgwEP2KV+PekTVY1J7BRCdH6s0C3TfITJeOfJjv+ro4FwHb1sMZwAWNGzuGRDOpMnodUwA3MT45QIdU1ZqR3LoryXas/ldSu1ByWkST1mCKdUR8P/ZY7ND2+eX4SUJnzxJp89OxKcyeuBZ2VyhrAL/8//i00YqaYee8O/+oyv49kMVHA6sN+uEs38eRjlmMpIBaAVABCD7lWKI07OknIQdj92XjGyE8j2DiaF4Gt9lIgTyIK3NTl+70RKpAZf5AkRxfY3IZc2L9phgSxHrj3+QBwKBs+F88ZeIgXA== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:48:46 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:48:46 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 02/20] fs/dax: Return unmapped busy pages from dax_layout_busy_page_range() Date: Wed, 5 Feb 2025 09:47:59 +1100 Message-ID: <23432568750f099d32b473f64b7e35f0671d429e.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P282CA0147.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:205::6) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bb8d060-8c54-4588-b70d-08dd456e150e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: mOEyr54a6D5XFS+w9L7gjCe4u+hot5lR8g5eit9F+Xh0+AYugKYGkjy1Qq55ucL1HR+3+ROEDZECehic4Yq69XyDwRaQyUFN/PMP6KbmpSJt4p53z/8eBfzqV8xR/d6sI1Lt78H7xn6j5mfzcF0l81An6cMLnyWtQp9eRV2xBwQfDyTqTIVU49oZqCReK5n3v11oonv1wqEp8iYSnjGJeh4Q4DWaejw/nqTC20kK/4w2CCD14P+h311mvNkCf/IUhKrogZvkt2x0NCkqLPQNPVrh4CpwKg9DRoHEj1I0t95nDBRAoFLP0VWaugKXXb2Qo1afjzLzXjVY+opaAmhKFRUusV6hOhMwMWYjvx3KOEp90ZyECXUCJgPQeT7NfXDoJw27DtCL6lIETovEugG0W6X9+lqP7/KjV2L2jj6gKRFuy9HP6gm/XhYQG78DAdz1lihJaPPEUr3ydFZlSm/ccSmhJUB3gv5Y0gA81WeDVQqRjf4gVfBxQY835iHTBlrPgyQZ76zaLII+IkzgZJXRk8ZF7JLUX71oYuyFPmEYVe7xFoc6hbwW8coKNtOGCNjsKrJJlnGekxqyKhEHI2vULEpjsCaKy8NwJVt2FdJXd33ryW8bjFvo9pBepbTTUNkRgnx/KSOUHRWKN/UqC+ZdcE0T/9n2CaL+R5oLpDPJjsTizGkj/O2ya0tJoeNmJfDnlUc/zznvrDGH5Acrwsov1yteaWvDke5An0H1BAfwto6x60vvloEDsqfjkLrJLOa3NhfkDClDI/0VU9TIOvD/1kxr0XwNTGQsjIwdC95HZ5TS0cXxWzUsvnwjxJPXNVTPxVbmOefM+0rlBF+NsDxsx40B3bUKRjZzqVgQ0AUa0kmnxv0psOBIRTRx6smibnd8//N8K+xJSnweyBPMMb4O+0r0FUUaLW+ur29EYlJ0VNy8FerN8o4eY9DscAODXw9mLzwTlzkxJwrttWxygrnEKqt578jBYM7LqV4NotMYCHy1+YrEctcyNh8KH9hQUGmkZF6it5PnAZuyYpFyDfvyk/Lf2Ao1J5HpgiG1WLeDMNwNxJsaC3E5Mogtl9yfUrvBcZkrp6dn2je/+EP4PFLl0MKyo7PUsjUxmVNKi808siOkpeIpqnfQYNWN+aU8r7VuXckDwH/BJRgbVvl/IWDQJRM4TaBCwi6cAJjldygyRweJXv7msLoL3+L2ncBkHtw9RmKFYIGUti8dzk+q+Rigm8h8mrOUnVdJnZx/x7ZFB/NDHf9TEVbQNjnFdKs3QqqXyiAypQ3IVRIpcLP9tCURI7fjtxlNqmOhi5JQwZY1iH6keH1X5M3+seMuqq8w8IvBwdijkJbB1bqq0Gxfpqg+5grm/nksf8rFtf6GUF4Aeh2mZc8haYA5nqvjsAGFOF/6 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dILrTOIXuKFcGczDMogueiHpyrOzJeidqVuHq5LcVvBbz+M0BmJOktpy0IfQ10M6MoBzYW7Q+7qYu8rDOYXBMeid+OXh9EHRHLpvtsS2j2xU3tJiom/GkDR/jMwzH3PDOwed7Ksa/zdAvN4gcUvM6a/Eqhap1od84IjJuheJVEMzGYaBrnxJU/oN83a2gDu7Vi4/qxIW0gdfOk09Gn6noX5Ht69JqLyxTnanDF8bqqqgRPerk7MWOqz3lQ91waSs8hnrJe/i+qJEWVsDlhiHCwh03B1eAjeaN/Mgge3oX9SGKNaTet/6UaXH6M/mpRCQYpHgp2w9+7zNBx5iYWEncXfKMlnjpDW+TkwynDxOQ7Uj7X6By8sAm1WQ6dOX649IQRV20lGJMZrP6YpIV30UDPrLDppHLJ73JHi/f+CoRCEJ9OJO5eOuuf2EL92DY6CYBbp5tvZTFUc2MpxuaK1VOQLx46EoUJZW+SwKmFry81ZPYtBcriXfWJodo6TB3NzsFG6VMuUeme4qeF7raco7p9nObIbq1B8b2QhKeicZOxvI8DBa2tteb580J0oGyIt898MZMcIQGM4lJFSVb3gF6/JpCg9KnaD280hLOIMQSoaHxR+Y7iPR8R/ltECgb3pWRJOm/98WfvfOHxzJnnjAX7/6Iq9F1qPfeWF2776xWnWxtXmijam0npGETBYj6hOwyHezcxYSE3kq9gIcxkazylKMCbnw3IaqKgzhS6ERLufKbyjyp81e/R8EWFiPJouXV/5RckJ/m2OHKtN/gu3HIFCZIdAzPvAi00o7540hb1TOAFmWjrZVm7k5SAbXwVZFbpalaz0YfLRncWoiLCCNF8j/X1XyF6aA/tGH4D2t/CZiZMw4d/b/RAdu5wNTO3sda8TCk7H85OMOCdI80O1VqItME7QXDRl3HwLxwI+GYy2zG18T9vmCiQqPlAyou1nhz/a8emu+qZ8KIN3bULbRHHT0FpYmSc8KmwT4QfaeEM41yRHnYfBvXru4uXICF4vadSBTd45/wj6BKjHmSLl2QELePi3M3oOZr26zlQqcANhWGqEn6Uc41AJuhL5NcEepHptHwKJK4Ad3mST4Q4C5IQtSI9hPEFGw5DqW1gnw7YGHWlIQVSgt1WnzKaV2tzb7mI1qcIaMKS0Vuj3XdOQVHUcRn9ob2Y6sB/sQwtKD5a58622c51pJAXRb4Dsrj+vSCsUJCg4/xZAECKm8K+g81vI1nL83UgrwiCWZ84qw4nk1noeI9V405AAsNjCBSp8N7nk67kstdBOKq19MGkfiNJkAY+Q8zS9RCx+xOSn4wXZICrUYIZZdIReqCnqnY447H99THs3/xgHJaIKfw0dgTPwNzt78KCVgRDGhStuvcHCNoJy1HPEnYFQ/G3mFSMHwvyRuPpPaEV/JZnfyTDk+Fd4Az7jw+S7j6fHUdurpeOqREpLla7fn54yKlwkwsvR0X01v0ThADepxsx0eLHl828zhTE7CopnuXwdmGDgzK5T0PI6oFZc/hzQ0gRLZ0bFGPh28cy7Xz9ySMuWZhjjuj9GQjwZfutkUBjEoGrHeILkIAfbU0SWdrRGsrhmql39n X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bb8d060-8c54-4588-b70d-08dd456e150e X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:48:45.9629 (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: wUdy80ipMeX4mocuzkhDeTzlIC1WDKcecGvDuTnnC2wGs8E7VXFzZPSmSscx8LdtzQWSoLKtH6Hbs2t8ymD4lA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 7F9B7A0006 X-Stat-Signature: ha63kaxbtxzck94s3gp78qp6qoxnk8q8 X-HE-Tag: 1738709330-6792 X-HE-Meta: U2FsdGVkX18koZCuUNwUvf2bM84ohiGUzArLkx9pcbf37u9etMzLiNF13Ha6/p/JVqKB6y/veZ2jg0cqYw8Fka6crmrrspHQ08/GApsX19Yb2sqcXv07sa0dOww4bHKr4cqpjbRmqolgB/wH9FAHs/idlbgmxU6ppy6gV2flw7GNUAaNAlP0u14DffVy0p5Grski9XpFuhwdnHEXDhq7+jycfaOtwK8GQnYvuVUIgSBwgHoRPgLJdDcxehwFWIGypZ5nBdy2OC607K5TltXqySgoLNFb8E6OvlUJ8IEkr429aBwzwGCbwhXCIno+i8L4BAHt/Wq+vkN9YtysCMANr8nHBG5jx6tDfwfzrY50YTA/4HMCmKuZEoA8bHKjkVkdyoirP3JYzY/r62bhIiWXSBgHGvON/909aiCtuiLyIUh62F9/pJJtdlSCHPQXfX12JBEtNTWqaXpqRuTWPdLOvm6couOISiTX6XJGGdhOojomQCA+boPasc7HjomeM5ZlPKOEIerlFw1TJrYApf5NWbiRREnT2AdQjMaPtSUSr0kK+j/0W5ndtGFUyuACheEb8JmJ8eEqEfi7x2UC91QuiJtyUbOvNUd8hRXMjll1l4tTwnLu1IvHiVuSa1+KyxSS2Cv0i+5sV/BrRazr5k0TjhnX2nlNV8fjA1CN4DTJR5+ZfDTfQe2JipaHQAAzkc4MX5TUUhUQJMEuybfgoa3YVhN7HLRCW2kYMaLjbp26mlpnqhXtPhVGhiRFe0pqUbqWhPBqHOIz/mlWRo4MzqOa2MN0LHBnXIE/ILwj+nvw+dNmFgW9RUmxzi4atG6ddqMjxpefbZMQhszPXjeDHlG4vqN7GAogkouenxW4N5CUlzvexdBccLrMm1Ig9gbaO7kkc6qygvnzjLwVFOigxhUo3sr95z68cqcJyVRruCLZpRWEBKQm7KqLRuhrvZrONR8EVme/NZpotm0T0cHZZbO 2LLXH1on JC2PjCHsgY/RBdlKWfyqbSqbmTkXjiJRFCkzVSnmBrkPvRn9xw9rkW61pGaYVQXCmmCME8XNBLzUgrRAkyrLjgDg4Z5DJ8L4V8qAog3HXPVXt2CDjjUlrPb3YjNaYMvuChbxLu43sVFSyN/nlDiBcFtUO8aBVY1lSGyDBNyaCPRGKnF3CNz5TxqJikpMVDoDjKBcM+pDVTR746R/grKuoMOpIoNcd5O5metgM1H65s7FbEZwtZte4X3KliFZGGE+ON5lWX7ZtXQpsuFlU15+3N94r/Aer/1vtzfu07IbeYDUGqo8tQ0JVNjZVod1wx8g7K2+ILvhPeWtAWEuUJfQbDaMKIpkCcokCUyIMMrP7CoAhb34al9s91eyXDwustWPFjNGvpTzHCTjqw12r6WZTClofR1G8Up6lpkgJ55/Vv7TT3fxEkJnDcl3a6i7hYcxx9WhS85L5Ts1d7Fa5xFcK92LmKOJE0J+VbigxkZwYJ+7L6MQ= 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: dax_layout_busy_page_range() is used by file systems to scan the DAX page-cache to unmap mapping pages from user-space and to determine if any pages in the given range are busy, either due to ongoing DMA or other get_user_pages() usage. Currently it checks to see the file mapping is mapped into user-space with mapping_mapped() and returns early if not, skipping the check for DMA busy pages. This is wrong as pages may still be undergoing DMA access even if they have subsequently been unmapped from user-space. Fix this by dropping the check for mapping_mapped(). Signed-off-by: Alistair Popple Suggested-by: Dan Williams Reviewed-by: Dan Williams Acked-by: Balbir Singh --- fs/dax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c index 21b4740..5133568 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -690,7 +690,7 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping, if (IS_ENABLED(CONFIG_FS_DAX_LIMITED)) return NULL; - if (!dax_mapping(mapping) || !mapping_mapped(mapping)) + if (!dax_mapping(mapping)) return NULL; /* If end == LLONG_MAX, all pages from start to till end of file */ From patchwork Tue Feb 4 22:48:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960033 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6ED36C02196 for ; Tue, 4 Feb 2025 22:49:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F25076B0082; Tue, 4 Feb 2025 17:48:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ED5556B0092; Tue, 4 Feb 2025 17:48:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D00826B0095; Tue, 4 Feb 2025 17:48:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B2BEA6B0082 for ; Tue, 4 Feb 2025 17:48:59 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4A51AA02AE for ; Tue, 4 Feb 2025 22:48:59 +0000 (UTC) X-FDA: 83083753998.24.059B7F6 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2047.outbound.protection.outlook.com [40.107.244.47]) by imf08.hostedemail.com (Postfix) with ESMTP id 8BF9E160002 for ; Tue, 4 Feb 2025 22:48:56 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=cuoz0FlN; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf08.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.47 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709336; 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=+5+bIA5D/ZXBMmnESNZ5YW8DsaUjooc64ARwvTry73M=; b=W8ZVrO+msIpbQw1g+kqi5LbLRNzCcR1BJPjrsyYkEl3FRG8IjNFLATJTZxIDKgHdntdqJU avmMBiKX3fgNqJZwYkHku3WrtAnkqD4TRm8yq7Ni+/2JLooH2XpiL4USqk3aSQxFbpsbzh eHwxcwZRxYwFs+BYmDs3AsXb+cKWCEg= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709336; a=rsa-sha256; cv=pass; b=XrEbcRs5NLqzcngj2FpeoM8QCGWCyBX5ff0fUK5dLc/MGDUIsJ4MdDuFvBfUNKWLe9WbZl 5WWAK0XApfHp3TOUgRGfFebi8ao+7OKC9zXaHgRm4KY5luwAxE13kcczb/RS7E3oxqbpyy ridOP6p+hrjENXc2mIY64X2CShDeCew= ARC-Authentication-Results: i=2; imf08.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=cuoz0FlN; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf08.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.47 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nacRSvhxL0v22puaxYbY6jkkjIyVmkY/W5fw2QL4wEkn/E73Xca0RMb82ZPwGpsDaIKrcTjNkSnm0XvR8ht2FHJfQtFGBImzpT3mg/V9RqQdCwAg7tMWe5pT/7uZkM5LNxNMPDotT5OcqRLZgWyc/QgmD7yYSXHyBgDBCUa5gHKr+4fdSp1ich4MC5xegipw0F2leh24RRkZ3NNutY2w0wPef2Rk2dS0qSbL9TmLF9EEnFm9EhZv12KKdHYSU7Sbu36UTQm6a8ZG6MC3y/3hK7XGEX2YsPmmi5sCMJJAfBn63w7aElHX/xwzXuyVdXasZyLIOIoWabvQ23jGQhyzhA== 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=+5+bIA5D/ZXBMmnESNZ5YW8DsaUjooc64ARwvTry73M=; b=wJ/EtV1DSeVQE2hFXBDePm3XJYLU8Qip5FuP7ByJWf/Jl+YrNSoXKWL2zt7rmqoGoAte/XSG97MiIRFPMceVy4gOavY/EmV7Si4PzKKTkszIA0aChG/+hjSL3j7uT66/kVVs55jUrE6MWaEACXAMlQu7rk/xtznRYW+CbhBxHPPWTfzOWxv8E9ixSCxcQPM7GdOiosBWuj6uxNEbp9M2MQm48G9F2jVmfpX616+Vs40NruJ5HOmPwVVyHjqi7ZPLRgcODnIXIzgB29S4+sAbYUds+2plRYUxjY3LsMlN9DqwZ/P5ZRDkpkgjkeZsNXfdyZrdbgif299RX12HJfsnhQ== 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=+5+bIA5D/ZXBMmnESNZ5YW8DsaUjooc64ARwvTry73M=; b=cuoz0FlNwyjH+m6HUoXGCUn04/BVLNEI23YFUBU33lkWMmD6s5HFk+njaPIe90NJZ98jkBqq0yfhem3H0kwtI8odFGfyYx3XSN+/bjQjwW0GmS/Se3qFQbIf9adhoZTmN05Yug3UVk9oKglpmQ5ZgR7+Q9WAeZ3zdNwIBhiaNicyRlIr6oAKcMLo3AvhPEbr8vg+LX/4ZM8Bvz7jlTsnruDFBqIQOdTyDLMR6gZ9zpMJ4o2QdpzhfnDCEo7UftXPKHgeZ+DUjjz5g+G/ao1fGFN6n2riM8fR9HSobS5fFMBpvagWUMbRbNMrxJ2mB2fKEc/qlhlqCtRuFGzqQST7+w== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:48:51 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:48:51 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 03/20] fs/dax: Don't skip locked entries when scanning entries Date: Wed, 5 Feb 2025 09:48:00 +1100 Message-ID: <1cabe0ce0ca3b19ac9b23c4e6a492775293488ff.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY2PR01CA0029.ausprd01.prod.outlook.com (2603:10c6:1:15::17) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ee3f2aa-ecf2-4c99-c4fc-08dd456e1813 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: W0yXZ+QKG7RMmqXKUUvYr6cM3tfMIA3pFeQRP9GFzMh07mamuso5YAalEej5IqxP4/rzwmiddPnCm91fq4EI/KyZUhU7+G0a1GB9CTY8G+TmYbPbZe3btVimHRB5icOAiRzKep/c6Ng8RyKpuziyZMSL9ulLf6degt5nmkgGKCMzLzOB7XsVbLkQRLuf2SM/2jpphkWVi4bemj/6+UFTwY7J8INzuyXUNZfu9jWsM/9c7Pry8ezMG6vodmD9Vrgo8VkBp807ZUoat7KHy0QJFvmBqZiziacUFKtmNryACvu8mpRLLjl6eVBLtyYjTiO97ywwTYV7hgVVNLSP9Xj8S5F6plE7bTHZX4BW41rB826uYxuAEbGkW3KqmK1YKbcFVkpResgDtEvgUHD77EQWdDw3R8GjKmrCrYSBwWFlhhncirboeelgLO8ZZqS6zXQxqn3bCQMfAPcLmeLpm1X9L78lV5BRAUqUk2q/o/tNRi84n+CopG7sAGNpDxRn5LMfxXsuTr0jQ2hFxyA9lmFrmEaTXUjyz3iyArqZy0ZTNWdpMpJ7Y9wYz8KY852PsF9TB1jIXwGx7OgObbDuqfVcku+Gxej3rQic2X6M8Hh/HNGViYcRvs6oCARVB6OIjSTMmeDatGQuVQikWaVhO2HmFr28eB6MQ3pj4au9pUz6wfoZ0I6MJ3oTg4aOauSkw5lqKWvhhbuWcihEK32ca3A7/PcYCDSFc1hksXWGFdZjaB6iqnZ/hjhb0jAM6w8ynkgZpZWvA0TA9zZF8YutDsRxqzAvmqVnhURVgGwf9Nuxcfrjn4n0sNMPo9MEs5yyPEUjRKSgdTe1OP7J8qVAXMXNrG0LBfItdUO2BMGe88xI/QPE7inm73LsCjccI9Jiboma2UJGNkl5OEk5jrL7F9Vq/NcXx/HhCOqyi6Hj4Z2p9h8JpGKZ9e9BMGbZsnixtS5KGoGju3G8ATAdBgaU0a4gUr7bN11N0HqDGIvi7iFR9lDwe9JkurlCwa0OvfHfK3+k+cjBdZofuMFE+Ixi2fGbI/SVwWWjd4habQWi+eBWmxmOg4IuOLO8hCMksadmJIyOwjCXEUMB7CU0fFdQmcmzuw9WVOMFNBbIltBWx7PhxKm7EORf7Aoz0YnYSCeML+7DvXnfjx39NOEqs3WQP355PolMi7fw+bMxuZwVkoQX1vaxJcp4//UUeyNRaNHs1IoFbBHnitjAyilmRFmuT1w2HNgmRrcia7hwO3pYcEqHD6etYlJ0MqqymsDfn9QlPPGQUURoPrGkgYjdwPwtJ+aaB8f5FbdXnm6QsbCps75wqHjqx9dmendHxDoKLGktJNr6TcfK/8pAvzPlPYlJl62+zBgvYAorcXbgrEO90vD2oHrmOOl+xB62V5VlgCDtMVuN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: D1mP7YG+gWOtadd0cYKGSUFX+h+lqqIkAoE//zPk/V71hWMhlhGLSCPsFa5RNp5ByOqANl8c7KZJ8j5AfS0t6FIMFcaTGvEn9Gzjo8e/UEk8tkiP5X310yFdsStBxKC7Ly2/IXef6KwmPgGzseMbGnfSWynaMZSpPLmPxpQOyh8BQi3Z+VlVaqhGprA1UCyAKOp4PXub8mcRzqfDY0gtPxaj2VwI0jtmghtr9AlZrqLleLVgLeyCPsZDPhN9aTgXSBZuAYfo87x2bNjGVuJ2StR4sSpZo4TKAZpmNwDs9XTT4SiwFlgUR/DB0wCn0jRtpTAvEKVPEhwOZq2QfBU8VWyT/dZSzKId3rYgpMoTxlwfcd/UIQQLfRuATxCvQZcQFqksL9H3KYbhhhMGa8nmpOhf5duo1JqragaCM+o7iqVC+VQXBf2QRlupCPoyszsjdhV96J55+YrHxXT5tOmQPshZkBJHVhTyVmHfB+QEtU3PlKSz/ajCyQmNCp+mosAuXFnr9063E5PIN8Rqi7wp4/z/2iHlNXf5noWRa3iLRBspLbd4Hcjc9Ak0iZ7i28aoifpAnIS8ydtM6YJNWH3D6k4nO44pczVd5fdBrVVPnQRRpNJhYffOjdq9l3xqktrzar//CaXF87TZbuwn5oUEIgxxoKk/TQh0+8PCxvtyKTBIE4Su3iAA6Y2JJ/jxM51Mb9CfphJEjYj2hk0QuRHSqRAGz0N1KXnoq/1NgHFZK527gktGqiEpKpdYu3Qu4adgD0joqVMXiMOhd9HYeVu23dKVIsVIqMMZm011oOXD9Z8DsbIcq1oSuusTmQA0RFllRbqU5lUQVxD1+Kjz9fSQ89EV6hE2EK0Wu2mez5XdzJCEiaxOErmNDF2HkGRNNtYX0ZdSYLGF7UPTA3aQLi8q9BZYpAo8oQpzx3ck8DfzaKJr3lkLRa6H55v3Bf0SVq58RapUYsHFh2m3DDxFEGQfPeCAJXjpvUOxT2K5O0MNhEbnYkId/S8jBHzOW1AIy+DNR10EsgWF3GSHFj8VQArrVX6DDiDJP4/OnRQqWzjgwe/i3xuUhOTAbw3huSPFRvbzwwOREfcn+2JvmGdXNeeKD05pvBPV8KmUUTbawEz0GX+vq1PGF2Be2+cQgOWcWSgdAp/igSkLFKq+n1Vh9BeEwQ4HPZy/At1FyUKEh1iE8DHA59EviV8rdN7T9hGhbfIqABJ5nkb6o5FzfTsUkWqFvdo1jXJOOP1G7DiEUDYrbuygP76RIs4a7Zvp3B4tXixDKNQMXqM4ipJZmwtMdB56nVbGIKPQtFKgwJ3Vh6qBIbotVyxdBNTujj1BcAh6ItpoSaU2ixMFc5pt7I4JSZdE5ozHAu2SW2vFiMuz9YMJ8aie5ST692oBlqG3/CFMyDA/xkh7IzNbd5o3g8blnfEbSJIST9PXO8AZX7/fwvHVLnklZ4rtpc9usAkgIGTmzIc/uMAgdI5bVn9rzPi/yL014QZYSGN8vldsxKqwFza2cxhHvK0TK+83Dss410D36ZnAtTTlwl8u44LG1dMeSnb4cxKj30W/M/XfWcyq/nf6pMQRnl2mXHMARw8bVLlp85wz X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ee3f2aa-ecf2-4c99-c4fc-08dd456e1813 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:48:51.2347 (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: GWHmi52ubKkE1tuE6WEt79rHPYVFfau33jJZHg8yu5WaAjWsBVTjA1+GP+JcrH6lliva11usTJkWwjwhhzV52g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Stat-Signature: m7177mj7bwbqbyaf6cgji8i94cnmerbn X-Rspamd-Queue-Id: 8BF9E160002 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738709336-913253 X-HE-Meta: U2FsdGVkX1/9+8zY1trlPLSaQLHlrxn1SPn21pWWBdFM7W7VR8a4jBbKrEO9vqWQO5rkzZqVg/vvULnZ0A8bqB6Qt2s/Qz8BzioVKpWanzTHmbcusMywrOZ/pyWVBKMuozS7AnZ1qjqRMRMG6p4g2RNcY2CGdq/SZHoXqmrnV++pNK2SuBAaxt7di9KvbDvadM6+xrGK9IkKjp/PiLzT7dDGvWk2NALmUbAoEdGysMYsn5RIDDDUbq6thKbep7PqhlJN3M45ggVvy+z0XVJYXorVVwn+2eJ8ESeH52wrALSJzX6hLKYuE6+KjIiyimtaOUEBVdLPyolyXTO2f2ag1a8nLhlBNBfzgtI0eDm7KYm5big1OoeZTf1oU+hrogzGujHkjheGVAe98vkPAGHWJ9kRWJGYlcWv0PfKS3wlatPnWcP8EhOK8DtfiXiyxjzMU7vfGTIN045RFCjKB6R2RXCt1s+UdK3DQ5Ym+KwfYuno3iOmCe9qTxi14xiY0qLKIJjKIbkF3gcRG+VrWrV4qN1WHrDXHwS/jZZacFrHow6WLxLNZVd8aHBSf9DiDdx2iMHehHJW44MvIpcCZz943ip8ZchM7/lj9dVZffADqxt/SPO7kSyPXs/7Ad04nJQdzdrgohvx24SGIIit3zyQ11zkLIf6Xle0NE7NxpmCT0DK0Bu2YHxyM1F4lm4cVZSg+8SYdgIBNTHuKKAS/yuxWGkozdyg1Bv2+aDFg56a2Io+rkZZ07yYaXBIC3QgW3+HEvOpBunj18rKCvbvSYUBedT1qYnl0GLca8kQRUN6hbCXAWOzNuIfKxPltS5oSRz4I7m1lGUf/ScstRMww0r2n17EW9qW1V1owVMATOAK/F8HvbTNFSDgfGWeQ7AQMSh/+HKmHVyk739ZNjQET7dIS//f0tCKz/fRAJXmzG9k+8iccD49KGTYkpQ1Jib66DpwI9jMlC25sZ/EDcS/mXf fb0r4K0n tan3Jf6KjzfuEEup8v0TS4sEHNfSEHsm0hQV/bFtSRvCMk5gvuvonvuj0pfwGRKBrVJVIYok4H2zQf4ksOzQJ+fh2bdtbuzpZbPF9YM0gi4olb8K1Wgq2xa9aUVc1ioOFAkWQUmgw/K4Pm4bpIrwg5REfqp+vqGvHhjtXivM/a/QojtXkJvEa02xWFrQCn6WBR44MU9PkdCkZoXEH/sYm/1ixiN//Z5t7TM2v/xzjyFBAv3uO+BMU5wlPbnBonY1OxgngawV1Jy9ykQAuNTeXTZ1nBHQypJ3t2L6awLtlrysddJMq9lNDIq3R+7kEMPARUZSS8WoO2Tto0DCXNd46ooE4SWwbX4TwPMqvo4KCSBsVZ54f7k9f4sSw2RdwQ5ynfVPgqaDiUCRb1jntngGvsKEczyqZgfmJQ/NlJxcRbIYpqZPrTA3PI3OUQw== 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: Several functions internal to FS DAX use the following pattern when trying to obtain an unlocked entry: xas_for_each(&xas, entry, end_idx) { if (dax_is_locked(entry)) entry = get_unlocked_entry(&xas, 0); This is problematic because get_unlocked_entry() will get the next present entry in the range, and the next entry may not be locked. Therefore any processing of the original locked entry will be skipped. This can cause dax_layout_busy_page_range() to miss DMA-busy pages in the range, leading file systems to free blocks whilst DMA operations are ongoing which can lead to file system corruption. Instead callers from within a xas_for_each() loop should be waiting for the current entry to be unlocked without advancing the XArray state so a new function is introduced to wait. Also while we are here rename get_unlocked_entry() to get_next_unlocked_entry() to make it clear that it may advance the iterator state. Signed-off-by: Alistair Popple Reviewed-by: Dan Williams --- fs/dax.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 5133568..d010c10 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -206,7 +206,7 @@ static void dax_wake_entry(struct xa_state *xas, void *entry, * * Must be called with the i_pages lock held. */ -static void *get_unlocked_entry(struct xa_state *xas, unsigned int order) +static void *get_next_unlocked_entry(struct xa_state *xas, unsigned int order) { void *entry; struct wait_exceptional_entry_queue ewait; @@ -236,6 +236,37 @@ static void *get_unlocked_entry(struct xa_state *xas, unsigned int order) } /* + * Wait for the given entry to become unlocked. Caller must hold the i_pages + * lock and call either put_unlocked_entry() if it did not lock the entry or + * dax_unlock_entry() if it did. Returns an unlocked entry if still present. + */ +static void *wait_entry_unlocked_exclusive(struct xa_state *xas, void *entry) +{ + struct wait_exceptional_entry_queue ewait; + wait_queue_head_t *wq; + + init_wait(&ewait.wait); + ewait.wait.func = wake_exceptional_entry_func; + + while (unlikely(dax_is_locked(entry))) { + wq = dax_entry_waitqueue(xas, entry, &ewait.key); + prepare_to_wait_exclusive(wq, &ewait.wait, + TASK_UNINTERRUPTIBLE); + xas_pause(xas); + xas_unlock_irq(xas); + schedule(); + finish_wait(wq, &ewait.wait); + xas_lock_irq(xas); + entry = xas_load(xas); + } + + if (xa_is_internal(entry)) + return NULL; + + return entry; +} + +/* * The only thing keeping the address space around is the i_pages lock * (it's cycled in clear_inode() after removing the entries from i_pages) * After we call xas_unlock_irq(), we cannot touch xas->xa. @@ -250,7 +281,7 @@ static void wait_entry_unlocked(struct xa_state *xas, void *entry) wq = dax_entry_waitqueue(xas, entry, &ewait.key); /* - * Unlike get_unlocked_entry() there is no guarantee that this + * Unlike get_next_unlocked_entry() there is no guarantee that this * path ever successfully retrieves an unlocked entry before an * inode dies. Perform a non-exclusive wait in case this path * never successfully performs its own wake up. @@ -580,7 +611,7 @@ static void *grab_mapping_entry(struct xa_state *xas, retry: pmd_downgrade = false; xas_lock_irq(xas); - entry = get_unlocked_entry(xas, order); + entry = get_next_unlocked_entry(xas, order); if (entry) { if (dax_is_conflict(entry)) @@ -716,8 +747,7 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping, xas_for_each(&xas, entry, end_idx) { if (WARN_ON_ONCE(!xa_is_value(entry))) continue; - if (unlikely(dax_is_locked(entry))) - entry = get_unlocked_entry(&xas, 0); + entry = wait_entry_unlocked_exclusive(&xas, entry); if (entry) page = dax_busy_page(entry); put_unlocked_entry(&xas, entry, WAKE_NEXT); @@ -750,7 +780,7 @@ static int __dax_invalidate_entry(struct address_space *mapping, void *entry; xas_lock_irq(&xas); - entry = get_unlocked_entry(&xas, 0); + entry = get_next_unlocked_entry(&xas, 0); if (!entry || WARN_ON_ONCE(!xa_is_value(entry))) goto out; if (!trunc && @@ -776,7 +806,9 @@ static int __dax_clear_dirty_range(struct address_space *mapping, xas_lock_irq(&xas); xas_for_each(&xas, entry, end) { - entry = get_unlocked_entry(&xas, 0); + entry = wait_entry_unlocked_exclusive(&xas, entry); + if (!entry) + continue; xas_clear_mark(&xas, PAGECACHE_TAG_DIRTY); xas_clear_mark(&xas, PAGECACHE_TAG_TOWRITE); put_unlocked_entry(&xas, entry, WAKE_NEXT); @@ -940,7 +972,7 @@ static int dax_writeback_one(struct xa_state *xas, struct dax_device *dax_dev, if (unlikely(dax_is_locked(entry))) { void *old_entry = entry; - entry = get_unlocked_entry(xas, 0); + entry = get_next_unlocked_entry(xas, 0); /* Entry got punched out / reallocated? */ if (!entry || WARN_ON_ONCE(!xa_is_value(entry))) @@ -1949,7 +1981,7 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order) vm_fault_t ret; xas_lock_irq(&xas); - entry = get_unlocked_entry(&xas, order); + entry = get_next_unlocked_entry(&xas, order); /* Did we race with someone splitting entry or so? */ if (!entry || dax_is_conflict(entry) || (order == 0 && !dax_is_pte_entry(entry))) { From patchwork Tue Feb 4 22:48:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960105 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE4EEC02193 for ; Tue, 4 Feb 2025 22:53:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EC456B009C; Tue, 4 Feb 2025 17:53:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 675A96B009D; Tue, 4 Feb 2025 17:53:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 479E56B009E; Tue, 4 Feb 2025 17:53:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 255386B009C for ; Tue, 4 Feb 2025 17:53:27 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D8F4B1202B9 for ; Tue, 4 Feb 2025 22:53:26 +0000 (UTC) X-FDA: 83083765212.25.B6D1294 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) by imf30.hostedemail.com (Postfix) with ESMTP id 192908000C for ; Tue, 4 Feb 2025 22:53:23 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=sGbVe6xb; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf30.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.80 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709604; a=rsa-sha256; cv=pass; b=EvWIzvZTTIwECov87DCqcXxbS0OGBc2+gyggv4xBGI8X/HmIdQgMoaGDm4FlUIdblEVqYK C/7oeZZuO8m7KanbiwJCWdLXwMKcJyOCVFK/a/RDhqmuADdyMxNurQBpAzVanoB2UTZicL Atc6aXU/GB5zRyRH9RRnPXaEEY0QAj4= ARC-Authentication-Results: i=2; imf30.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=sGbVe6xb; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf30.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.80 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709604; 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=t/Fa2ZekTWhZALAVQHC6hy9omuVvvJHtpbIXF2ikkLE=; b=nk4euMNry3OExog+GsUDYKHeJA2w0wnRR2yC5XzENG3PnIXXuiwa8SJcOPV5Oflhv1WpPk 96/m6Z76B2JupqcTgcbbWN1VobJ7xd2ivrcevGwqbjLXlvkJrCO4DT4Yy3onBRoogye4d7 oPXDZ7RdlSPo5+QCxx8IJBzLhfsPRwk= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MNOnP+V95JEXGJ3u4U3JI1V/riZs/4j669baCpzEBZennWRl7PjgmQp4lRV7s9mmO8m1qjeGXdsKPy7jRRkFEm42csHhn3/cFotV58w8aLGpdEWGgV/jsopJ+Xn+ypY7CPtQ1jMApXuBubN4FfjivRP2pV2AmUeLLtiua/QdsBPBNsZoTDRon/HFwixULNrenk9qKqklFdAttEdDU3VSZ6FwNPnLCJyjG4RBo8dgmL8JKfHMLqw+gfme4Imv1Jep/7mXtOeqL61tBXFvRATGOmx61DzO+rL+k9RzlshFDcWoL75d7iAGKqQzPpUuAEz2jXuv7ujRoc7YXEbxZyDJIw== 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=t/Fa2ZekTWhZALAVQHC6hy9omuVvvJHtpbIXF2ikkLE=; b=Lc13JNv3Y1br5uSxD72ZNdGMBFzptN3oolw4xm46befpb5wUdNuyzkbdhsS0R8slXntdzCvDRU/srSQSQLm9CBxKsmaLmEugJYTd70ss1uXVN/9/Tty47hLNmKUu6Q2U3b36UPwS3vYZGPSygL27vz/oonNNXbnAdFDNb4WswSVgBnkyZgploGd8mI/aOsKC2z+PfQ4nnkntB/RE2U9twVw9HxSgT3s7+EsGq+0EbkruPS5DrVjsQ+c2BgFoiBCZRTK58F3dHPGrPlufniKI0sH7KGuNDLSk/7dpbwATqJ3u/m2K22a88ZAcK68jSk0wA6VzA4RFeCNlU1rwsbo45w== 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=t/Fa2ZekTWhZALAVQHC6hy9omuVvvJHtpbIXF2ikkLE=; b=sGbVe6xbx4gTYFit04YEXq2xQHHcBD2tvVCVtX+76eY1ErEpux60EK6YsWKQixm5DCB3woaOVm+2Z8Jpxbyrkgx76AcmaQmhig4Xtd2fL2WKmYmaAg2IRbxOwav8GUtjqbFvr3ADZMN0EwZsqzRsdJZxSosZBBCbnH9HY7QLZvnJBPOSzhkPvAH9EMDXtxF6OMDZ3f6HrGriDb988N+xJA1u7wTaecw6siP6wBpMBPpYTxxARXSP3wf7jdtzrZuxz+rTAfXtXgVtkxEt2jViirh7umovPDwCPVEino+huCUpjXkMecCp2dtG6oojmk/dWnaLQwcaNbatLayo+6Wn0A== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:48:56 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:48:56 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 04/20] fs/dax: Refactor wait for dax idle page Date: Wed, 5 Feb 2025 09:48:01 +1100 Message-ID: <8e6f61482cd0c0be1750ecd5b7412fbfab414e49.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P282CA0064.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:203::14) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: d30c4b65-90ce-423f-2843-08dd456e1b07 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: Lza01wcp1LuJRQSSOSVqkGJIBTZypd72zc2Iaa5Rhli9uhwCAxrVds7tG9YMMwtkzr0toOo5XRu9enmQeujHva/N8VZW3P1eyfFgZWFon8GJ8cHqTUAme7cXIOYapSP9iWkldq7P6BUbytHFwl6vvktNKlYaU9MGjpfN7sQ+vDiYu0OvbO7p59VWjHcRJ57JIHOybx1mBsOs75wxdhgueyF9Woa0LtRN8Q24FuLeOFJaZxg7OtIAGMS8PQABAdoath8/62hyrA84P9U3GDQ/AsnWV3+ivbT8cZrj5b86O/IYojR6/vgDIWTXn3LscHnmivvNBCHyJiVbtyrdk904zsvLxrkRI/aqOOvBhTtnGeb/e8wmdWU/zSlkVcsVxJuig9yiWXTVfuTG7pLgsoybK/iR7KH13wTPgRqJ1JqsYTXUDknFO6jywCoSNm2QSX4u0qMA2NRxoSkrmLmway5Xjgw0cmXtIy/sXFbSRDnsHfirm4y0ad5UxBaLNFwfwfCFQNjJtPFbwltZ3+3XNuKQq3Rb+fY71MP4y9eTZQAd6EqPxNGhLpdA5/FGL7D7T4Q8pVfWhrTuJlTCRbngWbADJJbtJ4OPz7mg4et6xonKtx93LxI33jIqK8N8ztUpJ/NeUlgddD/8d7rciIDIXlixQjs0ByN8DxdhryY5gGfQb1YpVhyQGWjZ9Ps350lfEloRExTctrHWM90+fv/gYHqgpDwdqEnHvG9vJEgIo1bbgdMm3u2gEmsOvefP5RBcCzIxOCgOLkqwt+PryQ2+AbCgm6aOA/2rz/gA6PVQESXRUCSjik4+O/B2WUbavEbl/nVYLyoG2dZtsIGrW1Ox0xSkK0Gnojx+Zl8SvrurxZFOpn1DWXUK9jBSuD6LNINPpId7EmWwsfj202OR+zR0cdLu5FpjYr7KQTgItAMXiZEiLkVvoZs3Abdlt+hs5ML+OpOTWlJhWr+ECqaEA24mP5TR794qlkAOHPZtwA6TESETm3tBztAr3q48brX7HAt20gbIUIC51/lwuYlz87ZYWiNyXMRH8r/z/Vol02v9VStms2R18+7ebei8ELGkCF6K1F0J5JBDsctPHWQcG8TisSWqqHDunO0e6exofsbStVUEFOXpluqRbi/577mnoW/s22SXBjFkQzBuah/q7BTa7EgHyW1C/Pw5TfZYVenELzAKBLT43FYGZi2ucBG4fwn85lSuxbwfoO5db0/58DyOIFiiDBhmi98WJCUJcuCfpuW19uRo9dgsf5B6kbbvzlsYFzFu6SZmE794MFCTi54LNcxJdfnnfI2tmKx8Ud+i6415BtMdmKosoNO7x4dw/Gn4RRpsrN4i+4m6bLF4EdHx0PAuZu74C44RKwGRifnPK/YupQdUT/NR2utoskvLrZDQOAXQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k2ROUHIKr0UIQzZVvpkPChBdsypxcicK9kNl4ZlBbnxX+nNy+0B9c3z5afDMTH+jbb/pwjy6kg7+v/MbDhumqRFlhT5osBqfN0oc1F3OVDdcTqsOCaqYeK6ZA8IJdCjFkxyAYSGzJyuhGRot/fB7LE1YdkFqf7clKm5o8XV6TEG73ENmqdLaQXfULgbfKdJYcyLQhahHW+6SX2YHe5qrMm8tAis0guuas208jd9OW3/WHclLHK5jXUDWp5wsLmpOnZB4jWwiHCPtRR5Kyt1Ct17MX9oJbncRxHIsQNuBgSeTBNIBSdMy0SEu6+px0DGeV/y74M3AmF9TfLSGsxY0lhXAPwBNc4MsJSBRbGqv1njIboJbZSUhiP06EY9r9DIxYaWS8UgZJFU9vwT359ZwaWAKM6pBgiBpiQ3twnvC3jF2zldwEpm+vkuiidpMmUyJk4L7RAoqfGDnP9VAb2Q0wYkKCnYy1yKFuziLFidYhUlbL36V4oB6PwJibT9vb85pGlRYvnqKehG1q/OB412HMqnpf8tfP3cxfIPnuBZqweSAQmSgfCSMA1Jd7eMMMxrf6SXC4znZRHr+RJ+9TeHQ78zGvQ5qQzZsAm9k649Jx3C4qC4I2dtR82ZTZ+45aoD9NW93As9Gp7rQ6cZhPGE89kAJahbAfVqkfiig2Ig10Hw0pWU6btBBHaeI+84tOar0m0m6UNwP72e5G3n0oGZnFkiEnvyMgPu5u5CNB6Uqnww3c/c1tYQEIRJAIaLO562ZdeVUyNaqxvWapPLg6tUJHEkYOMdQ0ZMK8iX+q9LyLTK++EqF3s5GRLcfuzkQob99nZOwt8Oikbvjo0Sh4/b5mlx95i9J/lzz+BVnfS7Vk+pXGStz69rpfD/QhMgZybtU23zlcIzcwDUmMxBMCXCi8pT8sM2Kb5rwT48NWJR2mHOKxP1R5RX3yXgYt3vr4YlFiY9ZooM/ecIoOaHPRoKgrSEJhkU4hKxSg2kdoRQJKIWxN5zLBvpqUF/iW6LHtTqXN0GBjQSXiygyzIOluARz76Dq3zM//BuPK7V3w5c/b1qolvh1djnciSfeYaOEpc0XO9oFxwLOutiTz926IZCk2bCvGEZasTlGw45nQlRn8fc5WCO3Bd+0YuBQ6Btc870imH/eo+1+ZlaHKqBuZRUJIveNQuj9rDTahR4RF9W2hJ0LFuFMcqIDHL6Fxl2IdROD75PwNj5CxDaAcnaiyMjDAgNwwqO1KXsLsU4KjjctZM96HZocHcuD9ozCoOQthqZf79E4ZC11ksy+xOW9yyKEDNiIA4fIxGBIuXq1YpZiVChsm8/S2HqF9CynE0ZvkFHH9I3mmaoZOGTUKxRtkcmhZZ4eUuv24Chs6hAC6RwmwEatXUH5LO36fQCSsG76dqQQci06CQQNnl4BZ/K7BT5eGq9Piah5izNiDvPUfZ3RKbEHLtrfqK4JCT1e2jgtc/oUqTcNJUunwVv9pPnlat1/i9wttKzxDN9a1c+Q7QPKB62ZuwasMIUChu3jkY6J3cg+gmDovOafWQPcrdRLur4RB0oIyYBEDG3bI5pHf4uUdmchclxkFW1y20V2LYWJR5lA X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d30c4b65-90ce-423f-2843-08dd456e1b07 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:48:56.1926 (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: 0I33VvBlHso+UFioXF/4hj7P0xREtQjn87If6JL2oPRwCGMGF22tnAObA12jdqnWVO2u/0mvT4yoGswLU+FB6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 192908000C X-Stat-Signature: shm3f73j5t1nr61hjbz347nhgrzsdtig X-Rspam-User: X-HE-Tag: 1738709603-717341 X-HE-Meta: U2FsdGVkX1/OeHy7ZrqPtBHyySmum/3Kdoe+FwZqIQEAcbI6yr5CeXQcxmzOiGKkE0aNC+asAjiQP6jAc0+A3RrfhbwXzFGuwKjvqBqQp2gmC3oaYaX/XNBFyVXbrjGz/fjzEy7vOU4fZSHfDwge2Ecm4lTI75iiVYFVJEQen8gG6MEbl5het8/tMRR4FV9aR0DNbQtueD1PlgVqDMX2nkfRlDlLY/tS/fTUnTH2pyYQjmBzMgmihrYeM2mMnpw17pBIUqb5PTiXIky2SpiNwUDYXPAoXVO4jIg2Nboqap5JVQaeePvgLzqvypAzjuy4BiEFfofVSim8iELQangCqn0pXqi9ct/cuBOkurHQmB6MMMFKJ/LN3Oxn9MT5eUIUFkNGL4rtuAlohJcuLuxQOW2pb9FKFHd1EBVi1Qz1mXieQdnGV88x/irSeOZMtvTDb2krvH/Vu1qX90wae2LDP3BheqzcPBMG8QuePaYKnzSL+JJvUwe7of/2z/l3IDuOLRPlRnvRtEn4rDDPbMaDwaUjl5A5k/MVfBxOK0L2z2aJ26/vnpdZrTLl9NbLTwMJYXaCwoNljwB7ePV3DznOWs3xVA7VuDUMMLMW2ECF4443k93sN4X+dJDdPiYq5yFAXxojGphLe16Ooc5RCMeYinlVUrG2PgDbnF6XOtpAKvCy2+F/bKTAM0c+nJUuI/CMtTTQip+YsjQCZcd1dpzEW9lr8wjohR8i0V23FyRdtaKnz+PhVLGfY00itO1XJpNTnxZWlmmQJ89ooGmZtuC//ftchT9PvIa4qtKnbtQR5cdfpshhzkNPGG+XtxoZa7p2ZZFTvTnbz0pcUHWi1VqgyYaYMZcYJOlhRhOLcBWAGnjtqtoDkzkwG3tCkDmHsFr7o0VYxFUEBVBfMjVPAMRLhixi+QvRvuMqvfO9a499TrBXU07uK8yCPfEVxd5vR6FxDTW0ttU0FbDmKSkSKxf 2Af/X8M3 z1GekEN3tsevhjFBXb/GJEuULVRdA+F11AYgwTyyns/M+aRnwOQl+FKvisgHMbqvuRGOn0CTdf2U8NCr3bDIyEsy3I1yMTVld/RfW/u2tGVSdsLXq6WbiVjZsfewXKUJQnE2TGpKEGRt/4eBwMENXfftoHbbtf5s5mMjMUvGiVX/4wNs5MXL7W6HNlBUxO3Ae9d088nssApnsZvmap2uD/rLh7WT/qChugTs7jNGYeknOYKdrK6jv8lj5L3lhu0MM72SPXL6w1pd4aJXAQssKp7fi/8VMPWZXjVMZFQtUfZYFXufQBEda2HPrRA2Xw1FCzd1Sj1EMf4kH1bPtgdvIieuAYmSvIpgdfqKS3srIt50KuI6B4oFdOxp+zhTw9SJ/pZ7irKSyk7tExmOm2E2rHAJerfUxh1vz6Ei7LKRv12GhZJsBfOv4EYS/kA== 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: A FS DAX page is considered idle when its refcount drops to one. This is currently open-coded in all file systems supporting FS DAX. Move the idle detection to a common function to make future changes easier. Signed-off-by: Alistair Popple Reviewed-by: Jan Kara Reviewed-by: Christoph Hellwig Reviewed-by: Dan Williams Acked-by: Theodore Ts'o --- fs/ext4/inode.c | 5 +---- fs/fuse/dax.c | 4 +--- fs/xfs/xfs_inode.c | 4 +--- include/linux/dax.h | 8 ++++++++ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 7c54ae5..cc1acb1 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3922,10 +3922,7 @@ int ext4_break_layouts(struct inode *inode) if (!page) return 0; - error = ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, - TASK_INTERRUPTIBLE, 0, 0, - ext4_wait_dax_page(inode)); + error = dax_wait_page_idle(page, ext4_wait_dax_page, inode); } while (error == 0); return error; diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index b7f805d..bf6faa3 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -677,9 +677,7 @@ static int __fuse_dax_break_layouts(struct inode *inode, bool *retry, return 0; *retry = true; - return ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, - 0, 0, fuse_wait_dax_page(inode)); + return dax_wait_page_idle(page, fuse_wait_dax_page, inode); } int fuse_dax_break_layouts(struct inode *inode, u64 dmap_start, diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c95fe1b..a457c13 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3017,9 +3017,7 @@ xfs_break_dax_layouts( return 0; *retry = true; - return ___wait_var_event(&page->_refcount, - atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE, - 0, 0, xfs_wait_dax_page(inode)); + return dax_wait_page_idle(page, xfs_wait_dax_page, inode); } int diff --git a/include/linux/dax.h b/include/linux/dax.h index df41a00..9b1ce98 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -207,6 +207,14 @@ int dax_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero, int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, const struct iomap_ops *ops); +static inline int dax_wait_page_idle(struct page *page, + void (cb)(struct inode *), + struct inode *inode) +{ + return ___wait_var_event(page, page_ref_count(page) == 1, + TASK_INTERRUPTIBLE, 0, 0, cb(inode)); +} + #if IS_ENABLED(CONFIG_DAX) int dax_read_lock(void); void dax_read_unlock(int id); From patchwork Tue Feb 4 22:48:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960034 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BC53C02193 for ; Tue, 4 Feb 2025 22:49:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 959076B0096; Tue, 4 Feb 2025 17:49:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 909376B0098; Tue, 4 Feb 2025 17:49:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75B436B0099; Tue, 4 Feb 2025 17:49:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4F3906B0096 for ; Tue, 4 Feb 2025 17:49:13 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 019181C73F8 for ; Tue, 4 Feb 2025 22:49:12 +0000 (UTC) X-FDA: 83083754586.29.6AFBC9E Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2041.outbound.protection.outlook.com [40.107.243.41]) by imf19.hostedemail.com (Postfix) with ESMTP id 343BE1A0003 for ; Tue, 4 Feb 2025 22:49:09 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=maS3nbP6; spf=pass (imf19.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.41 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709350; 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=nsZoUh+nyFEoPubBz3cIx2eZnKCFotac/GnzP3+94mg=; b=fmDBO/bhkOecyFKP/hQaxjNT6CLro9PXxfH1c4dbdFiXWTsYSuC8863glEHUN6FUfD2d8y YfXxNvz9IsVaMrDRsyFNHXZCXbCADJ0aOGvv1VJpX65H3s3TKIVfeE/gJfbdn5Try+fNXN YeQ/1mHyJ5Q71f/LcPzmTDATm2wcxRw= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709350; a=rsa-sha256; cv=pass; b=d9gA/8TSxABmBz1zjV9KIy5KiDxTBPVG/za8hIpJYZoD2FIFioSE1LMHy1pYUy89B/5rw5 BN+F/uvt0OCngMf1IJ6oo9LfgGtwEx5xdupvR7ypWruHpDPmNtFyBK0aAdIp7URSf64dDU 0XH0jjV9gqyLbvOaEj6qZD2ahNg47i4= ARC-Authentication-Results: i=2; imf19.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=maS3nbP6; spf=pass (imf19.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.41 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mmDZXJ6yKvggFZ+WJnjh0dOymC8/L9JHtXDBU2EGOU5EGvvZQXZ8fbEK+eeWaKfVi7ubV9DC6DVWnUkpoLBHsSFGXmBIknTv3k3EzDR16+FRIurPitn702JaaD4uBuDx5avY4LvpLI+3/K3g7CqdJqdlMINJR/njkWxx0PKMpnq/R8wLQBOPffwNNro2IQ55Mof/7osMs5txRztf6UkAjeQ3G1QLqsKGIqEHm5JhH/+0SeJvC67LRZ1UffnEggMOpGUz4Tn0+XxIjV58zwxIAFeEo9cYVXJpqsd2KSrHTrTP6nunfXRZDXKRqwSH1E9pHx/m5xWX62v9Fm9d5ymjhQ== 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=nsZoUh+nyFEoPubBz3cIx2eZnKCFotac/GnzP3+94mg=; b=OAbA3JjvWlu39W+9DXroavWLq2wOe+zDWGZ/OJNWbMer6sKRa/HqSDjoBfxWaXc9RLi/8OtDydZLsuH1ycmZxTO9KHgRx+/RMKwXWzC77XJgYZabwDp4qmWy9rZia3TjJgvXsVendrE2P7p0cdtlyIqxT7FT0xMxnfAyVkppIyDp0YSjIGOxVTljGLse1kNGONvlJ/Kix5BQKdQlHy20ykVAk2zt1oAvwSgCbeopsNO2xEOGThht9OHvszxHkJS6Ka7iz4uj+JhbqC3RTdvP9TwpHuIH3kAwnZ1ph0SGmk3IussCmqKRi7VK4eDu4dy6KGEYaXdbSqMx74VXZGFFSg== 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=nsZoUh+nyFEoPubBz3cIx2eZnKCFotac/GnzP3+94mg=; b=maS3nbP6gTcmWBkwsj4Dd5VD0lwS8d0Ssae4I8WymRSNJl0cNcHSSB3o2j3x/5Ju+HNNDqUpLQ1u4po8h9MB9tVHocq+WUEARx+4jgwEfvagI4uYrowG0KPVu6N/D+vUNgof7Lvefo5xhBDwtHEuept45HceP9+YNDRxmgI/XuzMiMM73YkomAr1UoeJ7etCPYucCEe/zdXSjvDOBvok7UR1XQUyrH97pIx4ChDUlp2P5/L3D4WfVukZypkDHnW/qkW/GTxdhIDC7IkKuyEumaiD+XggtSfbQn2DhyKqPA6XQSY45cSvrkieWPkCV0MhcMD2P9zJBztAXtDUplG0GQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:01 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:01 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 05/20] fs/dax: Create a common implementation to break DAX layouts Date: Wed, 5 Feb 2025 09:48:02 +1100 Message-ID: <28fcec91d5a764aa58ce897cc6739a4bebdf7840.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5PR01CA0128.ausprd01.prod.outlook.com (2603:10c6:10:246::26) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 567e4890-c7ff-410a-0867-08dd456e1dde X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: 1VnO0i3hY5jnMKOB0SLDgK1PLhR6Ktyof8iBTamMRhAs2IjlSp67MEGp6s2fcFVJ82BLC3dD61227ex4TgEiF2oMIH2UOHr0hm37tvDgqb+irHOT20WctZCv+lLUHyA7vkAmE8SMBaGL2PiSgCFdGV9+8P+4o3p7s5GOclbXkRUvSkg+XrHMc/V4zM6J6zgV3rDjXGpiEj+te9XxEBrI5qa38V/yRNttTHCJ0oOljDvGvgddW/vXERDyHfzub7bYsYUPyYyLwvx4xZfawkCI6EajHdEODU5i0/sCyYS9sU7a2NZe/PgIdAZmF5UkJXGMytSQxEBVlCskC6v7BGR1n0Kg0Wp/4V7UfYIs5jkADybhRS54WWyfybmzgmLERl11+yKWCPOnxKgaTlQp6bJ4cfjaJYqU1snPdLrewuAzG61f+uXqXyfGdWTttvuKFBQ0r7s3RG6Sc5DFNSAN2DkS22IbYw9kzhZJP/OUivuEzRDZCl33F/oSQvoeSNcbDlgiGATYseWXFA1VSoEPEYzeKoxRxfLYQado4y/7D8SIbbNLQ8Wg7FLTbOh4DJfb0sNkD0ZOyOLOOG4dNtB7LJvc/g5GUTHs9RDivJBrKJfDClF2eCnixkeRL15YHqctOqMqdb8K7eRWdlqjDNSENs1xBCx7LLOTYiJL3sIh9lZKkceLT4ZNbqjk927xynP9IBpX0n/ueL0qFcq8UL7AdzOVq3iSMAKKg/E50nWX0Wp5sovbK9iPSv/uvh7CKkBdbXVDWWFOpjxJmtm9YXj+Ywyq4J+lDj29xfeBE0StbuoK+yZ6bvuIZWJeZ4Yn3ohA5DeM7F9jpumZ49Zm9DanWz+2Q16QaUMjlYrioVFowlkOXqATcp+WCM0xYSF4o3OdUCcF9fhpQ4EselVzPWz4Y9WJBYIymPmBEMPeK/KhzvT8poAvoGjn72bRBU6dK3mxxtpqjQVSowGpKQTJ0HkA+lLah0dNuot20OP/QAj9nHHp1+oQNoVQXTLljkiT/lG3drqRXGowbcTdw3plnZr27mvN5Vzvp3HMlsieLw7HD90sQuvinmjxwdmJKJ76EXRCL/2UPecJ4/fO2S4nYVISIttDQv5ea7XA81mY+NOL8GEmYLswDsEouhqjHHqA+VIlbt1OzVzZ9j/jJVLPwiaEOPy7TuC7uxEZwg+rzDPsbC/bIvQrfjDRVNTeLTMo0puwMwPeJgVtzIe9hgCfVZm8DQ6P5ZUjrh0XOOYdIussEonAWX8XKErUEJV7bYJIoL4IkAucPhvOIyqpbgJsB55T7TKHsVK2RcuxTPhVK6+yfRhoIkrMmDMmY8XWAH1QW0IXLm8IJI7ywyIQsVzb56ia83onYVZ5GYjGlVAeih6tNNdBw4dqFuX2B0sMHu1NsdSkWiS0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FlwM8GYVpHLejANQsT5jn/BXEgGi6n1nZcFKg6LxtIEywg9TjVbIgFEYLAFAHb3zVd4YaH9P5w9ma4551WyqnZB0C+Fk//HQ72Zyu0AZNJ715rF8m3UK7dBH9VRMDvDKny1bejEzDJX4www/63e0oUhS3W3+NGBM/3lT3o9s20U6bTWeuyTyTXbla5wXZ107WGcPCiXXNwa375U8JQV5o2h9GEoB3vcPM9aXfHYBR636UB9s8sceaM/0RI7MToEQGP+wGn54hoiIuNrNzypzeLZ5zjDCte5RFGuYRZ8eczWYswjyKYPWxA6kslQUbsEB0h+MDifZTJq+PJS0bjL3VgTAhHlUEcyBFZOr7a5mQaCgcpgGXe9NvjpNrBTJ5FoeH+5qa/46QgOLzqJHpVXi506E3S9oK0vWXpgnpQ3xPrdwQC4m81/PNrC0bFBRghFRXuST1Dq3+6LH5qNad4mxDS4/NbiK+S+cMLWvN+h5ljaOH7L7BdbY9Jx9ZiEKWKEWrSop8GOSqFIkKRBFyIyuepv1Q75Z2EmVTgKIjHnwzkzlrx7+AQVBgQKHpXHo91+Psn/Ia691hI7ev8yANm6EmJafq3d17kFC3rzlhw4YUPN4bpka2MyJ6Q4mXa+Dv86PpIbR7bl/zhbN8Wku7LUOoKJnrjJGgWHNcjnkrc+0GkCrfcaphTSTsgSL74PxJkZbehG+0xhvmAhS1mzbwJBL2GDqwMZwqE78/mfg9o53X4NZj3R/JrBjKUHG+UizKMEhVWyBVabmXZ6rnPkS8lC6vUhltpqD+SmZH6IVDTOuBQp6z+8yEHyHW3nLrB2X2jDem1Q+Iuzit4IFVTE6awt3FU6gWlsm6PcWiNArri5YyC88JJVXHjOcMbngN+W72bVSGWsX6LGQg44vHjdJ6QXcC/eBvDsYJAIieYTqxCHSY3XOxmmUnXQG00v6HjNL/LRiFvconAYnd8YGT77eY90xr9xXmaof8GK1F5YpW/iGF1XYTezadfxM93kgCiGkP9DWL80IGTYHECcZ8AA6eQgJ1qtrcYT+EzWWvQ86lxKMrfl1RkMnWrAVehRMQSvjRo3Y0RmcVvUSSc4ttWdu1FNGVu/a3aPAryl0lmgWQ5qmTwMNjJjOWsrETJMw50ahxbAD/8XZjGm7V+clBQKbIHf/reNC8RHHudFn4tmX//Zrmjzbp4PbEK3+DhrFcrxPbaxuWLjWUcF+vDKaf1LJZGRrOBsBj2cq3XXfcSu8R6G+cjnlEEkqyKO2rHs4bAz6+q6BelhbaDFeBXNpezVwVGPvSBpTPFPD7xN7t0o5f7rVCWBHyZjjLPDWzVDGko6vE9FmIKlY9S6YVZ7Ty51f9RFaeJeoRLXH4U7oTeK6xZBIQIkgrj931Ppx+Q7nJnIfXfzPjdEu6dInQCrAidG4Vwu2SDDSx7iC7kQHl5LdosUzcIpRcaQlu0Ettz5wQ/WXRlThs/jAnXe0fVmv9BdxXIfL3Zb5ECkEPEg36q8GAQHkGJQSW9Y9PhzzxpOjT93uxwUiAsEYAQ1glGHpVopHOEOny20Hxf/sWBSP6j4beR0kp2s3WrnkDkABdbj3+olJsREX X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 567e4890-c7ff-410a-0867-08dd456e1dde X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:00.9449 (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: S5Z+MSFHIZrRWm6hkAuWy8vaCIR9WWXQciZZ9jxMdINC2tJCUiDY64K6o119IwzGhFwdgHKl0WRQFFYHSfFGwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Queue-Id: 343BE1A0003 X-Stat-Signature: phjpn719k9hzmit1tgpxaebyht9dsyb4 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738709349-709728 X-HE-Meta: U2FsdGVkX19gAcL6WxsQ8McrWlvq+8CZEmkqpgVgv1SfZyAd3MfbQdx2p9usCMEsZnbYImVOp7Jjz7Q6wi2tDINlPIQM2tXO8LbZafZeXzrr4n9mwmjyZwdOaD94Izh++Hkeoi7z50PDAQNkyzSHLf/PLL761v7U68F1/6KMs7jrZ5Hg7GL4VfyaahYAxq+y7jjoNj2Bj8dsIwNukmTI9OTHcO8NsNlBzH7S1zpj+6I/flztKco2zvw7fonqmMDIym3zPLrRzlqE1wRZ/0ywkcpFyetR8dxPTuQxKwdm6QPMeswrHFckec0eeRYjaKrsETEAe9SZ9XZu6XW5aL8RFGz84RLqYAiiDxApA67WTeCpY7eMgflM9Catuyj2B0AQbo1jCPxddQFmxGu3/jYKoJBA7/31e0KLZxpT94a+mQi9eiyIeMm69y4ac8E3RTKmqFnGe6+o27Sn4dW+GtAZYyLM5n6r+CnYHi9PR1mE/ojSYrT9SRRYJXXjmOhoK6EcPhgUQJP2kQ8SCXeml3VeT1HPIr9YhxHEjHXO9RBkImdzWSOU/J1PhegQFm3zog61a/b39YvI3vjcMULqSdXd6uXD5UpO28+SXJID0/czqP4eMGipY0ATK8NOZaExfokcg4AITGouZyYiJtCKYi911827Q293S+qJqGex0vKHS/1BDwhwUiHHerZR8wi6f7Pjf9ttUOYpVGw3W7zhNDQuF/hlZzdv/ceuw9fMocHPgze0V3e0D0puFZD1ssCcI/+xOdZM12PYN9NXNBUrbLHYu6LcBZzO3btItULynOekbH8AkxzuNinODEuw/NDktxxnVOK/wq+J9gZlM6EFX3EfFvdmU3pXoeTYZriauYf5/UV0aV2Z0jCUN1A1eaTNkT3VrVxZJmKg5I9+BieUmkEYBt37VH1cqO2iXIbmzBTHfbQPZZdUYJTQGhOScfhe+UXmM41YQhpUnPzxy1DD/it U9X7kHcA TQwlNgL1U9i1xlc27jzLWwFArkRBuDnabR+V2MDfpGFGeztrMtHKQMtcO+ndJNvwE6C3oqddHy7p1iToQrtKOWdofz2vizw1iyyTWZA1fKGq2jKI4kJ44qYyOL7hWdJkmTTYThgnUmxSfUg3AkDxKhIHdowiACi9YemOY1vYjkqyIYttgyeUtzNkBkE9XVvtIo36Rsj2jIPBWB3YZghjK03NwXduh4koRezfk6h2OkRZh8idtxfPISOhdRNQg4XeVvc2AC2+Xffkko+itelZxH7Wt29BNQuAu51fuml1zmkBdAHhxt49GF7wj8gWLnh2Vt7qG7LkTi8rNITJ7bqQ/cdhvie94s5ktCMgQQHriNh7O7kdDttSOb4zsLM7LC8lr22DqI4we9lYw4ftDKN9kZK2l4P7yjRgulDyLU4PPn4XcPlJx4uxtK9Fzog== 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: Prior to freeing a block file systems supporting FS DAX must check that the associated pages are both unmapped from user-space and not undergoing DMA or other access from eg. get_user_pages(). This is achieved by unmapping the file range and scanning the FS DAX page-cache to see if any pages within the mapping have an elevated refcount. This is done using two functions - dax_layout_busy_page_range() which returns a page to wait for the refcount to become idle on. Rather than open-code this introduce a common implementation to both unmap and wait for the page to become idle. Signed-off-by: Alistair Popple Reviewed-by: Dan Williams --- Changes for v7: - Fix smatch warning, also reported by Dan and Darrick - Make sure xfs_break_layouts() can return -ERESTARTSYS, reported by Darrick - Use common definition of dax_page_is_idle() - Removed misplaced hunk changing madvise - Renamed dax_break_mapping() to dax_break_layout() suggested by Dan - Fix now unused variables in ext4 Changes for v5: - Don't wait for idle pages on non-DAX mappings Changes for v4: - Fixed some build breakage due to missing symbol exports reported by John Hubbard (thanks!). --- fs/dax.c | 33 +++++++++++++++++++++++++++++++++ fs/ext4/inode.c | 13 +------------ fs/fuse/dax.c | 27 +++------------------------ fs/xfs/xfs_inode.c | 26 +++++++------------------- fs/xfs/xfs_inode.h | 2 +- include/linux/dax.h | 23 ++++++++++++++++++----- 6 files changed, 63 insertions(+), 61 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index d010c10..710b280 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -845,6 +845,39 @@ int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index) return ret; } +static int wait_page_idle(struct page *page, + void (cb)(struct inode *), + struct inode *inode) +{ + return ___wait_var_event(page, dax_page_is_idle(page), + TASK_INTERRUPTIBLE, 0, 0, cb(inode)); +} + +/* + * Unmaps the inode and waits for any DMA to complete prior to deleting the + * DAX mapping entries for the range. + */ +int dax_break_layout(struct inode *inode, loff_t start, loff_t end, + void (cb)(struct inode *)) +{ + struct page *page; + int error = 0; + + if (!dax_mapping(inode->i_mapping)) + return 0; + + do { + page = dax_layout_busy_page_range(inode->i_mapping, start, end); + if (!page) + break; + + error = wait_page_idle(page, cb, inode); + } while (error == 0); + + return error; +} +EXPORT_SYMBOL_GPL(dax_break_layout); + /* * Invalidate DAX entry if it is clean. */ diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cc1acb1..2342bac 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3911,21 +3911,10 @@ static void ext4_wait_dax_page(struct inode *inode) int ext4_break_layouts(struct inode *inode) { - struct page *page; - int error; - if (WARN_ON_ONCE(!rwsem_is_locked(&inode->i_mapping->invalidate_lock))) return -EINVAL; - do { - page = dax_layout_busy_page(inode->i_mapping); - if (!page) - return 0; - - error = dax_wait_page_idle(page, ext4_wait_dax_page, inode); - } while (error == 0); - - return error; + return dax_break_layout_inode(inode, ext4_wait_dax_page); } /* diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index bf6faa3..0502bf3 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -666,33 +666,12 @@ static void fuse_wait_dax_page(struct inode *inode) filemap_invalidate_lock(inode->i_mapping); } -/* Should be called with mapping->invalidate_lock held exclusively */ -static int __fuse_dax_break_layouts(struct inode *inode, bool *retry, - loff_t start, loff_t end) -{ - struct page *page; - - page = dax_layout_busy_page_range(inode->i_mapping, start, end); - if (!page) - return 0; - - *retry = true; - return dax_wait_page_idle(page, fuse_wait_dax_page, inode); -} - +/* Should be called with mapping->invalidate_lock held exclusively. */ int fuse_dax_break_layouts(struct inode *inode, u64 dmap_start, u64 dmap_end) { - bool retry; - int ret; - - do { - retry = false; - ret = __fuse_dax_break_layouts(inode, &retry, dmap_start, - dmap_end); - } while (ret == 0 && retry); - - return ret; + return dax_break_layout(inode, dmap_start, dmap_end, + fuse_wait_dax_page); } ssize_t fuse_dax_read_iter(struct kiocb *iocb, struct iov_iter *to) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index a457c13..62c2ae3 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2732,21 +2732,17 @@ xfs_mmaplock_two_inodes_and_break_dax_layout( struct xfs_inode *ip2) { int error; - bool retry; struct page *page; if (ip1->i_ino > ip2->i_ino) swap(ip1, ip2); again: - retry = false; /* Lock the first inode */ xfs_ilock(ip1, XFS_MMAPLOCK_EXCL); - error = xfs_break_dax_layouts(VFS_I(ip1), &retry); - if (error || retry) { + error = xfs_break_dax_layouts(VFS_I(ip1)); + if (error) { xfs_iunlock(ip1, XFS_MMAPLOCK_EXCL); - if (error == 0 && retry) - goto again; return error; } @@ -2761,7 +2757,7 @@ xfs_mmaplock_two_inodes_and_break_dax_layout( * for this nested lock case. */ page = dax_layout_busy_page(VFS_I(ip2)->i_mapping); - if (page && page_ref_count(page) != 1) { + if (!dax_page_is_idle(page)) { xfs_iunlock(ip2, XFS_MMAPLOCK_EXCL); xfs_iunlock(ip1, XFS_MMAPLOCK_EXCL); goto again; @@ -3005,19 +3001,11 @@ xfs_wait_dax_page( int xfs_break_dax_layouts( - struct inode *inode, - bool *retry) + struct inode *inode) { - struct page *page; - xfs_assert_ilocked(XFS_I(inode), XFS_MMAPLOCK_EXCL); - page = dax_layout_busy_page(inode->i_mapping); - if (!page) - return 0; - - *retry = true; - return dax_wait_page_idle(page, xfs_wait_dax_page, inode); + return dax_break_layout_inode(inode, xfs_wait_dax_page); } int @@ -3035,8 +3023,8 @@ xfs_break_layouts( retry = false; switch (reason) { case BREAK_UNMAP: - error = xfs_break_dax_layouts(inode, &retry); - if (error || retry) + error = xfs_break_dax_layouts(inode); + if (error) break; fallthrough; case BREAK_WRITE: diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index c08093a..123dfa9 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -603,7 +603,7 @@ xfs_itruncate_extents( return xfs_itruncate_extents_flags(tpp, ip, whichfork, new_size, 0); } -int xfs_break_dax_layouts(struct inode *inode, bool *retry); +int xfs_break_dax_layouts(struct inode *inode); int xfs_break_layouts(struct inode *inode, uint *iolock, enum layout_break_reason reason); diff --git a/include/linux/dax.h b/include/linux/dax.h index 9b1ce98..a6b277f 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -207,12 +207,9 @@ int dax_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero, int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, const struct iomap_ops *ops); -static inline int dax_wait_page_idle(struct page *page, - void (cb)(struct inode *), - struct inode *inode) +static inline bool dax_page_is_idle(struct page *page) { - return ___wait_var_event(page, page_ref_count(page) == 1, - TASK_INTERRUPTIBLE, 0, 0, cb(inode)); + return page && page_ref_count(page) == 1; } #if IS_ENABLED(CONFIG_DAX) @@ -228,6 +225,15 @@ static inline void dax_read_unlock(int id) { } #endif /* CONFIG_DAX */ + +#if !IS_ENABLED(CONFIG_FS_DAX) +static inline int __must_check dax_break_layout(struct inode *inode, + loff_t start, loff_t end, void (cb)(struct inode *)) +{ + return 0; +} +#endif + bool dax_alive(struct dax_device *dax_dev); void *dax_get_private(struct dax_device *dax_dev); long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, @@ -251,6 +257,13 @@ vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index); int dax_invalidate_mapping_entry_sync(struct address_space *mapping, pgoff_t index); +int __must_check dax_break_layout(struct inode *inode, loff_t start, + loff_t end, void (cb)(struct inode *)); +static inline int __must_check dax_break_layout_inode(struct inode *inode, + void (cb)(struct inode *)) +{ + return dax_break_layout(inode, 0, LLONG_MAX, cb); +} int dax_dedupe_file_range_compare(struct inode *src, loff_t srcoff, struct inode *dest, loff_t destoff, loff_t len, bool *is_same, From patchwork Tue Feb 4 22:48:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960106 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id E67FDC02193 for ; Tue, 4 Feb 2025 22:53:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 788A46B0098; Tue, 4 Feb 2025 17:53:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 71104280001; Tue, 4 Feb 2025 17:53:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F0046B009E; Tue, 4 Feb 2025 17:53:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2E3056B0098 for ; Tue, 4 Feb 2025 17:53:41 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C5A371202AE for ; Tue, 4 Feb 2025 22:53:40 +0000 (UTC) X-FDA: 83083765800.21.C0AF2D2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) by imf09.hostedemail.com (Postfix) with ESMTP id E775014000B for ; Tue, 4 Feb 2025 22:53:37 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=e8e6jfOJ; spf=pass (imf09.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.54 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709618; 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=GBSbgn8RrnR9Ey8m0wS0VZAwZBcX1gA2gBrbdayc+ls=; b=ZVVZpyCSyMpbYENXizUPrG6VAKNaK+fkEvaztowWCwUVJbmajIOfO4meWw+vT39olJP35R iDkFyFQI5uHgnM/HyKAQRgJPBvpRn3A3wLDIb4Geqmp6ut8pNmHPV/glKhLMFbelN30EQ0 SvxjfbYdTiy9WwH9dCcPU9Di+dcLlZI= ARC-Authentication-Results: i=2; imf09.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=e8e6jfOJ; spf=pass (imf09.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.54 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709618; a=rsa-sha256; cv=pass; b=5D9e6CmxivPTB4XS/g9GtX08cHnlDZsiEQsINBXmaqgs2YCZThPoWrrRFvsW4kUr/cZYwx r60F787ue7XYReadSzD9/6vJTfxe/1KJHmoADX4ijxADfSeUr2pgyfHFVE8JhFl3ba4hDU iso0yIrt5LM1RmF7XdDrtSlsBBXghQw= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WyrPJ54kAFnl3WrPpZKUiXqUCDeFFobRVjbuTq8yT4B/vaDIByY6cTu4AbRoThgFqyCH3jRjFAesJJYyfTHx6lhfHZfE784dSIW+LLeem9y1vsAzUvYj024gbCHer068aNaBpWb/wGaBreIgF6dJS++NfBmbBLcHi5WWUjLiJ4FApoEr3HtfaGnDXwFQV/H83ymzeVQqjYWqosX1TlutY1WfiCZF4LrtZmLWRbKS6pbFFsUt/cYHNAY/frMZJq+yeN4+wTuVMpUh4Y0bKqXKxTWh1O2s9x4gqFQ7MxonmJrQUCumAU2Jfx4KYEBOT6AVFJOBEO31umsSZhVvkGSWig== 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=GBSbgn8RrnR9Ey8m0wS0VZAwZBcX1gA2gBrbdayc+ls=; b=ku7JMOxdSrhhTYk5rClQL1VF+cPFcrK80v/EDiV4io2bGyMWM4UQCRZxzkmTs3CvXS4TbfaeAHHt1DaF2aZ3JVIMB1dFAWx/ojgZhmUvon10sNc7otJC1aukgQ3BgSSXUISIQ53AXSo5J94YAKa1ba3J8bdcz3P2oB5McmwMuzElgonsJ1vt8yfiL7Tvt5CNrkLmdPTusB/JILF2ZCZ14n0llQ2vkdf7l3nhrioACffU76fj3W8Bc2oaYzyDQR8i5ZHt+9d+D4kYf3HXMLFscI2PYLRzVfxLRGPqV1pR/8GG9jDb7BzLi3D9Lq5RWp/zC3tKH0RKAQAxCQVTCG4U1w== 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=GBSbgn8RrnR9Ey8m0wS0VZAwZBcX1gA2gBrbdayc+ls=; b=e8e6jfOJL/BHqouzgeq/SjWa2wPMcA9BYDsJyo6HiNsM0O7RMwIcQjVMVejV13DopIXofXWwfig7egKlqserXYb49aegVQpUscW2niTeAGg6YJ7oE3PH6yS4sw2jKH5d7GJNGxNUyLa7ajm2cpJdjmwymsTLgEruA2TzhcwuRt24SEVL5bN/hZysuPSYd8PeX43ooeNt/DWftjNlhhs/AI/OFV8xTnF3it3y84gTNZ67JXmzTgD/laDe1V4aKgxHukKkDp8ZcqItivkgejkaTrO6CXF6m7UP5UfJu1HSiKaRkFwSGh6RsthscvVq/5VnSei2ZwX0JuAiD7pt8Q1HBg== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:05 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:05 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 06/20] fs/dax: Always remove DAX page-cache entries when breaking layouts Date: Wed, 5 Feb 2025 09:48:03 +1100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5PR01CA0004.ausprd01.prod.outlook.com (2603:10c6:10:1fa::8) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 48fc2c59-edf6-4b58-c23c-08dd456e209f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: jD/xootGSsIm9+Wf0xYFz06h/Z746pCd/GnfjJ8XLR1IBtk8POE8w6Xh3wyiRVEpJfQ+61UASz7oDI39zjSpg8qERlHdTh2GoWWRggYqgCEjTLfrRxL2NA/keOva1R0obTj6BzoUpPizdtb5eZWmXHRTYUrpAWUpmzfl2elPBMKS2WKx3Bzlq2cvjWWM6HdQstoWDT7Xld7ALs8ld9jEahFvSIKG+jZljabc3Jmw5ez7MUlIx9wrVdr9abwcBW4MqY0PsjzcMDyULFsX7cAvOVikgL303tijaoKdZ51MxdzhlnB5+SaoOgFgHXyDzkhRBuIAecHXS6J1sBzM4Mw5T1Q5ST9yYDdXTsInHQEsN1Rt1Bic7fmYlQxhJ3TKWlwXLAkQhDJUvOGahvjmrfpB4gUrK9G9vJ2bLwNB6/hLRlA4EJnyrBc+6tZ1S7kZPefvyV6We5IpPx1FDuUAHgvBZPZ3KaSvH34i29CT/rK0qgkzRrMXwiLF5Q+7x5Thhxrb9F/npq+8ALFtxCM6VV4VWYb8LHx0JAVvxAKevP1O1HI+RVNRj6P5lef/bLpZitXh01FDk3YD6df1/G+OZmCqWamhNKnWajDtnGK5D63UXLDQiQQlCxDdButm4sDxJVWvzmZFS/WcZ0piRtV4Fvz1ST4b12SINHSfkMRBzncT9nb9349U/N0LdBWbIJVI8jmkZQtQ6BoJW2xqINaST5l/i7xFvcK/ZZT1LPwwulJu6uowp4mwocdnTHzHQVVTIeStLSNw8kz1k988dziJIrDFWu6WRaKZ8LNaGU8/ZORVzmYyMrbFk6wws1U3UvjgPj/okA4/mGZyHYh8MqV96YSavOomCx5eYxEmI9XmY3qMi+jI3vObGHcgyMds5AfpY3TkyDIoV4qD5KjVJJsH4glQbTZ7pQyBN//Kje1Z7JTnjf0axjBDGw6dSY6DTld4NG5qkD+hmq0b4NSuBzqyr2WQMdL0U29xmJdNl2K+EMKy/clhdG7lSZKphprPO9jhrrTfnpUPKKzvwViGrDGib84l0uRaEoRjRyZQ+wqqeyVH3gbSk5V7J7Rf12Q1A1+yM6ymD9yAwEUrnAHiaZQcnZo+fMx89McIOtZq+J2OsnphGI2cs57XMEA/qzUZKpGWTxCgpQik4Tq0XU35E4PI1cTuZKcRGtxpR4/bYfj3SmeZU5xaeaP1AxoYVpdhpwCFCTbeAhEWQFwXxUOuDeNuyWdSn+SI81yLGkk4wfGqiZGvOMjjqfvuV0rdBJonnC9bzeB7cKFvwFqNbPcz0EEdiGrjYbFK5hglol+XRmy2pOBUEVkbU4DfvJeNXVmdn8ZgkvDZzVVaQcbJZK1EmfvZ4HQOmMTONuZwVc1+5KjjoFkRGUYqcLjIuhLjGW++SKHHXhUO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EXENT2OeBHOpyLuHqJHw5CNHH1Joi6g7znrm1C4BBBes2nd0QUKeOtCsoy8Oh4R76Kz5ovJ0YWIQ8QgMkgpFiAHnauJkw1bYFTBex8+64UjNkier5b+X5kfOFrwWxn0K6YoqGpkOT2kBuGpXbx3UBjJ8E3HIN0srBUJ6HsBr379bmu7VVyEH8rztEMJsfK0rTKsC/Ww9a/XjN2lozJwG3rCi3YYz6agFNUVohSOkUSG0RPHXptJROJJ1+EFh4lYFXCapUBX+acf1/KWAP6ukdFtpwWaNgqG7XFGk+KyAzOzr8ONQXb7QeAKvBuuKpb5xMcOl1bd/PFNgTnSl4QQWCrdfUYrlplFBLGtL3wmodVHnTmsdZFkWWrCxe+BamBGK4+Hy9f/A4DryPB8N3cCEbvWc6pe3FVHzYJNge9Ixp09DDVz8HELmEdXwfELp+KIwg/TveVyumMijc5+5JAEwIUQYxJnZV5V3mqYVq3LxMxV6zzQUEec0VmRZSWOkN04c5N41bAccoeRG5l93m3sOigr2XbtF8U4nJncgpgddBlUp3HIrXEli8gRn45UK5pU0FkkznSx3eUdbQ2yUm6m/TuzfnptkmvsPI2axDJ3azaqbsfqL975DEAkHsQqe/PxehascBnFwnBh9hVHKy4GjCtUwhkDPgY6VkQyrdjvxcamzED4owLOLU+b69O2Zqf3xdGmtfJgUnN4rap2WSauRbogdr4pvLaRwdr5ZLwdRKhHP6NgqsLWg2Ysl0GvnKdDvUqObrxC8i84spNuC/rcJNorsylxTb79AKH4PbA7xPJLr90Kar9eGEyBmqdpLL6TJ20B3T9fr0s+zt60d8zbtIaijcuV6+x8T+qO2BWEis1F/HSN6gDlavhUvsIHWH0ZDfnve3w5M+kD2pWH1gp9XkuRYBXtfMTz4zbqIkaxARrIACDULt5tJUuid7Ddv7A5sRxmny4zrSsnN/6m+kEO7YYlIctsKH61CYD+8XhNS26VIJUF8oubBkqEBfhtcuqBDCjbu6kz/xzP27NAO6uhiyGNLRByJCcUbPCAgDFx6IXrfyw4eatjBS9qIvoIBTaOSXqIi5V2NftzibPbIkhAR0nFVR3wr39geUNoAQ/MGDDr83x3geaEsbAjtgEJGEcUbJuKjrKkT761BFabMXLYXXruTOJVPbCQwzGmqFI8UfrmUGWybP5GP0H6sVcLtxX30QNRAZnNJmk6IkSkQbpPr5lVKnCIL2akVIWsIx0CeQw+5xDaa/llipaMbvDAC1DHV6HkteCbGaPp3HCU3ktKIeVC/oqjXE6mhEBE8UfLbC1ZnJWvrYKm6i4P7CrUTuW/3a2+jCRhJXmRIlIfy8B6K8lkhJHdTVeEbDt8oX5gj+/UDqhKGWDadXvsoJU+SAYcG0m3DgBBr5OxM+EJBRk/gbz69AD9x3xuU3FrChnTwhDcfHAREmUT2iLBp4r3xw5lmID9zEKoJ2H/VYT+Pb+CSkqof7bEJEp+iWQt8VQTHwkB1q9LGnzeIktPP/FgDMFGHQWN4q9lWMp7bBH8ZGlFEpdhd39SgxEP5+fJNpRpc3FHBCU4cdQnbMAlnlgVbKi2L X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48fc2c59-edf6-4b58-c23c-08dd456e209f X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:05.5680 (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: xT5YKdS5KwE19F3TVU42gxgzMylW2iucPWGbUPhG2Mx1LBfTjtLSoki4vVFQG2x6Cs37cTa+Rezo1R0THxhDOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Queue-Id: E775014000B X-Stat-Signature: qcs59yomhyit6s66zyd9r9g6x5bbmbgo X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1738709617-293591 X-HE-Meta: U2FsdGVkX1/n+kd8yoUtZeZKC9eVPaRAm/bsHITchnO6+VVHr1FPf/NzB/ddswQArg3HUveyD0AuqD7D6ANENdGjTTQkiIZ+BBEqdB5THP6dCyMtdYtuXYmKNCKK22zhxArHuEGqpJ3+bqXPbLer2EPNdDXqbRXCVwPGkfi+jsUb03kO+0Kag6mnZtMA1+OyN7oyTm6gw2z7tXcB3dzzo9oYjk4CHlIH2zUxMn+rZoh2lQct1vM5Aj4Obp73AyYNDynMWG4ko1ugdag9I3b5SXQXe4Pv+fnVVAozugc1GaSiirxvtDy3fStBLa/4Egr4FK+9g7E3D2kaQgfQNRRRzfF/Lk0dQf+CXBkpEL/AX5J0g6Vv7dRiU7qASaoJ6+l7kDswLpgjuk5LZzkq+7jCIPCHP4MxHspqD55SDpibPAzapH+G5rleuHMHQ+U4h8lbsIDTkBRJKYUZGWL2z2NIA5pHSBjmFCZCdL1RS2L0yobmMp35FOCN0KSWG0NE0TM5nL4pExAPKIWVq1vzlFRic/CabqhieeR8nddp5N2Qs/IssWMXoenwzaDgS6R92MRr5XA7WSqnvSD3W00yp/r4TnjdWTKBoQqzBZSnqNIalCedlclyd3u9oMkUq8VV5pRWSstxirh0tCL5qsVqMyw1ALTdOHvYqpomLve/diTXcxykmmaHFBGVKHjHuO4wkyju3dl4b9AKHJOnZQqAldsm9Xg1dfWQtG1WQafmVEo/osOiV6sP1g4qBvN9QEhu6G4DVik12TGaS6HJhqK6o/LUTZG4OPUXpeO+5Jl5ZcrigWr2GyXn3cUsr+NNS51RvP5X0xUTdNpdRKOFjnozqCe9h8iI0Mye5lRgnUaZNG6BGAu6wTYxn6Rk0PEI2Z1LfvJSKZFEKRM0bMfyYOic626KeUjX5cMfk0Yqtaca1EaCc/tKibmmX2/hjsU6ktXhHzv0ibbyGWY6HURypY95ulc J9e7VpjW A83M9Faojr5ap96NbRnL334yR2JXWg/FJcIKYPhRB8a8uCTDJpYk9S4LAFs1sN4WQ3aVpewRauT1zdKVmVuocycFmGhp3HG9/SekMn37ZOAXqR5bvyDfS079SEopXRwuhVO11+kD+7deMIZpx5JYxVeGa5fBo7NQbADPWBP6D7xAuAyhF2rdL/uOQDmG5B2jfW6zVZfmOJA3Kxvr7EMRXvVmoCQcaRBKf+OVCA7DM4HLiwNGqXeCglMPjAjOo3L75JNh+ByPPdwzY+4/MFQgweLYCBW5QBhuYHfwE3KJGEh0TxaY7PYUVdW83FYy456aq7+Nre4jjvjwsLyPuGahhGeFLFJ00EsVVGTNhQ0fI48sWkyjsZHLduYS2YsIZCrwcXsCX+RPvJK1/f9uUboJjD4f2u4emgAbCGJwmUAoUkNiK4D5k6tjxDzulqQ== 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: Prior to any truncation operations file systems call dax_break_mapping() to ensure pages in the range are not under going DMA. Later DAX page-cache entries will be removed by truncate_folio_batch_exceptionals() in the generic page-cache code. However this makes it possible for folios to be removed from the page-cache even though they are still DMA busy if the file-system hasn't called dax_break_mapping(). It also means they can never be waited on in future because FS DAX will lose track of them once the page-cache entry has been deleted. Instead it is better to delete the FS DAX entry when the file-system calls dax_break_mapping() as part of it's truncate operation. This ensures only idle pages can be removed from the FS DAX page-cache and makes it easy to detect if a file-system hasn't called dax_break_mapping() prior to a truncate operation. Signed-off-by: Alistair Popple Reviewed-by: Dan Williams --- Changes for v7: - s/dax_break_mapping/dax_break_layout/ suggested by Dan. - Rework dax_break_mapping() to take a NULL callback for NOWAIT behaviour as suggested by Dan. --- fs/dax.c | 40 ++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_inode.c | 5 ++--- include/linux/dax.h | 2 ++ mm/truncate.c | 16 +++++++++++++++- 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 710b280..39f1dc0 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -845,6 +845,36 @@ int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index) return ret; } +void dax_delete_mapping_range(struct address_space *mapping, + loff_t start, loff_t end) +{ + void *entry; + pgoff_t start_idx = start >> PAGE_SHIFT; + pgoff_t end_idx; + XA_STATE(xas, &mapping->i_pages, start_idx); + + /* If end == LLONG_MAX, all pages from start to till end of file */ + if (end == LLONG_MAX) + end_idx = ULONG_MAX; + else + end_idx = end >> PAGE_SHIFT; + + xas_lock_irq(&xas); + xas_for_each(&xas, entry, end_idx) { + if (!xa_is_value(entry)) + continue; + entry = wait_entry_unlocked_exclusive(&xas, entry); + if (!entry) + continue; + dax_disassociate_entry(entry, mapping, true); + xas_store(&xas, NULL); + mapping->nrpages -= 1UL << dax_entry_order(entry); + put_unlocked_entry(&xas, entry, WAKE_ALL); + } + xas_unlock_irq(&xas); +} +EXPORT_SYMBOL_GPL(dax_delete_mapping_range); + static int wait_page_idle(struct page *page, void (cb)(struct inode *), struct inode *inode) @@ -856,6 +886,9 @@ static int wait_page_idle(struct page *page, /* * Unmaps the inode and waits for any DMA to complete prior to deleting the * DAX mapping entries for the range. + * + * For NOWAIT behavior, pass @cb as NULL to early-exit on first found + * busy page */ int dax_break_layout(struct inode *inode, loff_t start, loff_t end, void (cb)(struct inode *)) @@ -870,10 +903,17 @@ int dax_break_layout(struct inode *inode, loff_t start, loff_t end, page = dax_layout_busy_page_range(inode->i_mapping, start, end); if (!page) break; + if (!cb) { + error = -ERESTARTSYS; + break; + } error = wait_page_idle(page, cb, inode); } while (error == 0); + if (!page) + dax_delete_mapping_range(inode->i_mapping, start, end); + return error; } EXPORT_SYMBOL_GPL(dax_break_layout); diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 62c2ae3..c9ffabe 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2732,7 +2732,6 @@ xfs_mmaplock_two_inodes_and_break_dax_layout( struct xfs_inode *ip2) { int error; - struct page *page; if (ip1->i_ino > ip2->i_ino) swap(ip1, ip2); @@ -2756,8 +2755,8 @@ xfs_mmaplock_two_inodes_and_break_dax_layout( * need to unlock & lock the XFS_MMAPLOCK_EXCL which is not suitable * for this nested lock case. */ - page = dax_layout_busy_page(VFS_I(ip2)->i_mapping); - if (!dax_page_is_idle(page)) { + error = dax_break_layout(VFS_I(ip2), 0, -1, NULL); + if (error) { xfs_iunlock(ip2, XFS_MMAPLOCK_EXCL); xfs_iunlock(ip1, XFS_MMAPLOCK_EXCL); goto again; diff --git a/include/linux/dax.h b/include/linux/dax.h index a6b277f..2fbb262 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -255,6 +255,8 @@ vm_fault_t dax_iomap_fault(struct vm_fault *vmf, unsigned int order, vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, unsigned int order, pfn_t pfn); int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index); +void dax_delete_mapping_range(struct address_space *mapping, + loff_t start, loff_t end); int dax_invalidate_mapping_entry_sync(struct address_space *mapping, pgoff_t index); int __must_check dax_break_layout(struct inode *inode, loff_t start, diff --git a/mm/truncate.c b/mm/truncate.c index e2e115a..0395e57 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -78,8 +78,22 @@ static void truncate_folio_batch_exceptionals(struct address_space *mapping, if (dax_mapping(mapping)) { for (i = j; i < nr; i++) { - if (xa_is_value(fbatch->folios[i])) + if (xa_is_value(fbatch->folios[i])) { + /* + * File systems should already have called + * dax_break_layout_entry() to remove all DAX + * entries while holding a lock to prevent + * establishing new entries. Therefore we + * shouldn't find any here. + */ + WARN_ON_ONCE(1); + + /* + * Delete the mapping so truncate_pagecache() + * doesn't loop forever. + */ dax_delete_mapping_entry(mapping, indices[i]); + } } goto out; } From patchwork Tue Feb 4 22:48:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960094 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 253D8C02193 for ; Tue, 4 Feb 2025 22:50:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B7C8D280002; Tue, 4 Feb 2025 17:50:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B2D5B280001; Tue, 4 Feb 2025 17:50:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97FE0280002; Tue, 4 Feb 2025 17:50:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7B740280001 for ; Tue, 4 Feb 2025 17:50:29 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3312280226 for ; Tue, 4 Feb 2025 22:50:29 +0000 (UTC) X-FDA: 83083757778.24.E650D13 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2040.outbound.protection.outlook.com [40.107.244.40]) by imf15.hostedemail.com (Postfix) with ESMTP id 56261A0003 for ; Tue, 4 Feb 2025 22:50:26 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=m6ABzS1J; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf15.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.40 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709426; 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=XM5yDHM16usVYJCh1yvhe9uRrzl82mHCkAFuroELR0w=; b=Wij20viYXNOZELLxJBXKqn9F98lplpUQEvYdwVMjRAQMaAmhWejlDoFlJLOU4LRAt20005 Nd1H22rWqyJyFz+5ePHnVq6e1ovnBWMO3OLZ1nTf9voTTRi212b2/DZeBJB9pf+vwgx0Kr FDH60ULbEy9lwENhpQohOycIdJnhkag= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709426; a=rsa-sha256; cv=pass; b=k+XbTqt+ifxnrmKeYtFSW3zeBj0itkjWE3fhRL9F+82rgmege3DDH8O0ZdhIWgnQ8LeCTn FED7PLNFOuLxAx92cXj6PO+EinAPlx68pjBl/lCsEuMNzzEYrJ8S4pcc/VmFjI0nRSnG6+ /Been4ioEQv11I8/IyaJfjhIAYYhTmo= ARC-Authentication-Results: i=2; imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=m6ABzS1J; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf15.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.40 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XhWReO8s9knTNbGRBm59KiIM3bdE9melqBQ5I2vQV2xdETOFpXmep2FyvMgmdK23rCVmqrZNSeiHn7qylVdOZqIkM7iGIONjKZ6KHN123x33u4fbr30uIqOi2ixJEz6R/lZ8wGgKyTKG9SnzJtb6zILAdkMOsX8uv7xnXFjvnGpYvdozUF8KmyCwY3oXUKWvvKyTJDYnIfpLICYuvb06gqOZgsChU+jRqfdKbAjzSnUagf4x5Kj+eDXgMdrJX32qcRvmgVmhAzCUGzMaIIfu1JT26ncMErkZVREvLcFIJWL7dpWLu9s6uOoC4tNwghjPBeOWTSA7zF6LoTKOIWsEJg== 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=XM5yDHM16usVYJCh1yvhe9uRrzl82mHCkAFuroELR0w=; b=C5veTR8vZEXTE37xpUudBGdlO0Zn+ItujCIRcvWBCdEi62ruM9fc5EYLjadxbU83+Bv+d6CUlrxoLFlIfySZADVqgAuApZaI42KPyz7pW/DrxItoNaVpkTnxBO/YNpHTFZD1Hv2/hxQzAWxkLXoWgEqI5cukrMk7krvb46bMywO+ykI60wOwKiBhqo1p/coPCvBzMz6LaPzOGhYgRmDHoyXIHUPxzPxR7S+Qv07UGFCu1+bVgSD6cn0bDmGCsyOl8T0PyjT0ND65MDZ+D2QhQL5Z4rIhsGh2Xw1TdCIdlk7UGG22AWr9PGWhCPFuvRwvUoKXBVxhxdiRGbUTFGNo6A== 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=XM5yDHM16usVYJCh1yvhe9uRrzl82mHCkAFuroELR0w=; b=m6ABzS1JUFLJV34FgaQBoyQyVDvgBwDPbJ8k/HQBkVG4iBNLNq8hyeX8mSGfy1dbriveJBVnE8Q+saaICqUnPoF582d6Lhumtxjoj2zFYh8WYDsD4p9RVMcGrKFe7Zvo1yKaCsOQUaq4WItTm7cv97SYrX+7gTYGiLmxbuR7rWIrC9Ai/dPDFn2L1UCidU0QAWBTux9YDFkZQM0g5aoFxUC7Bp/vhMzxVd2JmCm267durLfTLR5NBEU2bEtngs+MeLyjFTid/xFmD9/3vQSDHYWAKgD9sTvgFhQtbvC6yo/668g63caDZSCaTXcObh/zmiD23TiS4evO9rAk8bPixQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:10 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:10 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 07/20] fs/dax: Ensure all pages are idle prior to filesystem unmount Date: Wed, 5 Feb 2025 09:48:04 +1100 Message-ID: <6f23832debd919787c57fc5ef19561a45c034bce.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P300CA0026.AUSP300.PROD.OUTLOOK.COM (2603:10c6:10:1ff::15) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 814998c4-00c4-4693-b241-08dd456e2355 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: 2oNv5RZda0vYQ4l10Jy89wJyxQHdtZk8GA1v2O50xqsYJfJdsWq7pvo84LsEkU9orD7VIb/O0Jp+k/cfJCIfmzrbLIDPu6ljM7DS8vmuVkR+wSWZUfwrF0Il7jhJArfzIGUf5paw7rbHf78OGGcTo7n95DxqquMOHLgWVJKFzc6GgYMqlQ9OS5Zgp9rCQ7uT6lKdvl7xgjAKZDkLK8pW8RzXVtT9CDAF8TpHVoC6FI5461V3/Hsvq0Jsh4ilPK2H2Kz0K0aFY5s2WaDQP3Ns0O9vWmCWykJhWFtGLVxFU9eMwysoRN5Dqq/L61u6DDwKQMXoeym7qh7ksGvywUaTAfdk3xOATli8RzPIsxLKboD68CWQaAGaWtN7DrqUEfKPUDwIRC96tR6mOmcfMvOQGneWJIMz81/qdlOQfqquttpRp4vfxn0fpx4AfZgn/r+pF3mEBuEDnsx8ifSF6V2hrZc4pm3nHr9HMW76tmbRfLj/JwaFUhq/roa1VL3FLwAw2a6GF5jdvPG3yiEPLumRrc/u0ChIzxXlALjhC+tdvaiLyF1YyDmml47ZTMyx6jxYgS2yFTAaDu+Fhq/AObyS1OyP4wIwrhpIX3SvDKgde7I6h4NZtEPQzX81sX/bbh2byuHCcWtsPi35COqolQyqugAnC4AQbYbaCwn/qIKNSxRz6sPdtNPQNlfDXF237XNyHwTcL0IzXdAsaIRW6c+i3dx/lmZ17PK/XG46crn1hp9dRrirPE6BDjtmdsqY668bhjYWxcvqRsGb7QvdKD41Mo+gldDlUxExGDHLBODrX/bNVgBaVCws4zFm8IzeDbF4NeIfMvh5wnqaWNqqrFYd/gS6Ga2ePnnkTGv7f64LG2jPLR7exyy3ji6wEQ6sVQSJSr8LlKY524JRwEk+X/PcA1eD2lEcs1Iz7H7jmV2ImorekbYKZkn7hl9lM2Q1lA3mAybH8rs33WUcf8dafyV6JYl+xsvEkQYkcK9yDf5J1+ycQjtfCfbcuaJkA5rMB0WoL9zUdh9wTmu3LYVtdk+Gnpio1/EYSGjB56gGng2dgzya3lw6QkqRN9rGLhfOAimIH8+mhorXm/1JzI92CLDwEST9dGO7cHSBlKMOBFEK9SaRWri0Inqtl/bPTkVZ8ctL/QFMzi4hUYad8SEcbn77EK9WaIuyxFGiEsv3JOwpZcYZfITVEA9gUlNaxEJI5KHGc7eD08Y1/ukwJbJK1cPyhSyQogWbo55gEAbffhLxd4PYY8xC6vNwXT2XuGiXDeRJ7JU5+NyZVgRWXW6pm0V7d4hDLwbBCjomt/6SEwKZS0/kPBfEAy3MOvdUlRoEeS4d9kSaumUDgiEAeMaLdYrGOnoERAt4yOYG+sdDozzNswDMCWk43nPOXvlkLF0dSNRv X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: STL0pD0pdRNJn5EgPkBo694vVqpbHmPEI+L2I2O4TSwVPFDsoRD65V+Nnh+BG20/pO4dyDDy6eU5cdkzFgFUjJn5qAkZhxhZDPKqWtMjIYA33MrnQJF3BUcreQf2eTxwgZtOoviAEgvk+IG4J1g0x8jvew2lT6VaPQj5TEm2fi2X8T5ZA1ztCuMbBDEDKMVyLvz9Fvc7VJkuVj6vAa3jU+ZFCPvfojm4s6DKm0NKPSA85c4XnWMhyY+4RXWANv7lB7Rj5hcp60FtXq/p+ISYH63AuCRCCCG3x86nfJO1+Wexf9SgDyyF2aHkON/4KEUw0kTLGCFl97mzUCTT7XLITIMwlUIWQ4hEfR0c62J0RK5fmrKPa9xVqOQfDvvVpVGbGUkfeqvtVmBZ2uxe5evgDgrNHVy0keegiORjO81knAhRPQN3tmC8g23msWu8T0to8ZGDpUw13j99j3SIPgzd2wvACyiVckLj1Dnv7bUZgOmHJDPrlpo+/eZhsS3qFkl808GP93YOg00HF3uEUQxMTi3AmIEkkTm2W/S7AlzZduhgVUvfCn81nDt/TXJXHuCMnEicWRlXWQBN8H8Uj2DDRo1X0K8wORsA1nu/gPEWNDnL1QWmFvG6J4jA6BAHWtiRzXN7mu4aDrRZDUJQmMcmSxH7QT0t2pxQNMJNLm0Mz2jmLrfl4wVhOFfBqbm5jdTnQAHP9rW8XsaJ5/jSiBZQVBYVCfODvNSqUOuf4dSEh5KQgWNxoiBFVq4eTqMAkY/nq+Yzf+sj0sIRNLfnzWJAUEo2okWTEuHZBS0YEKXGB8SJk0autGyWzLH52JgPsTuzoQv+a7a4XRQGOrq9GhuLUgV7ZuP8gZnbbWRYyFge8Z7Ez/9ochEsT8cFDk1ug/tu9p1QiNiv9hV1crvjOEL5soxztoNe8b7lEy2MgYE5+IRVwndzHaosB9ID7pib+glzKvdbgFCp/jTwi8FW4S9XpJAKXafq03CvKmPV1MXDjkju6A2NtF81wklGfTOutjZ0bPf3tOjBK5wmXDf6/zDsupPbbdvK+ySgYHNUo6iEU0gESLgDhI+mWErii6Q5abHBetH31UFAwodqp8PlBjeKq/sJMIjdg+tXVnUaQ3BRLbQcs8PWPgYKZyyjvWeaPspd/8FXliLKuTcJ0cSO7BNiUDKiQzBIUPFKaQv0qm7qklj9lcnADzkDSdHLKUHQA1KwzMPZn43N2tLNCTmzjoY0s32BdBSFkVLdOGfnFsYB6C63gwRhxgoi5ATHnILU8nbMTitBeu3zSFMLH6GQ0pf4vJsNHwlPV/bxRwteWSu/K8Lx0YfjltNRCrorqe5E6UCUNT3LqSn206cWwc/sSYve30RiXpUk56UDuiMZI39enYtQYYW1wNe2nFuXiaB2WJEY0T0qmggw6aDbVqZui+v50otJ4G5GsvzIwaYAzMLAavFfpdtUwMykvQwPYQVhpBF46ITs+3Wx0W44RcjmmTyD+QDBNjlviv5g1mEGfgDIb6DvFhTPzQwaMNlRp6iT6n0nwqzXx/EQLyvChp9DPJ1zGaXpLSVCiMw9GocURErB0t65q0mgvUphl1n5U5S5naGi X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 814998c4-00c4-4693-b241-08dd456e2355 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:10.1053 (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: cnzNA/2RpZT882KOFGSGZqcm3GQkrnv56SGwUl5wbKOYxU6PGiNEAwx7GtkpTDaKQvgt1SaylGOvZiGvVsO5Bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Stat-Signature: u68j8xmtymrm3ns6n3o67jdrthy9mpej X-Rspamd-Queue-Id: 56261A0003 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738709426-907062 X-HE-Meta: U2FsdGVkX194+URzFSzedEgIkEytv81Rn+Jqs07TwE6n9GQcRVaLon13iYjV73Yz4unpyv2t1BPP46NduzCXqJxmppVG5Tif7ECNozqeZ6z3GlHtl96fuqm4K3Ea9NBpnmMJwt9JVqU4xFodPOaZ92+zoZN7rXUHi7+QCkcP3U9gmxq7UUoaAja4VDCOsOHMwg7Uv00iVOrOoFvMFwiVTL254jMisi31jyQKASUoX5nupz9+SJYDldYVPw4S9I9Vh8cfqhuTRmdp4y+giVHnoWhzYlOungEYt5t7hngN17HarumouhBQJfiDzVx0n3zAO5xi9bjxsITI7XSW/1slMhKgwXA6N3sO4LJdqviIWtyaGxDZeUF+EMIbXUaf4VOJV8x5/eDiJELRPugb3Fmysz8zBa4S1OADxQNWQvd5450snOXS1650VMJOVwfu1Z55KlbbhUClHYoqcVMQGpOKsyXXbCtfQif6Yomrj5kB1OFgeZL+cVEk2y1ueFaiSfo+VnrgYcaTuUFor0y8AQjqA5Gfos80Quit1VMgnf0s8xr+9OB6mtajIMn75piSd54cmMjkVumhayoVfdKyh7yJ/GqEUJo/Vx9dicyQz2QVGP3GgT4wpgzedLWjzGahMVHTCXWLqYNqV796IhTJVAG3LFAdLoI/F1oXFseq+7c/MMMAbCGHkN79hJtieLG+4iSfncaYQ2LMaRn56nA8iWaWHNlVsCF/piaIU1qUAJ/NDGAFkta0BzeXe32JBwR+IZaqdJm2QTdDnHqqCVtfpZBA70sfhfIoSRwX3pkEkABNFEp/f/7ti83lfURAjpiMvI/dCUFoOGhX0k6qX8oXV+r37CZCJh8L4LTyZpJBuxsVg8MBi4qGMz3h5IKJMdRQVInOLprl06odvwlzGJhcnGwsqsEq7vd53nAHkInc4ikBdkvWXSYvrb8pHVotJplwpaOn821RKRotlH//ci3OXk/ J2Hy1svH /qYfV/+hn50/k4c8mfCYAfE42xa3ynHV9aWl/bq15KUecFQvBRK4MLZTvxTJTFeqNGBGW75hdGiHzyFFn5xxbhby4GyFWIGUvM+XZSMyX5qEbwEiIdrGRHOy1cl088cDat+l75hp+ZqIKz1EmeBOPWUE9rgaOtfqCCJIIOBd/2UbqtYe3dcQ+kPRRfuBjwMFWYFvJRxEmaZ/3NnIRDVF1gOb8ChpF0L9SYtPrjYGH+HrCemaRfxaiKUeVefjCKdeQ9JmzoW58dh1u18FMcA7JTqWOKC6dIOBg+zvSs9f8qr0hHt+FqXilhFfB6gSQuVCOhgHzTyyJnXZsEyfXBk93uSLXJpvgmfH+QntPYfKwYGPLnXWCaDYNyBrKqSViSdA9gIEJGKUqBDACgv2tHdkh9fKkJJSVkrCxDICf 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: File systems call dax_break_mapping() prior to reallocating file system blocks to ensure the page is not undergoing any DMA or other accesses. Generally this is needed when a file is truncated to ensure that if a block is reallocated nothing is writing to it. However filesystems currently don't call this when an FS DAX inode is evicted. This can cause problems when the file system is unmounted as a page can continue to be under going DMA or other remote access after unmount. This means if the file system is remounted any truncate or other operation which requires the underlying file system block to be freed will not wait for the remote access to complete. Therefore a busy block may be reallocated to a new file leading to corruption. Signed-off-by: Alistair Popple --- Changes for v7: - Don't take locks during inode eviction as suggested by Darrick and therefore remove the callback for dax_break_mapping_uninterruptible(). - Use common definition of dax_page_is_idle(). - Fixed smatch suggestion in dax_break_mapping_uninterruptible(). - Rename dax_break_mapping_uninterruptible() to dax_break_layout_final() as suggested by Dan. Changes for v5: - Don't wait for pages to be idle in non-DAX mappings --- fs/dax.c | 27 +++++++++++++++++++++++++++ fs/ext4/inode.c | 2 ++ fs/xfs/xfs_super.c | 12 ++++++++++++ include/linux/dax.h | 5 +++++ 4 files changed, 46 insertions(+) diff --git a/fs/dax.c b/fs/dax.c index 39f1dc0..9c28eb3 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -883,6 +883,13 @@ static int wait_page_idle(struct page *page, TASK_INTERRUPTIBLE, 0, 0, cb(inode)); } +static void wait_page_idle_uninterruptible(struct page *page, + struct inode *inode) +{ + ___wait_var_event(page, dax_page_is_idle(page), + TASK_UNINTERRUPTIBLE, 0, 0, schedule()); +} + /* * Unmaps the inode and waits for any DMA to complete prior to deleting the * DAX mapping entries for the range. @@ -918,6 +925,26 @@ int dax_break_layout(struct inode *inode, loff_t start, loff_t end, } EXPORT_SYMBOL_GPL(dax_break_layout); +void dax_break_layout_final(struct inode *inode) +{ + struct page *page; + + if (!dax_mapping(inode->i_mapping)) + return; + + do { + page = dax_layout_busy_page_range(inode->i_mapping, 0, + LLONG_MAX); + if (!page) + break; + + wait_page_idle_uninterruptible(page, inode); + } while (true); + + dax_delete_mapping_range(inode->i_mapping, 0, LLONG_MAX); +} +EXPORT_SYMBOL_GPL(dax_break_layout_final); + /* * Invalidate DAX entry if it is clean. */ diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 2342bac..3cc8da6 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -181,6 +181,8 @@ void ext4_evict_inode(struct inode *inode) trace_ext4_evict_inode(inode); + dax_break_layout_final(inode); + if (EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL) ext4_evict_ea_inode(inode); if (inode->i_nlink) { diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index d92d7a0..22abe0e 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -751,6 +751,17 @@ xfs_fs_drop_inode( return generic_drop_inode(inode); } +STATIC void +xfs_fs_evict_inode( + struct inode *inode) +{ + if (IS_DAX(inode)) + dax_break_layout_final(inode); + + truncate_inode_pages_final(&inode->i_data); + clear_inode(inode); +} + static void xfs_mount_free( struct xfs_mount *mp) @@ -1215,6 +1226,7 @@ static const struct super_operations xfs_super_operations = { .destroy_inode = xfs_fs_destroy_inode, .dirty_inode = xfs_fs_dirty_inode, .drop_inode = xfs_fs_drop_inode, + .evict_inode = xfs_fs_evict_inode, .put_super = xfs_fs_put_super, .sync_fs = xfs_fs_sync_fs, .freeze_fs = xfs_fs_freeze, diff --git a/include/linux/dax.h b/include/linux/dax.h index 2fbb262..2333c30 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -232,6 +232,10 @@ static inline int __must_check dax_break_layout(struct inode *inode, { return 0; } + +static inline void dax_break_layout_final(struct inode *inode) +{ +} #endif bool dax_alive(struct dax_device *dax_dev); @@ -266,6 +270,7 @@ static inline int __must_check dax_break_layout_inode(struct inode *inode, { return dax_break_layout(inode, 0, LLONG_MAX, cb); } +void dax_break_layout_final(struct inode *inode); int dax_dedupe_file_range_compare(struct inode *src, loff_t srcoff, struct inode *dest, loff_t destoff, loff_t len, bool *is_same, From patchwork Tue Feb 4 22:48:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960096 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EAADC02193 for ; Tue, 4 Feb 2025 22:50:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCC35280004; Tue, 4 Feb 2025 17:50:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B7C4E280001; Tue, 4 Feb 2025 17:50:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90BC2280004; Tue, 4 Feb 2025 17:50:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 76021280001 for ; Tue, 4 Feb 2025 17:50:31 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2D732C044C for ; Tue, 4 Feb 2025 22:50:31 +0000 (UTC) X-FDA: 83083757862.02.F1990E5 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2088.outbound.protection.outlook.com [40.107.237.88]) by imf06.hostedemail.com (Postfix) with ESMTP id 6DFC518000D for ; Tue, 4 Feb 2025 22:50:28 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=coQbm4Hh; spf=pass (imf06.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.88 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709428; 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=Zg560wvl1Mx/lUDQ5xPCIbLEvq3tfowlq6KuG94pc1A=; b=K5HQYeyvaEo/VghCHcGx/ioT2rFu4wkESC+xiPtFJ6LpIWaS50KjYaW7NrIFZPy0fWfrOs j9Z0FXB+b8XpV08pAW5ictGejsMlk64yWRlMbO8GM/oTXDmGlm/vssL4Vm6sO7H85QzNli T5ltR/zkCykcv/C4TpGQ4VzXeov8sLE= ARC-Authentication-Results: i=2; imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=coQbm4Hh; spf=pass (imf06.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.88 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709428; a=rsa-sha256; cv=pass; b=gszizxOh6Jk62XzKG34W0w5WLckS16E5fDi7j/gVi819BLXzvgY8zGUFbhko34+c9geRTF XzP0dqyOzZkD/ZkMVacoDojxZaMDliFZ4j7T80/FGMHlmff7+3GG0e5+lQZFxl1V68kvWQ 7fHZgfDxVzPF6EfptRhKII2k1lS5XqQ= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dWkPnd1mUAu6wgua3NKPqjCGidih9Ce/ZcqMhY1Tjsbcn47LPJxaSHJjWoSZ8aTCPOIYxq/WPUwXJJ8lmVXp/+/gbjuKUKAOxNUG7HCODm6LuFph2rw/RltF0co1P9rOaSruHKgs91YPMU21wFtTTET8r02PUBzIFwWI4bgQ8gemPRklo9r4sdAfzvqrjTKBuFSELeuZEppiSLFmCCS+Xma76KaHWg3Tt3IVwNm6PKN+liNNtrUDvwCcJokG+2SAwNagQKBykYlVHbe0DS0jG85sreygDHCT8nVItOj50IRifJ2NU+PlqXZ5Bzo5R86rLh98wBkJPARxpyMhmL3z0w== 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=Zg560wvl1Mx/lUDQ5xPCIbLEvq3tfowlq6KuG94pc1A=; b=k6kpiQ8qUMGDQRrxi3Dg0rthNk7Una9s8SQTDwQEsE/+5KE/wvubvDHSg9NkS2gYZdgWvCvlY2pKK0WQwAyPXZiF7DGKcGWgLRz9fYg7gygQWL6weQvDKXV146c+HKGumm0OFMNYwJmwVq1eB2fAreNFsEAEWYkVnkg8WfPosVvPaz9Hllc4qE1Hp04rptDulPs5tbv67mGxql2RgJTouqTllejTvjSqXlidJr+f5pRmvEBIFDs3Ap5aAb3LIQDpQYKAG9O/tzb4K76pqBFc3U8M5GwvJ92hNBJu8oDGaSF5E/GWxlX8t5+xwyxZTzpPKv4axngvFP6+9UQjmzky6g== 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=Zg560wvl1Mx/lUDQ5xPCIbLEvq3tfowlq6KuG94pc1A=; b=coQbm4HhxE6SxCW+LZW1aNoiP5/HxsEPe6k5/46v2RZeHimgGMQr7sJ8ZV8o1SMqaVHYHQua01PN/CfeSKQZ0vIImdqJDLsBP8YExv+/dG9Cp3fY5mM6cGxwMFgVr7yz8dSS3lh/Jawga/vO527aTgPBgR7yzJ56Zi+oeem/8m3ooksfVhHFDUSYmxVLAdhBtSu07oQcV6eMpAlRprlAa6VwGkL0vsMX5bQAHEGqwt20BbLjWP5UgOEAz9rXMIkhCDoTU/S62+eqWcTVljjrialKO2xQTOsGVfUZqks7CCLCQp3nN2uEue+yh0H+yUEGcQJUuAhC6nQJ5RZ5hQDX2A== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:14 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:14 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 08/20] fs/dax: Remove PAGE_MAPPING_DAX_SHARED mapping flag Date: Wed, 5 Feb 2025 09:48:05 +1100 Message-ID: <43ec2089396e367fda2835c27717604b9bafe880.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P300CA0055.AUSP300.PROD.OUTLOOK.COM (2603:10c6:10:1fe::10) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: a0b19395-5de9-4120-e54e-08dd456e261c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: qPoPk0Vn3IyBhbeVkOMceUa4kfaDHOOR98GrqmXyT2QW4FahkUdPptwnIc10L4VJNPXXAndu+DlFhL40omKa1pKTDXm/dA21j2YAk6+uDg4BD4uM3d6K4fn8l3B4qzjjqkc/yFgbcFKsnrufaTkjNPJT7W2MDmQqP5tYJEjEn9CU8Cl0Mkhskp1DTmqCGrJEXToxe+QGSb05Pol1buo+HBOH9WgZMhRyvAX205P0fIP7ZQrcDTEbhG8MRvkobV7L9TyuZ4wk5mS5BFDzxPWoG5XLFTBOU6Asu05HU7ycg0+PeAeFbDj3A9YnF686yW2BgvFTOcn3qOSKzWz2+cdgyRFIDzV0/dnuBl1NmaI10hBM0avVlk8dtnY6Ri2GFNilNvmyQwe+aFZAzQSMETSksa1r1GNwk1oPYn6XJCedJnHPTotw6uYfulIAh7g9jC4UdDYnghUsUpGl43f557ZfmDz4g59rXwIp1gPrdG72sixGVOOpyElQS3Psvi8Nip5rXLriXob0iAi3v1UNh7QLO1skl8AIVR84SjQdaLMO1Wnzdt7WZ4AAgLdSltrU0uCEckH8MHVOjTRvunKeBppzm5wZCZkvCqonuonrKmZLsUcYPkrJ9mMHvk9K4ZGXcJUWQmtTF5TMK6Kwr6VTN3ls52WdI3z1icrdR4UcTinLu9AiV+fjMxGoNKybO4LUOol8yrJp5YYLVBIY4DsrsDmw3radA+FlY22LcQK2YQMQzgtY1O0qHZRVm6zlJE1FsSIZRcpdErA8UKy6CAEE6fiPo+5VNax9ARvBQqDwcf417y90qxQv6h5OLyTQ75M2dBRdx/qse3VxDagZILmbAvK8oLVKl9bMtGp9mSy6fzG0hwnj2VmoREIt0OkpCxdAKy7s8RG6E9n0KAwXDTYr7G6SPeFs8k4W11/9kKNJPV+pgdLjCq0GUBxAhhcjATWnKdqEDqRdcOMd4xbhzz3Bij0KqR8WreMoHntrHrgDmcO0funTiaeJLbxu2kg23boCT1hknlAYY6ZoGJEaRsz2PdYJoEl8VLBr2G/GC6RIpsmCrtOoq8RMiZ96+kI+MvGCielutbbTwKxxSLhxx4DAjZ7DZLOMCHuty3ydzPhKHnLRcG2jKrP5nk/dsYv6zgyzMRgllXjucCZQutxoD/KE2emD4z3mPektNC7CYpAhHoNTkemMuSKFaPVxCXxF66Np91HA7n8Eafny0e4UWHAWNSbY6B4xpZYg3CdzSLxiPdN89+LVU6mFyicFEAId4xQaTJQqEHf3bxrjFs+1GLjEm62mZ0oCD/e5wx65eZ1VsVJHwhmpdhBsDVBDB3S1HDkoA2h6VeN13yZf30ePuuIQGnnviAd3IHr+i/kzLCmYShhtJVcRp6A8dxhhuHKk2v4ixyHU X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dhYGv4IfmoOtIfujtbHUeTNYYpGhzDrN0S4zn7QdYJcf1lZNuOIVUBe/9XuLq7Mfk6Aa2Bi04begTJuOUZQ3UyHJ74GA71dfYAxgykZZgsOxdIKdKXh9LXhNEJDb7E5Hc3rLF9FpEQWeoPbeCywLKHvigKC+onH2aHCZVHdDhmNlHmCOIqDIJoYToL92aH4ypShe7uihlYngOmdtRyZDff/G8Cu08qSrbdI02QJlHVdBp6ngTZfZ8Pm2y9K0GAOBXlJEkM3/WdtzXCU+PguNc1bdgrr8KL9/FYbXoQkGprP9olBXma/8ymkxs0vc84unMbUQbjH6ADm18b/qktUGaS6Lh/RYq5N+WVMil+mmHsTFmBaIzeWoG8cqjJiIyx5swPxS9dHOMgJZ8OcGBUe5Kw34YRA+BBc/3c+IimpYLn7aqVCkizWwOF3HtjoDGnOuKlfbFxJHKGjYNQdG58vFIJT+UkNLP1e1J9M2hsifBol/fqWiGdDGuAdgpCvoIkhZwcuSvBthLOp8NZyXVP6OPtlC+N4o7Zdx2X14IxR0vNUyKbQgQUfkRXYMMMQM+Zl8xAvFVN22tOaFXpnw0UfJxXN5B7ggOJZVzUDGI3ft00K995chH2aW4YtCBFQl36WwOHPibmyfp/ec9oVFgdlpjBZk+TsTzewVNlyXfsw9AuIqN8ya0HABJvxCShUgUYpFq/9CbCKMwcszRJkjcaVvfou9v64ShuQpGN0GlsUpkrY793VPwsOULBKZ8bx0ANky0odMGZqAx2Q1AzXnBxh70UU+/PEgIqjogOeA84WpkO19Ydb1k4Q3jsYHzAANk9WphLvx30DoDZMZgmZGOMYnzzgvyJNu3aDFIzwkk7eBA9IqGZWuReHqgRMEWgknNevw+F3QSLnLXMR5UB/j6NTTKD4Rbxf44CstqLqWW2Tw6VaOCBiqi3j/OR5H8aAM/XKdu2tO6yvIzHTp4CT26SB7+ewnvhe7brcH+K+90XmMAyyeCfmZ72nIzt4jAU/fH99m2BUoURokxpE01W74DMzmFvTA7uql4PHgRDdJOsee8uBs6bt6a1nw0f1qL5tsDtr6lTDI8BulbMgNApMBbPtf1b9bdX+BmJjRo3N1QJEVwusNHfEuvtOcW91c8NU1JJ3exnNZWLmuD6HBnT+vKOc/l8tiUEvG68SUwjxO+IiR3k2WSNk94nhGjOpswQs0RPMsUIuNl5Ncse/4W+x/F3RQbDhi9lLbS4IWN1i4FObbW0tjWH8pB3S+IjEcm3m7Gb03xvKvUOGhbjUkFNH61f9OQxbcSnnSS0f6mSYJc3MLMmBlSbOMwLrwxBhXUMQS4zT9/uwjHTpKIPIjKgChYnMhs1XMeQyVUC+mm0nTrif3/ryvaliThdM4M+K5SEGdXKmYxf+y0ygzikh6h2HePYaXeCMmNYLczI2GffS4q76HzShkJy+dZrLtYYdKesP4gevW6JucXp6D4/GJ9yjJmDYcA5unYhj5+EIGSlMJYtwe2NLDY/x3tN/ZcYi9GGrPsLMiI2Qmm2pRzmhVyjvtQJWecYDhsnwREfqN8lRGvi/mdC48uzr+dMOIE1/P9ZajGG/Y X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0b19395-5de9-4120-e54e-08dd456e261c X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:14.7617 (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: 5WluYl+zvbUG9mYMES4O1ugJrT6/QkNiR+yvAbWa/cS19XF55zrXgKCz8mWOL8L9r+pEwamN0DEuJS7MGuhnRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 6DFC518000D X-Stat-Signature: sj6kzdogjkg5xhjk8ebnmsx781cnusa7 X-Rspam-User: X-HE-Tag: 1738709428-854648 X-HE-Meta: U2FsdGVkX1/DpRcQGKT6D90+HB2O79KfOK7nY/eoGTi8V+8RghJOM08DyK+WPrJbgPR4n5DkVnrNoib2dLSYkcEJ1DHiB9CA31xysBAKuA1ha7AGnaKjVkDL8A4/GsEJ3iUJro3JOMkHeO8a64tMRM1ZDZujrhbKdVxdPSMTo/bd0tmfvl2NR18Ba9I9RftzAbzFAPy3X0NFvHbMbgHoCAue4uNwLcuP96j7W9wyOIdpr3339MWka+NXqhQ3dkkbRfSZ/rXy6015j1FWALY2TUaOElF2EQZkRi4lym+ri7nWfif27cnDJU3qvv3Y30+GVEz6zYFJXMqsn897l6bMU3hiZJY+GphSiwA8yBk7EPKjwa9EBrFjkrdFUUdoeB8+4Y7FA2mKOFCBucL/+cTbX55f4f67xPrpLWLMBMhBLFULuS2/lswPZLu4suPBUhFV05VPoccyz7fF5xhD0LEkGyecTpaybmQiAheHCWShrQYASD5CTznutP+qZzaE4cGhE36zGL23sxM7MZ9lN6/Csp/+GXBrQgRPDGHXnHOOFaQuaO7CAZOBc351D1xH2dv5ns6zaOSH2yw5Yb5ozjXAhJ3YVd5tC3sZK8XHUYemFDR89HOfS/GGIQ+CLLmCp+B+if9SbVFNrU9l6F8TfK6hwaHW9MHd7qFyuJG6wqnNEEzxUOlIwL9NRxIqn7KLM3d1/5uxt6UqhNQT4s+zgWVetMOMJQ7ejB7ewu/piYf+GbzqXiutGUUqsh9zjOriSAY+7qq2G7ry/px66STIqzPmDxSa8buv/hLM+ThCmjT478KFRd0pDGrq8Exu5KIXAuqmEI8Tld1CEOPe9SyLcyhNmk2yNNZbFozOIlTUezdeRs0kAz+FHC9Y8hfYAh1Au2r0bnah7kEEmiGcTrBGOgWroDNbZiEWxwgJOUXDyZ5wsVXhjsRLrP+KQYtvBNsYYZbL8n9P+vafKy/DtmU2MuX NcHmv5Hd F3rjDfPekfDR4tjPePKo0YDPkFV5IQD+xGcx3lP8NiapqMGLUiIUbquS5ibrLZ6E36URf/vCK9kXQc/ByDy+EXpbiAvdshCmuAs7fYgw4WSrbZ6x29ZrCY/tweKsSad2WydEamiIBxRSRgZ6Rd0PzMHk3lSgQt7NfgMegAFuYxcDke5+KETW/dgMOJ6g+hYq7a1YmPMp/z4KrXmVQkLCBz2gtds986AxVs4wkf4VN4Y40X5NZlHZQTI4mSUNpmzNuhxH6XUR4lCZYlaH1HCim1NruAsgeP1O5o3sAB9INA+5jHRhsYEksW5Ezd8rlEWGKtN3NSl/XbbB/q2jUvSUPZMta9uUlEA/u5nMuBIRPwD0u+ehuCoqMaTv2oqI5seIm5Nl1H5cjqvZBMTpgs5Pbm03zje5VJQLR/RGk3ty0DSX8+FoCuw7rU+htfjXUrcKRZkJRPkNAkPCth/ZadNXYJSSLjA== 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: The page ->mapping pointer can have magic values like PAGE_MAPPING_DAX_SHARED and PAGE_MAPPING_ANON for page owner specific usage. Currently PAGE_MAPPING_DAX_SHARED and PAGE_MAPPING_ANON alias to the same value. This isn't a problem because FS DAX pages are never seen by the anonymous mapping code and vice versa. However a future change will make FS DAX pages more like normal pages, so folio_test_anon() must not return true for a FS DAX page. We could explicitly test for a FS DAX page in folio_test_anon(), etc. however the PAGE_MAPPING_DAX_SHARED flag isn't actually needed. Instead we can use the page->mapping field to implicitly track the first mapping of a page. If page->mapping is non-NULL it implies the page is associated with a single mapping at page->index. If the page is associated with a second mapping clear page->mapping and set page->share to 1. This is possible because a shared mapping implies the file-system implements dax_holder_operations which makes the ->mapping and ->index, which is a union with ->share, unused. The page is considered shared when page->mapping == NULL and page->share > 0 or page->mapping != NULL, implying it is present in at least one address space. This also makes it easier for a future change to detect when a page is first mapped into an address space which requires special handling. Signed-off-by: Alistair Popple --- Changes for v7: - Fix for checking when creating a shared mapping in dax_associate_entry. - Remove dax_page_share_get(). - Add dax_page_make_shared(). --- fs/dax.c | 55 ++++++++++++++++++++++++--------------- include/linux/page-flags.h | 6 +---- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 9c28eb3..1128a0d 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -351,39 +351,48 @@ static unsigned long dax_end_pfn(void *entry) for (pfn = dax_to_pfn(entry); \ pfn < dax_end_pfn(entry); pfn++) +/* + * A DAX page is considered shared if it has no mapping set and ->share (which + * shares the ->index field) is non-zero. Note this may return false even if the + * page is shared between multiple files but has not yet actually been mapped + * into multiple address spaces. + */ static inline bool dax_page_is_shared(struct page *page) { - return page->mapping == PAGE_MAPPING_DAX_SHARED; + return !page->mapping && page->share; } /* - * Set the page->mapping with PAGE_MAPPING_DAX_SHARED flag, increase the - * refcount. + * When it is called by dax_insert_entry(), the shared flag will indicate + * whether this entry is shared by multiple files. If the page has not + * previously been associated with any mappings the ->mapping and ->index + * fields will be set. If it has already been associated with a mapping + * the mapping will be cleared and the share count set. It's then up to + * reverse map users like memory_failure() to call back into the filesystem to + * recover ->mapping and ->index information. For example by implementing + * dax_holder_operations. */ -static inline void dax_page_share_get(struct page *page) +static void dax_page_make_shared(struct page *page) { - if (page->mapping != PAGE_MAPPING_DAX_SHARED) { - /* - * Reset the index if the page was already mapped - * regularly before. - */ - if (page->mapping) - page->share = 1; - page->mapping = PAGE_MAPPING_DAX_SHARED; - } - page->share++; + /* + * page is not currently shared so mark it as shared by clearing + * page->mapping. + */ + page->mapping = NULL; + + /* + * page has previously been mapped into one address space so set the + * share count. + */ + page->share = 1; } static inline unsigned long dax_page_share_put(struct page *page) { + WARN_ON_ONCE(!page->share); return --page->share; } -/* - * When it is called in dax_insert_entry(), the shared flag will indicate that - * whether this entry is shared by multiple files. If so, set the page->mapping - * PAGE_MAPPING_DAX_SHARED, and use page->share as refcount. - */ static void dax_associate_entry(void *entry, struct address_space *mapping, struct vm_area_struct *vma, unsigned long address, bool shared) { @@ -397,8 +406,12 @@ static void dax_associate_entry(void *entry, struct address_space *mapping, for_each_mapped_pfn(entry, pfn) { struct page *page = pfn_to_page(pfn); - if (shared) { - dax_page_share_get(page); + if (shared && (page->mapping || page->share)) { + if (page->mapping) + dax_page_make_shared(page); + + WARN_ON_ONCE(!page->share); + page->share++; } else { WARN_ON_ONCE(page->mapping); page->mapping = mapping; diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 36d2835..cab382b 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -673,12 +673,6 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted) #define PAGE_MAPPING_KSM (PAGE_MAPPING_ANON | PAGE_MAPPING_MOVABLE) #define PAGE_MAPPING_FLAGS (PAGE_MAPPING_ANON | PAGE_MAPPING_MOVABLE) -/* - * Different with flags above, this flag is used only for fsdax mode. It - * indicates that this page->mapping is now under reflink case. - */ -#define PAGE_MAPPING_DAX_SHARED ((void *)0x1) - static __always_inline bool folio_mapping_flags(const struct folio *folio) { return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) != 0; From patchwork Tue Feb 4 22:48:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960097 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0489BC02194 for ; Tue, 4 Feb 2025 22:50:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8771B280005; Tue, 4 Feb 2025 17:50:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8203B280001; Tue, 4 Feb 2025 17:50:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 64C28280005; Tue, 4 Feb 2025 17:50:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 41087280001 for ; Tue, 4 Feb 2025 17:50:43 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C45431C71EF for ; Tue, 4 Feb 2025 22:50:42 +0000 (UTC) X-FDA: 83083758324.15.2E16A35 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2044.outbound.protection.outlook.com [40.107.243.44]) by imf11.hostedemail.com (Postfix) with ESMTP id 0FFAA4000A for ; Tue, 4 Feb 2025 22:50:39 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=QhEG3U5D; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf11.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.44 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709440; 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=EN3974zWoQ1cF95sfJnVzGIZi2NU/qvevfsejO7+b0o=; b=luLSPztZvWrv7zdiU8qSOz2Yd6L8zMN0xOkxpUjm0cqnWKq+sZ0/d7xyJxOksO074ijx96 HhtgMAepS72T0IH4PoiTO2uYfHeG3/dD3CuI/QMbdBj9X77ZcD2m87N8x0fyaK57dubzLF NxYchYIWWWJoK/KLBpt3DHZx/BP1qy8= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709440; a=rsa-sha256; cv=pass; b=j/SZ64XOrYC2outERaAcKxSMC5inv3sIeL5A0Uet1LVC/fAvyPBfj4uBgz8ZRuo+bUSnto hHh4OokIrYRE+QvWSMbHC6M0lroMVudaKh7/0npsfplYPKCG7lDIET8Cy3DkDOQqVmvYNJ LbO+pu53KyimfUQmraGCI3cA1IsN8MA= ARC-Authentication-Results: i=2; imf11.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=QhEG3U5D; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf11.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.44 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aIb8upzgBc53rCsK6rOIxhSdc9WRKwYsIZCGmvXmU3Kxee/c04DCRTiHlqSTHczZn0WVBzw2tRwy+n7cVm+etMzMXCE2sWcxKIdtE2Nj15e78Bk4BLek1f7/f/KGLCWuPmhQJ4mh2c8rU3SbvM1hJBK5kh7oSdIgGIbMivd9n+5mdfRNZBJ84URZsvENql5Lf8CzHw+8aNYoiUEDkdqCkPtJXVFliXax72Y3aLGD8SKMgvnYXYvEu8hPoI+oKtWrDUZYF+1z7K7O1ZBLhgWo1RR89Ea/ZEZITekHd4jbIEjWEe0rcvcTSlU9O4pXdFwS7GsSfhBI5qTPbT+v02wDEA== 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=EN3974zWoQ1cF95sfJnVzGIZi2NU/qvevfsejO7+b0o=; b=ozn+K+fGDXU2cPqet86OvHsSZhvRXELYQTK/qU05/KD53zesOV9F2h9zgIN+5RfTEUY09H88GAmi+0Uog7LSC7i91LpsBF9gk4ye9rHgygc+Y2QD9LGpmRUZfStQzFehEugdd65Ey/+KyeROoims88xh8afRf0T8XonzR3o4apKtbh0KNgIvpFWvhP7njHTLcphcJPbEQ3OnTe/nTqGiIvvMmZURGBdQYvEu+T+/0zGExsK7E8YnsU2hQdI/jicr/lSUVzZptERIEMMHIgVByy8e29wL+9AqVA+1iREcxF4VshZcSmi6oP/8xydcVBmRIQ5y9kzmlDSddAMLzr+8MA== 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=EN3974zWoQ1cF95sfJnVzGIZi2NU/qvevfsejO7+b0o=; b=QhEG3U5DyGzr4W/XrcF6HP5MKa6mLEvli4hqcPJA1oG43sbALeZlNAXJKAOMr7DH9kFIdjLMtsLK00vNoyfcc2UoWQDpLFLr8Rz062GxHim8mcno+enEFz1957UZhdOSIa0LnjNND7SGfy4w4GqVqnh8eN1j61iq/cmfJIOSqD1HBnrDKdenje846IBS5XFwAQdktB+0gfQ7ejbVWL3PsUrcAv9WCtD92u7J3XkX7LzcNlBFH0aTSmL+m3MND/XG6UhfIizbi7D6J85d4E5GQxFSNnyQF5Rl5WbOJyb8bPgbfXpcdK3ljJjB0kjHh+kCHVFE4J5+Z4YtcRc15gZNxQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:19 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:19 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev, Jason Gunthorpe Subject: [PATCH v7 09/20] mm/gup: Remove redundant check for PCI P2PDMA page Date: Wed, 5 Feb 2025 09:48:06 +1100 Message-ID: <94d782acbb52a35f15fd6738992bdcc3ff11872c.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY0PR01CA0002.ausprd01.prod.outlook.com (2603:10c6:10:1bb::6) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: b5d44e31-5da8-493d-d5b9-08dd456e28dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: kJVl8mKc58bGkweJ2PoqYUVLMEgWkbTa4h/ScGB6s66597ZnAZAw1ObNbusohPaoyqUUDx/blXJBygpGXtQlFuHSAowyPohcQ4IqNHQYVo03xfnXqB6/vwG0Bw/AhlU3+1aN/qJqrzCGICyFz8IyBiUc3YbzoRPRVjmhN2uN2so993g97mYGJtoyh4QGxH2bV3fpH2ds7uUEX6YnLPW/sPZXt/VFS9f2s6E3t22tqeuzF7FNdSwFSswGH9SK9X28ZceQfJHh+Mm5g09D0m92ASzEmyBG41pS8t2erh0Xcj0rDfgS11c7Jw+H6i6eBy7HFjw3ihNFAreMR9+ARMH+llUZ7X2qUW9jQwxFKkpxJeMTNFNGRb0qhbp3fTUP2LoKwU5D7CMR0Dd/ywx/fwg7AUyiojr17Nml/BZuok9fatH62itwsinEnqcfSYa+gRh+A+i5YY07BDHaLAo//hDp1ONnmSbNsumNH0eEtWNAom7qx0nVYfkZbl9bLofmQXVNkgV6EDiV/jmP3uc8KIOd3nRGc/kymg9+zBvQ2y/QlY9zGOeZv4eMyfpDzQ/e1GDL4C2iV3CpePaT7qhZ/d8i+75umw3xQ2R7LaO5S9YBOQZuNhYtLdj6CaPjG/dcDQP9rPK4GUx5YPYP3L5CP1GvapQZMP7bA4x6dXke5eoQ4R99l/bEbZrp70AIbZoXrzXXFd4bw7H3sWTVCuf9dcdfZ1aM0fetC+eaXDkUURwyC8x3En6HShdMUvXZU3U7UfsWHjl3EqqYT0biH7iNUx7bbgwvzohGvKN+z5LqztrkGyTo3i849w+B6G21DGBSbW27jtYFGPzCc0a4LS5cWBNZ/Q7P/u1yQtAnNLGZVmJk286jiO/MAW8E0fUUsLN9Nj4N3GvOkNQ9BZcj+QIHGNcojwdCke0bSygysNTFVtcfX3Su8U+/EXMkgK/eWzzLWuZfNUYT71TiXIu0/Pt7q+vaMCmocCJDP+aAhX1DSNbrDQu92Ed8Vax2B5uwnuG0BfGmP+lXMzo1ZkFzyFHZJak0d5rr5mkmHZ9WzR7H1YKOJuu91tAZjVx4ftCTnt26XLnb/akMHw5Xyz5yYBcK3RpvA7f4QwSjDYhwUKSgb0i9oy3dskRtwC5vGV76tbQqYZBjRWSJu2R61xpF23CB4s94e4+5qgraRB9YSN+wSoUgNNu9mhvmEPGMt1g6qx9FIO+dhG/+as05hpkDIHK6QjnSbi59rqqXzc1O7tzJmk/OMjiIgadPr+Zc/GPPF8HHTMXgpKKpThuvuZjqiYMIirRj17Is9dc0mqgQK1IT4FLEmY7oBGeP9PtTiCgTbYN1H1j5n8WuOotDTtPhZwIID5GrSY68bQ+tFPAGfEJ5um1aVcUPBYzNjwFiyADJ4O8QjHid X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 50dh3zVZGQoAi7aOvtzpVo9n9z1wVZlSoFU2/S1Hjez6iA1HUwUDtdKHX1zcRnJUeH1QCKWi0Nd/DbQKPW6E+zSAIFR+3KmECSM7jY/6OLpqtabU1WCVGWwmJSERHTP7RnG9rlQ5SGNDFoCS5uojzwA2y5pYe8wSgCYvVUV3FxLTl9pYTzlCYLzg5VY5Q8LvdqSo8DXYqfvEuRVt1H3Ws/v/4V1IAnr9QhJw6hzrIZP/h5kYFlYaocUNohoN1wuZYFtbE/7i+oe2hwy9X+lZ4dh/FYQWm7sH775fDbUia+se20S+jengw4vSaJg0hgmbWP/jDScHy99FHtdX25q5xNQrzol3xJ8YJLXS0XrEBC7r5M0tvHlYSvkZ399e+jdQxze5VVqct5oatYK8cOFPSlaFvCB28ZXb508MsvaDxcco/ploGLi0HrG/M5NLHX+eozBjhNu0DE62w1tXA3b9mYUTmmJk3FUcAZMYlZPQUjkF/Ilrn02G0ETwTLFXYY8d15ZoiABCpLPmeC3JJysKZIfyN84ZPvxkj0CmTq/+BSj3NqBJjvLM76mBmh3wRa+IJIKqFGhWY3aH5ha2hFBaP5ZEJvtINoD4zFsafE51WrJSM1GbhKJ1RkyySWjxOzT0mZMH9IOw87HZhXmMuq7s3RK14vHPF5njNuGEgDXLPD7KEXVxKVY4D9DAv9Bm+t21IXeSWP2a98jhKvrDQTtyP5y+mtnEnqq35qOaXaesug43EhlqFPhPUbsYEon/ydrzipWHRAbcv39/GaHsB7afu45ABc8o08MFHHWOVQE3SdlRrNGVfZaqGfKFG1OEUPs/48bv4xKt0UjbwjAKB1SoxHy7aUNYfuqtv2ewAi/qDSPJDhN/ipMfFvGzFsOFgFwjRLSo1+Mjq605NfXeFFfmOtQgsPRokr2Iwp/FVxhGzxVDZnC9wQLcSIpYtfGUId66EdcxQApMp+qiksA/G2z24SfL/3U889uQ20NtCzj9AcuIEUOlVqNE1AOyEV4mDBPn5sp8ichLJ/3uVdhxmnYEDeUSDnOe0pf7K6c0/vRmk0adN1EBCqUaTQFuL6s7hVzOM+DaEJqy2SQXhp1KjhznQr7+dQ+Y001ou+X3aV1EuOO31u7fzlgATNgipQUM2AKukVum8DUrMhmRayNEmc/ykvOib9qfUQhakwG5SCUXVT9MdhRxky3uut3gCafbvI2nvXVIfboYTLRDr4XgHUdUjXlEbRZTxaHK8zAFlNlUz+YdsVMigFoCDrTUvETrY0tyWmd6a8lGcHAa1M9PSklu3w1B0l2Or2Agg4BMucnxtydeIqYKCgry2+5mSkomA2W7jbq3ExPjMOEbH0di+/VMQqwq89cr+AESt7Gl7WDVQaFuX4k7fsLkDiZ+0r1zMRdqYxjYT3QNPh19Y9pAgXWtOLLKgfsB77QJQvOjvwRTmNa81Ga/BEoakDhqhWTbIwn7cs3Rb/gavMTxwkeWqrABzYD+B3yUFmfPZnWEZj3PSJ3rQvSbczbcreNBqS+ukJ4ZS2GM2VNoonjj1sEgIw7tecHdbpzCHJa9sh5lG4qxIinaVNL7QhtVSymmV6ziuS2L X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5d44e31-5da8-493d-d5b9-08dd456e28dd X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:19.2060 (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: JHPp4zN/aMieY4pdIrX/njIOR8/eOSknt0x1CMV+iw5PUqExOOXmmZ2kd0zwxGuZcEGZzEhfY0QGlN4Gg2AHww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Stat-Signature: yzt7qfh7jwtqm7m7q1c7o7bup4eogfk8 X-Rspamd-Queue-Id: 0FFAA4000A X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738709439-298165 X-HE-Meta: U2FsdGVkX184owUfXWwlF1reYNcj+tQZT8snZIT4oobzilZTS3RJYbu9aE8NGgASBkDqIf65P//6wvmt1FA/s4GqrTawQQHlqZefPSwCu4xSRCu6GnxTU4VRRoHkDtnCCRiCdmoyrhSgjiagHI6sotWP/VomPC47Fxqq03tnJSUA+aHr6pPCvSB0XNQk2VDRMUkgO8410UldNrkmZ7XGRIl5F01yqq0dcXRLPC7bBZGv2ZdPKhf7i6+TBvQOQVlrZZT48F8JInlIINnSaLvJod3Bez6MX6usgXdjZaJMleFnhV0lzHbTn5UpNrOqvwr3FEiGg5TQ23m+GNCXPFhA5yFLwozkcY++Yy1XRYAfxOrSuFXoqBpPJIBBU2SPcAjjGW1gD0AEFKRbH+GJhhvqhKg6DibPzSePAxewIRUBGib2A4WjwpqSYjmU/Dk5hNhpJoQtxMt7xFm1uY55VZ+FWYPrDK71gHcvYuz6UmIrp33VahGIu8GajfcEIA5zDp15z5jwBx9BATJB+BSe89S7BMsVf7r239rAj5NNQNqfmJMtvEpc47n08/0rPj4f1iFzRh19u4sR8CoS9YBNZT4f9EMo9pQY7u8PJpC1Ruxqb5EdVUnajtGHSTDpSp8XS95yVaFslJpm5vTvw2WLuN505ZwLI+jt03JaKyoMvc4qRxQFzixO1Vwe06PtXRl+6fqRN2Wma2fe1p8vABgg/XFEarh+uYoxeTRpODviFlXG5NDCWRpwdutxktXrvyIi3fiakfu9T/DsRyg84J6dalQUc/K6C4f/Cm7s5FJoc0wE1nii5czqlOd7xacs5zxYSwP05AR0E282JAMoQYY1o3ntmBrcTwS8YCG8BLU8LyRggtUwP9UMLqN6H2vibDKHZIzM+2STfLlDuNX0DWKfUHolupbr3qMwglTlCPyIlAt/M5iqy742+GmaefbfIhDefHV2MgVXBAVMmpkY9zNpOiE iqyQ9Pt9 0+lSLNlfOgDHM2HditsYGRVuYpgt4LPo0LPN8fBGyDy2rcw2IZ0KOfJ0O2AYl72+sEibECYhKk9XH6/0X5dKZJXyDQkQpmuJ+xSTVGK08LtX9wYldcUNK5tHitu5ptT6Ozxa60+YbQ2BgvjS4mtVZjqFGxa6JozD01o5RmxTwJ5/6PC3KXFMNm2a2fkFxZsQW3vtwbkXsZuSXNj673Gds+jArxBeSTtbR4vPABWe5U4ARFbbsggTJ1+7GMRII4/8qQtHRHQU0UKBngSPpVw9R8vCOXIn2I/0gGInE93/lfUKOqPK3/QvZ01+v1RW5YIeyHZFrTSKmFTgl5tgMmrvBGjNpVUK2086zpJfruvLBpLB99581dC+fRhv7kOyoheUtzxK1GohWZjKrAte/JVpTHzW0RIhcZ5Zljqh/lFpNcfpcvmMrUATuVOnl09AqHSYoywH2Gpdx+cPfg9k= 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: PCI P2PDMA pages are not mapped with pXX_devmap PTEs therefore the check in __gup_device_huge() is redundant. Remove it Signed-off-by: Alistair Popple Reviewed-by: Jason Gunthorpe Reviewed-by: Dan Wiliams Acked-by: David Hildenbrand --- mm/gup.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 3883b30..10f1ddd 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3010,11 +3010,6 @@ static int gup_fast_devmap_leaf(unsigned long pfn, unsigned long addr, break; } - if (!(flags & FOLL_PCI_P2PDMA) && is_pci_p2pdma_page(page)) { - gup_fast_undo_dev_pagemap(nr, nr_start, flags, pages); - break; - } - folio = try_grab_folio_fast(page, 1, flags); if (!folio) { gup_fast_undo_dev_pagemap(nr, nr_start, flags, pages); From patchwork Tue Feb 4 22:48:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960098 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D724C02193 for ; Tue, 4 Feb 2025 22:50:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABCBA280006; Tue, 4 Feb 2025 17:50:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A6C77280001; Tue, 4 Feb 2025 17:50:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86F81280006; Tue, 4 Feb 2025 17:50:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 66600280001 for ; Tue, 4 Feb 2025 17:50:45 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2056D16046A for ; Tue, 4 Feb 2025 22:50:45 +0000 (UTC) X-FDA: 83083758450.08.0E9057E Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2046.outbound.protection.outlook.com [40.107.244.46]) by imf06.hostedemail.com (Postfix) with ESMTP id 36D20180002 for ; Tue, 4 Feb 2025 22:50:41 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=SxUjUeXC; spf=pass (imf06.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.46 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709442; 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=ejMa9kY4FLEzt1kGiLvnybwU63wJh3IrICfAQW+A2/A=; b=o8l3MbO8ej5FdqBQqdSi9qO/pDD7aeg4y4qWYi/wTf0FnVtCokCtciad6a7uey2R35ZgrG Kg+JvfIz8cw1lnGuMgUiv7fjFvxf+DaDaLkIRcfnK9EjcCY7vgfjBXGU7MstFsR9EUd6R8 rnLxPWE2uZnWWL0HvZR0mGAFLOWsuxE= ARC-Authentication-Results: i=2; imf06.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=SxUjUeXC; spf=pass (imf06.hostedemail.com: domain of apopple@nvidia.com designates 40.107.244.46 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709442; a=rsa-sha256; cv=pass; b=AcYVXr9FaFUiGFdd5o153EENrq03orAK3W3BrR64Kqubm76m52y2bxXynI+wXX6s5NurJd AO8hirV1kjGsTt60WbCvvISjS9VX2QVd5VQFYQgrZ9qfx2FZ6bjfYgknjaC9g27bBGmS2z PCwezNdowCeFdEaJhNtFn6sIYoCp93U= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KA6pstqnBz8KPcq4bHrfj4OQqpMq5SyvP+KuEWvM00c0uqxrXPbepG9YEvCCjS125ndEUIG5GPZXvJ++Yu0NlrirtNekgDhogcM+VnAsYPbLqFNagIq0OXmin0um0b4rvUSHlKY8mW1dDc1guTd3qHU1kb932WTztbU4mErCjiZIoAg6Q42UN9AJeRtw3ia24vpH3mJwqgNH+zBcXgii9mrcmJBCMjYB/8RvIk8kS7oyszdzQPI7/KEm9axaailgVYq263Xn+jegUkdYUzrAHHxduvpwu3fc2ZB3EKrbMLDf6yhqOS7H9fjUQQk6fSFarqSH0c0fEjU3ZX8qxbJkbQ== 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=ejMa9kY4FLEzt1kGiLvnybwU63wJh3IrICfAQW+A2/A=; b=ocjtj7FG6EwOArYQ6rRPkBr5eB1MxmxLc/PqyYLil+2pHkdWoMcgs3cs9gVQZ/1RJ1EGQB+Vuc5LfrrKK1isxIFbGLJFOtlUmucWnvrMiIy58bkTniPsQHcpcTDFcI1g1HsQexPDebj1zNQIBZniUTuQMzXFjp2Q4Er4iSirw+4u39nrRyQnFsE2CR4gdN9SkHr1osuVw5Zn/nVHV5xno/6QYamcYlsmOZ9fCy2o+U+gMPMPQJaLCDSuWV144uBYcjHQPkdIfI8sRKh8T/dX58Smb34rvhsECxsE6GEeRk70degPgBG3MOEMTHI26VJpf7zOq8C8PAY3Wpts/YVO8Q== 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=ejMa9kY4FLEzt1kGiLvnybwU63wJh3IrICfAQW+A2/A=; b=SxUjUeXCJpbbEKTS/gK720xO9723y3ye6czfLwXIdQ9IShtUdvPsFpj3HoufKk71GwtVixWjK6IAU0WleDWFQBnq9ucc7VpzY+LZsE2KudmgbdmLKc8jAMtFUzJJaHjeI4+0fX1zWfr0vS6nApFjLBHzeU7SUy7tUSYkhuJnPkgEgNSeRoGQG8LH6KjXTf/xIwai3qTwvr+aJh+8PMlnxWD+PmR6uU4nHX+tYOnGOmnsW4auuKstd0nfHcUidge8EhdP3gO75cTM6VhtJRM2t9X++wvxJn8XuH8CsD3XAZM7llxfP9opWTvDJ4uekglQrvRM18qRaYkt6KojGBd//Q== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:24 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:24 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 10/20] mm/mm_init: Move p2pdma page refcount initialisation to p2pdma Date: Wed, 5 Feb 2025 09:48:07 +1100 Message-ID: <10388bef4c6e71dea2536ae44ba304c7416456b7.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5PR01CA0074.ausprd01.prod.outlook.com (2603:10c6:10:1f4::18) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 692cdeab-83ed-4757-5376-08dd456e2b62 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: WsXk8tYqzJY3wKJaTLGTLb0NMVWIhoZUOZLbQdE0aHTEZxOMjBHdau9uKx4ZFb5ov0p01CNx1qe1xM8F0AAajtYqs4efVJZWP5ZBmIBEvXfXeaYP1cvd5HNz2PSp8aRAqD5l5JCgMp3Nm0Z/fGO6P+od0EJom5fyIwbdFeZcrvc1IN77RUAjKCqEo8kUnX1+y4T2GVcevLnKdClenEwY3cgm0hGQsbhrNkJortq1nzXN60AyFFiNg63vREzxi4MhLjjRWDsmEKeTZq6zCNyHWezNxvBPsiK/5hzINNqZUfBvOUTTfnnbBDMgSyUmWMRskwAvfKOilY7A0NffdkgZo2HDm4ngEOpKRLQcpOvo5n3I8/YCsJ+q0QQ+OOEKZ+4GI1VhAvP+n9KuZu18iWbawxv8gsm7M5y1cBSn4vl0CU2HeoY/JvnNWBe2A5Qitj3KXGokSBeL+x6ygsSX4bOhgwJfIGUTEtXrTs+UVj2Dow888k6jQQfJ7je3sAhOk9Qe790n9iV8XIwRd+XGHaXmxByh+L4IPa3AbMz2OHYpfFwspPQ0K/4NCzo7F8ZyNqXn21eQtzj1+r+TlZ7C3V6oFvWcRgrrAwM0l/irzEikKWgvEA6nB6YBRb8VNFzPy4qXPxv46rdk3+bwezQ9S72H6MGfWarur+gmKXY61nHyxA1+4lOh+Ne33lkqUpSszSf9NucrxR46uios2iH/f7LXOEL5QJgKyNWeJ8414ATUl4Ysk6A8BBteX71ILWe5WNLVKvnqMSdkXP78znoLng2Ioj6lFSQ70QqWP8lt4qCIlpWVbH/YUro0Xe9I32jAIFhjlxdjMak4cHTqbtlBLanbYVMdMJ54n/9RwGk+dtnCS4e0uEAYZ9z2fTSnNpaxaJo2NtLY2g55eJ9bS37VkixFZ2lp283u8JkKw0MOMen+b9xNHG5Ft4oBCyj7rah+clS5y0AnFlrpR/If9gT25rzf4hzFVllNAsXBUW/ryAuOXIMlTP43XkUNwc2HpUPrNF8KsQCzl4WaKI3EswL8Rh3KbSjy3CeCEERQuIy+5JNfa3XSUeXKPPNK6wAboNBF/nz+TfO5IXMAEKsmxMnzU46vD6q1K6JhnYXa/1hqhb5nQBxoEsvibFtS0LIy0dpL5vRBMm+IdhCjgywp5WVrBRi+5Be41Ja5PFhGupdwGi2nfmUf61s4J0s5WmRd5//0IVAwOx5BcsoXEJ0YoTfOdD3otWjR8YE/rkYBK2Y9/Yhk5qpGyWc/keb3JfZZVbc1YdYLYG7r5ynE3wMYnz3ltzzfry0DEotv//JqV4d1WtH36PUeN8TcY0S0QtEmWNw+imBuXgwidovqAU5dDfLpywE63qQW8Zt9qdFY1AjZwsf44E/lUc86Z8RVJBs/J6FO0F8o X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sX7jaKz+x7NjB2WVoAldLA85q/jdMWUIugXvBvgR4B+adnMlkA1silPBjq6aslypQc8XQ3My9NLlqhmH20h+RVMGMFVCnILpWQXxdqMuy3DC5JXXT4Aaef5i3hvyF/XJks1lEA0kL5nAaGhmwEZEj7x2/Fe4sdDv7w4+GYsiZt9vZweJzIdl4nZlpIusG/n50xrfdHYbF0e0gUYnRq3vZwHKRIAA6h0QFhyMo7BjW7sWlgumqRdvdR1Ki2x9nry7QrVhzYgdapY/pcudegva0dj50NK2OYo4+4zlD4CCQ3F+3MVp6h611rANYGsoQg3yNggNcjVgSofBZrfUKEZKeS7tHpVQ4ppA6lRsii8kU8KuUd1gPDwL12TwuMuP5JR+gAu4kaodxK3itk8OEl6+sdpU12OzV9LnygQKk62EVtMzNGlxDO8EU1cGhQvRokv50eC3qe69T0ZPPK4Q22WC1lqatOcAfJH5CgDum+5zyAL5X77F0gpCk97nGsR+Blf8XnK8AN0SNiTVvSQvZkJ3aKpSBVUPKe6thrC9p4YAGpDqQc2e5W/zNqaCe9ygIQpDcffKilGlMkzGgdBXfLNPlz7VTK/HVm2TaIkjyh1/c8jCAJizZLlEys+3VeszHPAiRhufOcu7y1ShIY2bUWPKrYirGf2GEbafrKFcWkzE0YVMmZkacQowgTCC/2H8IVXA05RRcSQgGTLCHXFx1xhqMR/T/+TPM1GqOFCMu525AjsewolcHJA2sUnZUz8ndayERW4U4xV3Hq/rKUW0eIWFGzF3KjNRu5IwU7fda38oi9cXTP4pGa3QONVb2J2kPe6oNbUiRQJHu52N3NXEPbb0eB3j3a9HVyu8ErfyfwiTnVFgjXUqPSIQlfkkBTX+SGovNw+kVzTzpZBSfNPSap9uMw1cdyuFlq80CDlroyUSvV72yVpZXt4BOeWj2/ix4Wwc17s58apZ+Fpaib/9Q0yMAN4ha3E9LS4eCYJ7hs+dH5Hj1QXRYyWxSzd0fvHqs9K2PFYR3CB/5W7HYyoxrwQyroBaOfNPkBviIwi5hQ0pbl0o+x36i567UyP9iNSRx5lNW4HsLzfesbeHG5aAN9UEKRCEN8rYOt/xpSXjXC7aCsSKBKTeaV8t5aUzUFky8kGtaCN+VtHvDQoZnfsP23Sk3oSSBHm8HvO6l/Sl29Sp0M4FKzIyIAI8BiSFjxgSFg1iFsZUyNyshCRW/F7YUGYe98Pa9+XtTU4ZIC1Jh/QJVlRto27xQFLJOL4qNI7VSIqBT/qQfTjX9i6//EMqPoZ5Wnm8ZfpoBAkBxSI3iaRtE7tWO2+IDRzHC6NG510YmBNkPmxwglcOGj6qItK/W3pgc6V1DbJ9vyWHLqOl1d+yu+8AxdDpxy0NHYrnJKuB2z4822NHa9Z3OJvpVLIspgPNloNw9LygsPWOethKbqgy7oAdGTxmCbZ91d6h3ms4uPTVY6zIiJPM2FE3s4i7Iqyp9NhRHOiVEHg/5ccekjjMnEexyQBqRTgjfGkbRPd3ycacoMqc0tD/MXdSi4ckvxrvgtn4XXlTb9l7O8F4bJfjHf+bkS371wV1RYwXvf8EjrKx X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 692cdeab-83ed-4757-5376-08dd456e2b62 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:23.6236 (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: +FgAy6aTzl/DqxmywZ05fYJjMvjZa9WZ6Ib6y63mKfSeR1jiTitp689qyJdsByg0oEwnVJgD3lCg6TIj4wNuJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 36D20180002 X-Stat-Signature: n6f9gtz1utbkzpp3t6xjs48ww7exe9a5 X-HE-Tag: 1738709441-350466 X-HE-Meta: U2FsdGVkX1+/DEsvmoIi7q4N+jSzNYmF6WwDEcPbaDt8vCbSMQQ+S0Qa3ilhY8NZ6EXNB7JyqA1QrR2hPD+2kvXpp3wWryRYsxry3Vt9s01i+OpKnCuwiLyxvVoduR6+axOQ5BX23p9TVdx8JEDwt8Z63LaN8bIi9cQHUwYi9AlcvPqrFWoF0x5LY/1uyTLT+iQl+qxptBGDO5GzT2h/MMZC/ARIRQogDyn6M9wmQIkFghju7NOIfQ2TAA1FJVyXrnsXfCbsKG6j1O9futAx7qvJfLUvw7eX09GyLp/JA+xTlLJPOcfuCVDpNRhaz/czHzYUkN30z0xOGt4xlfnGK7gx0GsNztdIRBHkkPkTGc5umMZPxgg3kURnrihGpsJRIL4YH3h95c69CBj/aDk3jwor5eL2u9rh/xjb3VWOEAynJy4zx2FHp1C1nzMsP6mq1stsnp8ZjHVBLTf5YuZLAANxfirHuQOVCaAEFiIcUqbFQO9LIEY4hgpuILM2SLQJtzlrRL27h9F8OeBgNnM5TXgdKxVg4JpSwbx9d26uSYCq7Sz01TyWA21dC1imjqO4AhpCAFWTVu8KyIoeTPmxce0P3KjIubxnXEQpaARrY05fRfbW5c4XjwtsXZ5i1tKORxSuEUroClUsibOnJtyOTA1xOGAFKhmj9zbtFR8a/xX01m4FG7YkMI+ZZvKcBQuK1UFDQZwwRKcjztbDsKsW5XANRQOAfDmQBOBtlXYfxPcN8jLlIypXMCDcBjQPuma5XcJyjfywrjNBrOMyCzbJINDNyxHEfPCVfYnjE+of0q1lhb/kYbpX1OJ5FelpT/C8GwNv162hbSVFuhvgi/PvnzspgkJ/IrR+mHURTV/s3Mgntj5dIGiuy78L2EQU24xOlJJh66YYYIz/gd5Vbc5wBSO15td83X7l2Gulz/epAnz2JGEQgws4g5lfxFmwzoV5+iPu9/BZ0jA/DVXY5z3 tkv3htOT l8588JPTQVP0ot2Hd1shunVAJL6dmIKgtif5MbMPBCFvVTTyXx8S/vkdHgBLYS0HuHe3OgUcn6O+BxFQrmVpycmmUWri75YK7UsuuPnaW9RWQUnmToUHMxGk0rPVfW/WtdNn6n5jLAKzdnju4uiaeaTUgPIh56gBkbDp3cv/bWBtZ660kJH+OkKOLPL8Nv9x2pSgSnWqfzl0WPdvb8U+F02hFZd44NDtQUUa9fvfYqsurUdTqPxhLvfPsRJDxYxAtNFd5jaNkd2DZ4Z69EOt9YTs9Y/fGQTl1H+/9ssyJDYCoEC9O3ny6F3Dq+lFCG0koPFsXkeFBBEfVgZABhH2M2XKj37pIjOe5yEIfHHBtkCXMbE58a6vB2aoDUVW+5HcOUPZdbopa8fa4cfCimECFQTW1BVmtVzYjFxQxPxOOOlwKEB3qFbVVqUKddx7mMjjW8zwuBdM4PgQUNdr7ylENnZRHkZWyyJj5+N1vo+HwuzCgjTxlEEbiPvewERb1blqZr3rS 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: Currently ZONE_DEVICE page reference counts are initialised by core memory management code in __init_zone_device_page() as part of the memremap() call which driver modules make to obtain ZONE_DEVICE pages. This initialises page refcounts to 1 before returning them to the driver. This was presumably done because it drivers had a reference of sorts on the page. It also ensured the page could always be mapped with vm_insert_page() for example and would never get freed (ie. have a zero refcount), freeing drivers of manipulating page reference counts. However it complicates figuring out whether or not a page is free from the mm perspective because it is no longer possible to just look at the refcount. Instead the page type must be known and if GUP is used a secondary pgmap reference is also sometimes needed. To simplify this it is desirable to remove the page reference count for the driver, so core mm can just use the refcount without having to account for page type or do other types of tracking. This is possible because drivers can always assume the page is valid as core kernel will never offline or remove the struct page. This means it is now up to drivers to initialise the page refcount as required. P2PDMA uses vm_insert_page() to map the page, and that requires a non-zero reference count when initialising the page so set that when the page is first mapped. Signed-off-by: Alistair Popple Reviewed-by: Dan Williams Acked-by: David Hildenbrand --- Changes since v2: - Initialise the page refcount for all pages covered by the kaddr --- drivers/pci/p2pdma.c | 13 +++++++++++-- mm/memremap.c | 17 +++++++++++++---- mm/mm_init.c | 22 ++++++++++++++++++---- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 0cb7e0a..04773a8 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -140,13 +140,22 @@ static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj, rcu_read_unlock(); for (vaddr = vma->vm_start; vaddr < vma->vm_end; vaddr += PAGE_SIZE) { - ret = vm_insert_page(vma, vaddr, virt_to_page(kaddr)); + struct page *page = virt_to_page(kaddr); + + /* + * Initialise the refcount for the freshly allocated page. As + * we have just allocated the page no one else should be + * using it. + */ + VM_WARN_ON_ONCE_PAGE(!page_ref_count(page), page); + set_page_count(page, 1); + ret = vm_insert_page(vma, vaddr, page); if (ret) { gen_pool_free(p2pdma->pool, (uintptr_t)kaddr, len); return ret; } percpu_ref_get(ref); - put_page(virt_to_page(kaddr)); + put_page(page); kaddr += PAGE_SIZE; len -= PAGE_SIZE; } diff --git a/mm/memremap.c b/mm/memremap.c index 40d4547..07bbe0e 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -488,15 +488,24 @@ void free_zone_device_folio(struct folio *folio) folio->mapping = NULL; folio->page.pgmap->ops->page_free(folio_page(folio, 0)); - if (folio->page.pgmap->type != MEMORY_DEVICE_PRIVATE && - folio->page.pgmap->type != MEMORY_DEVICE_COHERENT) + switch (folio->page.pgmap->type) { + case MEMORY_DEVICE_PRIVATE: + case MEMORY_DEVICE_COHERENT: + put_dev_pagemap(folio->page.pgmap); + break; + + case MEMORY_DEVICE_FS_DAX: + case MEMORY_DEVICE_GENERIC: /* * Reset the refcount to 1 to prepare for handing out the page * again. */ folio_set_count(folio, 1); - else - put_dev_pagemap(folio->page.pgmap); + break; + + case MEMORY_DEVICE_PCI_P2PDMA: + break; + } } void zone_device_page_init(struct page *page) diff --git a/mm/mm_init.c b/mm/mm_init.c index 2630cc3..359734b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1017,12 +1017,26 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, } /* - * ZONE_DEVICE pages are released directly to the driver page allocator - * which will set the page count to 1 when allocating the page. + * ZONE_DEVICE pages other than MEMORY_TYPE_GENERIC and + * MEMORY_TYPE_FS_DAX pages are released directly to the driver page + * allocator which will set the page count to 1 when allocating the + * page. + * + * MEMORY_TYPE_GENERIC and MEMORY_TYPE_FS_DAX pages automatically have + * their refcount reset to one whenever they are freed (ie. after + * their refcount drops to 0). */ - if (pgmap->type == MEMORY_DEVICE_PRIVATE || - pgmap->type == MEMORY_DEVICE_COHERENT) + switch (pgmap->type) { + case MEMORY_DEVICE_PRIVATE: + case MEMORY_DEVICE_COHERENT: + case MEMORY_DEVICE_PCI_P2PDMA: set_page_count(page, 0); + break; + + case MEMORY_DEVICE_FS_DAX: + case MEMORY_DEVICE_GENERIC: + break; + } } /* From patchwork Tue Feb 4 22:48:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960101 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEF63C02193 for ; Tue, 4 Feb 2025 22:52:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 871206B0095; Tue, 4 Feb 2025 17:52:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FA99280001; Tue, 4 Feb 2025 17:52:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 626056B009A; Tue, 4 Feb 2025 17:52:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 404656B0095 for ; Tue, 4 Feb 2025 17:52:00 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E5355802CA for ; Tue, 4 Feb 2025 22:51:59 +0000 (UTC) X-FDA: 83083761558.26.49A3C3E Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2073.outbound.protection.outlook.com [40.107.243.73]) by imf18.hostedemail.com (Postfix) with ESMTP id 158F71C000B for ; Tue, 4 Feb 2025 22:51:56 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=abmiGkbf; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf18.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.73 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709517; a=rsa-sha256; cv=pass; b=Sbo+hUhd1Vcd6qKOz294dc5LfnEvG8yVr0qU4E9VEQm/nDfA8FpNIVT6CpCCus3418k5qu 2M+u4XdV+vE5evjjx+sTKq/DVFzh9xAQn935/7LwEqJYZsVW2nd1IoRy/VSMyA3tzEEtUo oA2VpsV07L8VW2/Lgf1IoyRL103qwgU= ARC-Authentication-Results: i=2; imf18.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=abmiGkbf; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf18.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.73 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709517; 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=OfAN34ITK9M55mbgWIkS9+MmZiKWpfuQqfC67BIaav4=; b=rZCFU6kCDHyy/elpWfDM+StjjDmnMfcwmylhNlupqpD4zfnaxrVYfymHeeKw0npGzGOLd9 vOFyKCK02OLWFmf+87yXVArc5ea0y8TygW29qcNJy1surAJzOpPiAYp2wcKfnp+kptud4Z FYed3qjnv1ydGSkzaCfX42p/nESU7DM= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xItHW9uEundPKanjCQ87lMdSY3XmlUCH7wO5TudZ+Yriemc0vz5+azC4TyC0SNdedcQJL09yU5z4k+5M5jmZm+8c3uIuJsIX37ZKzJPPso73F/ZFFNdm4+7UUSC8FR8O5/0zytfRMqHupEszUO1VjoFExQveCRGZcnUwc5V88BiRIjFCF9iGP7eJPNANjAR+pZk3PFv1pdzWHWhLmheFPB1Ogq+LIjJpvJ4QeJx3RII1QhZ1ENiO8vQ7iRN/6GNFT019P44IsXvuB+K1oO3eN7rNOTkzwA6B7h3Ad9eqEcdVVL7JpCPf67UPABE0B3iB2b/ySyHm7exRfXNboVaK8g== 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=OfAN34ITK9M55mbgWIkS9+MmZiKWpfuQqfC67BIaav4=; b=vdLcMm2bXfT7tEg/PTTaYi+maBKdideh65JP0+UAoKm9VsZ8sPZ9qE+11LV6xPU/IGWwlMGd9Js4Ot1bVVopyQ+7IYrSd7tp7ImNfCCOHVu4QAsoQi/5xdxEzqk7L1FA4bp2WzV2HWntnJKFItSENLUcN36mSWTJD4Te+HfT7sOjntZ5lL3ZBp7F3a1yTlAfGTR1LGKVmVdS1BNndg3+ynrJN142Ekm/J6eQXFTza+Y0KrV+Z+Fbx2zmivLmuoslCiskD2eKH13CYksPDpVbFnZnquCdtfU3AGmSVW11WC+1A5wAE/28aWVHi8AetOvJI/aTI5+1RPx1Sf1j7/Z6EA== 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=OfAN34ITK9M55mbgWIkS9+MmZiKWpfuQqfC67BIaav4=; b=abmiGkbfU5TbJ4AU7qy/4FzaUH9V9Xbvn560ruyEpA8mCuzS+8IhwUhFQGNcqLR2vtk565gN1I0+nHYLivR8HmJwfH2/bkuzwbhoGz4jiCFPULZbUPcuT1kHGKKXx4D2R6HlMTMzW14Gq3AYoD4VFPu/5GrY5CVrahCOijq8nO5k8cYW0rfZzRTzkZpv2oXILmr5euHiwsSwuZ/0CwSMnFrtwYuHKwa9Sph21DF6twXQE8jMGQ6Fb7Gj4WR4HBChVcPvQNIAGAfv8qY8IueIKbAWmpaYpgLbqEE4IZKGd8xrlThzpPlO1KjPRKSfh0aOhzawTg7IBytFmWSI899Rmg== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:28 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:28 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev, Jason Gunthorpe Subject: [PATCH v7 11/20] mm: Allow compound zone device pages Date: Wed, 5 Feb 2025 09:48:08 +1100 Message-ID: <9faf181c9e0d93607b6eb41ac89931730fe0749e.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY6PR01CA0158.ausprd01.prod.outlook.com (2603:10c6:10:1ba::6) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 016b4d51-ea95-47aa-b0d7-08dd456e2e32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: 5kuBxeoA1S2XYach3+35DT0V1CbadVUpNFB6c5hGlt8Um+GQoVuLSaLT2w+v43brzpiqKwIXFf2bKS/4O68tGekfc6tpp1/M62MZBHv5QQhSld4ygaWZxrdpMkXA4rHJrToLQh2ZAv3Zo5EQh+Jc/alyAo0JFCOw8iQjtZ49mTHfYS1xblTUJTCBVbGnvhVP5ibpKufg/sZWOTsCIYXg4Yg9gdgcHbzWp6MaRvMrDLmZ2MZDd4TdP+vwktzjDiviS9CQQlV1DdTwtC7zN5I/2ZHXqgq4pMls5wG5ylhoDaf92h7MGKTz6XIcP7JHc5MXvdROmBYvvEVqfWtforcDR2xYnwZyWSxIQk1CopZbdkZX1hM7Bu3bYLL23kqyjnVy9OLYbWfHRlImkp7DqjrwWf2Gop6xKRuBQqHrr9OPpCCI1g4u3eHoKCJZuhs1NZviapHSidRdt8SvshRyJi+uPfcAVXzYBZrunXp2myMsZRpzFpbbVq/6Yw5mgJAqBiuxQQEMci7r95UBK3cvzYl6FDRGi4T6Lb8QD6Wmfhgyl8XMSH9tRoGt+HmP5OYFHCVL52pHXTYqTt4/Y2SgXtqFpJmZKKWSWsvpluW/AVNbKSTznSRZFXagFGRUsc0wrfrc9l4EneDBCyAXay58vMXrMhpqRkHRRRaOIzn/6CUrsMrFgcBv7Zs8PLYaFqOC/0P8DwcNUl+Nis3BL4IQq0JDkLFamux0/Ba0pGB6+qKS3iZ5qyYEAWDSx8o9sddRSiAxfAPAwtuT+SU20iJAchnQDOP2ad1vral7+2Nv4RUcqjsjlG8ZK1nIVOZ6OD/h08fPSp8el/mDMEz/EZKVI8leFqbmtjREoOjEA5S+3/Bf60is6gxzV4PCT6RlySu8nAoCnDMsD43c3+izDgxRVpgg9wI7qgI4V58LzFQutVNsBwgs89jN5bHkbtqKRHK5daQd35PvNA8XkRdDrvZE8j0T/rEaBJ6gDnz/mYd7sjcQoOfRzZGYFY5EezZ0apljA+QaeHv25HjXtz6IvcUKb3tf0VY8fnCzN9dsEfkQDsqu5UPBkS6eeC5iz8rhzArRz1RjSarGZTJjI032LWLy4501de06XPUQEkWQDSfuYvAKm+AusyKFtvYo++JER80n7ga3W+GDnebtEYOXTmFHpKnprympMKzehKw/yWV4FpjGLVnj5Fhnvs2sRyE9ddbcfx+QmjI8YFmWL6DEjcyQ6j07Q5Cqx52ljZQE0twBQDsUJiyAtkSgjwX6WUuqwrSS0n3e2n36xspB27qHMnYBNaLX4LHFn74ox9VydH7OQUtJ+D+tXEDbkpMDTlwz2586eMNysgJPKBbpXtzeJWeiaeRAwfd4fr3X+iz7zhPXvl3Xe1wpCjcsV7WV+dhiiMP69IFj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i3+k80RX9FsB7JlidN+vrdJ3rB2GB1+u9dInDrfL/MMMiZZsprN77/3pV1FAy5OPVFavetyjeH8J/So/+vUspIfm6ZZkdDkRce6mh+HwUq8RSCre7BMPEKbBvYWiGoS+UaKnFX+oaFC/DXhmFkM55KYJ0iHsqgLr1WqyW/dKitzxyqVGwrQzBRXxKrsMNMC7MRer5tizcUIalQ3x2UxuLWhcPFsve+cTTepWj7miSMIQ9MMOz0eQmjZNNWqrwU3Zs9dTCRT+lH/q/dWNcAz7foclhsLin0HKEUtrxYHpk8TKcLn+mHYnaPtsh/B7M2GEYCgi9l0+r05VTPZstdC3UMDrUFVm6LTJCBJ4GBHnp86EvzDXzgV6VSjR9rur2X97tbC29pMGWizP0Yp8Wm0KPkaGEoznC0GpDj95n8LBie466dmm7YReZAK5PZCn7UGWY+z/3h+xt+feKruJoOh27Cq/bC+vt42SNaNGleGCaXQaNxkp5J5BMyFenPwxKrgaKXkazdE9AAqo77YR+XG8jb8VLeW4TNfRq3s4Stl+/WtbPqNgXwWihNKkWq48K1OWhRMu5LH+cr0ZJNuecN44n//09icfvRXTMUXaRb2iYl1CyODH0LbojcfLhMvFyalwRp66pn1QEuIOjW/PPyTT6US++8/7mYLh/nna33m5C7eOr30b2xx7HIZfyLr7T6PwfHneDwvuyAI8fd3xbhJv23eMpmd+QNl2xbqd8MIFh5pvQmWCeHW2fbuPDaBUSqVC/eoX9NqBcuvnwg6BqZcxoGq4exCFjKyN+gwxKEyeo6tM/y/ojSz+Nj7XyV6xzzVPDYQOOAOkGL3Y5olaj4Snu7xgGwIwTCSEdUOticWRiYlVUoXOQVbmmFdwDlGYmqwUiSvAinSVRvtMtja91aWBNS1jpIOCzbv4khQUUCdOnoCuZqsT17v+NVl9m8DnBz6yHVhDwc8sRks16utL7MFUxncaODVziB+8e1EYy7DOHq47Yu5ClEnN9Km0Y0BuEII/W/Llzo58rsjoW5G68ngWJT80a1KpnqhZryBt6qfBUtoU4H3oReLstwLUn2TK/kxOmCGnGbFGakzbsCcCGyrjkdNiKQyGQhAkKcE6p3gGxj/CnMwuxPIuVqF/YyH9nzF7e7H+XSyuvG4bz0l3du2KUNk5jgdiWPH+R3/cCygMT4lovfxibve8okfHe9pqUTD0z1XBdMbChMQpWJvXVMlMnjK5vTr7KkdrMwxWW+N1XwhQMU36BdpJCCfiakWoxjLjldqoUqwxG/UAQHT//G2eqZ452kT5PT71qSbnGGJ9clnAsHuEEWfw1MgspZ6+pA8Eegth95cKpFhhFIqDwsUGcSpDKjQk00jAPpxG8TNmHdE4TAYZ88MANuG+YbGA/ckNf2vVY8MazLF81vC/Oi1yYgSydVa0teTswrwHiZLt6Q1LFGUpeg9F435Ialz0vpuEbib5vdsQ2q6bXE6oRAGnzSzQwKtb9zVXhpJWEya4DkB34w1QDkp2Vs0rFpTN8ZkNbK4qFd6T6ep5bFrLLRTnWAoJb8PhW5jAR4x/kP+pOi1KiDIdnG83oRkPt5hsSTms X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 016b4d51-ea95-47aa-b0d7-08dd456e2e32 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:28.3391 (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: WrLlpPBTl+CFJq/KyrutgIvpfZe/ndqQBbgqZjVjIh5/f6vbTaqN1K2wJIjLFeGnvDukVXekUBf8wyDKFrMHYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspam-User: X-Rspamd-Queue-Id: 158F71C000B X-Rspamd-Server: rspam10 X-Stat-Signature: kbcsr5nuutz63oswkmiwtxh6mmrx41h6 X-HE-Tag: 1738709516-43969 X-HE-Meta: U2FsdGVkX1/55Ktc5tXHB9NVGM9ymYzHKHX9oNnwljREfeGEfEILaYfYEImvdKzT9o48mG3bM06GedhUZyGNyFSP9soXQ+2vfcGyMRdACxZNoocFGEfzgasa1i3uEHRDRibk+XKXhhOZZVP70ODBo+/yng/h6ZrSRo+uvgr408GtjuwwvcfNOFH0bAK7QYwhNNLKSY92j5a2Sqan6a3a7+3pkOeiryFNhIx+aJSBpYmUE2TBpuW1Aeb7py9CKI7jnjpDacnUrCbMJgawF623WB84pKodMuDlraOkfFzfHYfndpBOE8xVp0ie2A28Ko9gkcVLzhp/5JYsyc7dGGMK4URSmuNGc/4LpBCfc1mVPcJdAVdxNkrUa3kOBeIsfYI9G56GAN094LNb0czqph68NgEEmNYxE1RNqduGJqq6h0s7kOpIkE17I6nb5lWlETpwHugdY+N4btmHrTILJRgLM0glghzsheLvkENDfkICWDfMizQTSIHRdH+gVIoTHmMhKfEQkcmMeuNTQNmb5ZiCGvKOl4gNuD4I1CUeJrKN3K1wp8QjiZq1zy6btoG0d3nciWSSueG/pPhn2O15UzWXaP4TB9cx9hqOtXA3U2GhtitVDGfA9wKCIM4iB4i2s3GLF8LkgLsLmTfesDCwnzrDg/+hKlT95gWtbQkZ1AHGQTB4WVKscKsK/uIbF+VVuKEYpdVgvsgzEWFxmUPiQYJt/ToTEIyMj0wRKxm75GBX18m7FDZvXD5e6IQzF862bkIPp+lBXNL4O8FjMgiXD23rqv2Qvh8hp+1XDJvyl30jPidgUDkjGPD7UDAToz4NwpAy8ITTuJw2EqYxGnkzboZeK0roWO6ZUrKtVWhIpRx6qvtXLpJakiPEUPMMcMtN7KYq1Xxv5ixQEq+aa6/RobA1SO8nt6AQw86Yb8hgHEYs9FoQuvvM9hZxfTU6M6btdcq9mm7PhC9eY2bUSrVR/7X gujXzrjL rXicQJN39aQ2H+lbmdXIqv8RfVYv1mpsUxqqteFe4EE4DboYQMeTZSFqbyhQGN6Vy2J1BrdjiDmdWvvdY1PtnqWetmNhVsmq3x5Pb6yj60KKN4mIamFCMxlw7iMWH+ToFYVR1BFm/ZNNjxnFuJZHUpTJI/unACAF9UNvoiqAmV829wOTMWUZ0rGeqYtcsn6USSX2hix2C6YWWm6QTTQAVvvN7uGJkMxbVsw9XxwgPKz2ArFUTF7OK4EcNci/jSlHYQZXla2zUq/kHgZei9Z2xn1tfzOiwOXBnvMIzfexGSSrr9LqFb3Loxwwf+WPKit+uFJxEjOm8I7YzPfWcGV9kybNGK+tjeqGdwnR13E6Jb15a1hmsn73kP0GS5nCVJ2PR1nxTnPTxu57ehu2/3QyjLvZZ2IZupwoH3RvM3zqkx+8WSEhYMSedGwKqP/+XjhWcAUJzUuWit+fTHpc= 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: Zone device pages are used to represent various type of device memory managed by device drivers. Currently compound zone device pages are not supported. This is because MEMORY_DEVICE_FS_DAX pages are the only user of higher order zone device pages and have their own page reference counting. A future change will unify FS DAX reference counting with normal page reference counting rules and remove the special FS DAX reference counting. Supporting that requires compound zone device pages. Supporting compound zone device pages requires compound_head() to distinguish between head and tail pages whilst still preserving the special struct page fields that are specific to zone device pages. A tail page is distinguished by having bit zero being set in page->compound_head, with the remaining bits pointing to the head page. For zone device pages page->compound_head is shared with page->pgmap. The page->pgmap field must be common to all pages within a folio, even if the folio spans memory sections. Therefore pgmap is the same for both head and tail pages and can be moved into the folio and we can use the standard scheme to find compound_head from a tail page. Signed-off-by: Alistair Popple Reviewed-by: Jason Gunthorpe Reviewed-by: Dan Williams Acked-by: David Hildenbrand --- Changes for v7: - Skip ZONE_DEVICE PMDs during mlock which was previously a separate patch. Changes for v4: - Fix build breakages reported by kernel test robot Changes since v2: - Indentation fix - Rename page_dev_pagemap() to page_pgmap() - Rename folio _unused field to _unused_pgmap_compound_head - s/WARN_ON/VM_WARN_ON_ONCE_PAGE/ Changes since v1: - Move pgmap to the folio as suggested by Matthew Wilcox --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 ++- drivers/pci/p2pdma.c | 6 +++--- include/linux/memremap.h | 6 +++--- include/linux/migrate.h | 4 ++-- include/linux/mm_types.h | 9 +++++++-- include/linux/mmzone.h | 12 +++++++++++- lib/test_hmm.c | 3 ++- mm/hmm.c | 2 +- mm/memory.c | 4 +++- mm/memremap.c | 14 +++++++------- mm/migrate_device.c | 7 +++++-- mm/mlock.c | 2 ++ mm/mm_init.c | 2 +- 13 files changed, 49 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index 1a07256..61d0f41 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -88,7 +88,8 @@ struct nouveau_dmem { static struct nouveau_dmem_chunk *nouveau_page_to_chunk(struct page *page) { - return container_of(page->pgmap, struct nouveau_dmem_chunk, pagemap); + return container_of(page_pgmap(page), struct nouveau_dmem_chunk, + pagemap); } static struct nouveau_drm *page_to_drm(struct page *page) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 04773a8..19214ec 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -202,7 +202,7 @@ static const struct attribute_group p2pmem_group = { static void p2pdma_page_free(struct page *page) { - struct pci_p2pdma_pagemap *pgmap = to_p2p_pgmap(page->pgmap); + struct pci_p2pdma_pagemap *pgmap = to_p2p_pgmap(page_pgmap(page)); /* safe to dereference while a reference is held to the percpu ref */ struct pci_p2pdma *p2pdma = rcu_dereference_protected(pgmap->provider->p2pdma, 1); @@ -1025,8 +1025,8 @@ enum pci_p2pdma_map_type pci_p2pdma_map_segment(struct pci_p2pdma_map_state *state, struct device *dev, struct scatterlist *sg) { - if (state->pgmap != sg_page(sg)->pgmap) { - state->pgmap = sg_page(sg)->pgmap; + if (state->pgmap != page_pgmap(sg_page(sg))) { + state->pgmap = page_pgmap(sg_page(sg)); state->map = pci_p2pdma_map_type(state->pgmap, dev); state->bus_off = to_p2p_pgmap(state->pgmap)->bus_offset; } diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 3f7143a..0256a42 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -161,7 +161,7 @@ static inline bool is_device_private_page(const struct page *page) { return IS_ENABLED(CONFIG_DEVICE_PRIVATE) && is_zone_device_page(page) && - page->pgmap->type == MEMORY_DEVICE_PRIVATE; + page_pgmap(page)->type == MEMORY_DEVICE_PRIVATE; } static inline bool folio_is_device_private(const struct folio *folio) @@ -173,13 +173,13 @@ static inline bool is_pci_p2pdma_page(const struct page *page) { return IS_ENABLED(CONFIG_PCI_P2PDMA) && is_zone_device_page(page) && - page->pgmap->type == MEMORY_DEVICE_PCI_P2PDMA; + page_pgmap(page)->type == MEMORY_DEVICE_PCI_P2PDMA; } static inline bool is_device_coherent_page(const struct page *page) { return is_zone_device_page(page) && - page->pgmap->type == MEMORY_DEVICE_COHERENT; + page_pgmap(page)->type == MEMORY_DEVICE_COHERENT; } static inline bool folio_is_device_coherent(const struct folio *folio) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 29919fa..61899ec 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -205,8 +205,8 @@ struct migrate_vma { unsigned long end; /* - * Set to the owner value also stored in page->pgmap->owner for - * migrating out of device private memory. The flags also need to + * Set to the owner value also stored in page_pgmap(page)->owner + * for migrating out of device private memory. The flags also need to * be set to MIGRATE_VMA_SELECT_DEVICE_PRIVATE. * The caller should always set this field when using mmu notifier * callbacks to avoid device MMU invalidations for device private diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 6b27db7..5e14da6 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -129,8 +129,11 @@ struct page { unsigned long compound_head; /* Bit zero is set */ }; struct { /* ZONE_DEVICE pages */ - /** @pgmap: Points to the hosting device page map. */ - struct dev_pagemap *pgmap; + /* + * The first word is used for compound_head or folio + * pgmap + */ + void *_unused_pgmap_compound_head; void *zone_device_data; /* * ZONE_DEVICE private pages are counted as being @@ -299,6 +302,7 @@ typedef struct { * @_refcount: Do not access this member directly. Use folio_ref_count() * to find how many references there are to this folio. * @memcg_data: Memory Control Group data. + * @pgmap: Metadata for ZONE_DEVICE mappings * @virtual: Virtual address in the kernel direct map. * @_last_cpupid: IDs of last CPU and last process that accessed the folio. * @_entire_mapcount: Do not use directly, call folio_entire_mapcount(). @@ -337,6 +341,7 @@ struct folio { /* private: */ }; /* public: */ + struct dev_pagemap *pgmap; }; struct address_space *mapping; pgoff_t index; diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 9540b41..8aecbbb 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1158,6 +1158,12 @@ static inline bool is_zone_device_page(const struct page *page) return page_zonenum(page) == ZONE_DEVICE; } +static inline struct dev_pagemap *page_pgmap(const struct page *page) +{ + VM_WARN_ON_ONCE_PAGE(!is_zone_device_page(page), page); + return page_folio(page)->pgmap; +} + /* * Consecutive zone device pages should not be merged into the same sgl * or bvec segment with other types of pages or if they belong to different @@ -1173,7 +1179,7 @@ static inline bool zone_device_pages_have_same_pgmap(const struct page *a, return false; if (!is_zone_device_page(a)) return true; - return a->pgmap == b->pgmap; + return page_pgmap(a) == page_pgmap(b); } extern void memmap_init_zone_device(struct zone *, unsigned long, @@ -1188,6 +1194,10 @@ static inline bool zone_device_pages_have_same_pgmap(const struct page *a, { return true; } +static inline struct dev_pagemap *page_pgmap(const struct page *page) +{ + return NULL; +} #endif static inline bool folio_is_zone_device(const struct folio *folio) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 056f2e4..ffd0c6f 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -195,7 +195,8 @@ static int dmirror_fops_release(struct inode *inode, struct file *filp) static struct dmirror_chunk *dmirror_page_to_chunk(struct page *page) { - return container_of(page->pgmap, struct dmirror_chunk, pagemap); + return container_of(page_pgmap(page), struct dmirror_chunk, + pagemap); } static struct dmirror_device *dmirror_page_to_device(struct page *page) diff --git a/mm/hmm.c b/mm/hmm.c index 7e0229a..082f7b7 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -248,7 +248,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr, * just report the PFN. */ if (is_device_private_entry(entry) && - pfn_swap_entry_to_page(entry)->pgmap->owner == + page_pgmap(pfn_swap_entry_to_page(entry))->owner == range->dev_private_owner) { cpu_flags = HMM_PFN_VALID; if (is_writable_device_private_entry(entry)) diff --git a/mm/memory.c b/mm/memory.c index 539c0f7..17add52 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4315,6 +4315,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) vmf->page = pfn_swap_entry_to_page(entry); ret = remove_device_exclusive_entry(vmf); } else if (is_device_private_entry(entry)) { + struct dev_pagemap *pgmap; if (vmf->flags & FAULT_FLAG_VMA_LOCK) { /* * migrate_to_ram is not yet ready to operate @@ -4339,7 +4340,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) */ get_page(vmf->page); pte_unmap_unlock(vmf->pte, vmf->ptl); - ret = vmf->page->pgmap->ops->migrate_to_ram(vmf); + pgmap = page_pgmap(vmf->page); + ret = pgmap->ops->migrate_to_ram(vmf); put_page(vmf->page); } else if (is_hwpoison_entry(entry)) { ret = VM_FAULT_HWPOISON; diff --git a/mm/memremap.c b/mm/memremap.c index 07bbe0e..68099af 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -458,8 +458,8 @@ EXPORT_SYMBOL_GPL(get_dev_pagemap); void free_zone_device_folio(struct folio *folio) { - if (WARN_ON_ONCE(!folio->page.pgmap->ops || - !folio->page.pgmap->ops->page_free)) + if (WARN_ON_ONCE(!folio->pgmap->ops || + !folio->pgmap->ops->page_free)) return; mem_cgroup_uncharge(folio); @@ -486,12 +486,12 @@ void free_zone_device_folio(struct folio *folio) * to clear folio->mapping. */ folio->mapping = NULL; - folio->page.pgmap->ops->page_free(folio_page(folio, 0)); + folio->pgmap->ops->page_free(folio_page(folio, 0)); - switch (folio->page.pgmap->type) { + switch (folio->pgmap->type) { case MEMORY_DEVICE_PRIVATE: case MEMORY_DEVICE_COHERENT: - put_dev_pagemap(folio->page.pgmap); + put_dev_pagemap(folio->pgmap); break; case MEMORY_DEVICE_FS_DAX: @@ -514,7 +514,7 @@ void zone_device_page_init(struct page *page) * Drivers shouldn't be allocating pages after calling * memunmap_pages(). */ - WARN_ON_ONCE(!percpu_ref_tryget_live(&page->pgmap->ref)); + WARN_ON_ONCE(!percpu_ref_tryget_live(&page_pgmap(page)->ref)); set_page_count(page, 1); lock_page(page); } @@ -523,7 +523,7 @@ EXPORT_SYMBOL_GPL(zone_device_page_init); #ifdef CONFIG_FS_DAX bool __put_devmap_managed_folio_refs(struct folio *folio, int refs) { - if (folio->page.pgmap->type != MEMORY_DEVICE_FS_DAX) + if (folio->pgmap->type != MEMORY_DEVICE_FS_DAX) return false; /* diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 9cf2659..2209070 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -106,6 +106,7 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, arch_enter_lazy_mmu_mode(); for (; addr < end; addr += PAGE_SIZE, ptep++) { + struct dev_pagemap *pgmap; unsigned long mpfn = 0, pfn; struct folio *folio; struct page *page; @@ -133,9 +134,10 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, goto next; page = pfn_swap_entry_to_page(entry); + pgmap = page_pgmap(page); if (!(migrate->flags & MIGRATE_VMA_SELECT_DEVICE_PRIVATE) || - page->pgmap->owner != migrate->pgmap_owner) + pgmap->owner != migrate->pgmap_owner) goto next; mpfn = migrate_pfn(page_to_pfn(page)) | @@ -151,12 +153,13 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, goto next; } page = vm_normal_page(migrate->vma, addr, pte); + pgmap = page_pgmap(page); if (page && !is_zone_device_page(page) && !(migrate->flags & MIGRATE_VMA_SELECT_SYSTEM)) goto next; else if (page && is_device_coherent_page(page) && (!(migrate->flags & MIGRATE_VMA_SELECT_DEVICE_COHERENT) || - page->pgmap->owner != migrate->pgmap_owner)) + pgmap->owner != migrate->pgmap_owner)) goto next; mpfn = migrate_pfn(pfn) | MIGRATE_PFN_MIGRATE; mpfn |= pte_write(pte) ? MIGRATE_PFN_WRITE : 0; diff --git a/mm/mlock.c b/mm/mlock.c index cde076f..3cb72b5 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -368,6 +368,8 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, if (is_huge_zero_pmd(*pmd)) goto out; folio = pmd_folio(*pmd); + if (folio_is_zone_device(folio)) + goto out; if (vma->vm_flags & VM_LOCKED) mlock_folio(folio); else diff --git a/mm/mm_init.c b/mm/mm_init.c index 359734b..8719e84 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -998,7 +998,7 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, * and zone_device_data. It is a bug if a ZONE_DEVICE page is * ever freed or placed on a driver-private list. */ - page->pgmap = pgmap; + page_folio(page)->pgmap = pgmap; page->zone_device_data = NULL; /* From patchwork Tue Feb 4 22:48:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960102 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73AE9C02194 for ; Tue, 4 Feb 2025 22:52:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 034EF280008; Tue, 4 Feb 2025 17:52:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EFFD2280001; Tue, 4 Feb 2025 17:52:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDE11280008; Tue, 4 Feb 2025 17:52:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id AA368280001 for ; Tue, 4 Feb 2025 17:52:13 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 58B6CC0192 for ; Tue, 4 Feb 2025 22:52:13 +0000 (UTC) X-FDA: 83083762146.04.5FD4C78 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.56]) by imf27.hostedemail.com (Postfix) with ESMTP id 908FE40012 for ; Tue, 4 Feb 2025 22:52:10 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=UeuzUvsV; spf=pass (imf27.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709530; 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=CIFsFkwQqOlhv0D0MCNi+ci6YOVC+qI3Z9fzJ6ddjZY=; b=hM04RGLGRfKxmnKhL2PfjgKAB4VGas+Jp/4sC6BCDw0ag/sJ3zbkZnq7rlIrHkBHNd8a9q njfR6zshyav1Yl1WQbLiO0zfY+bdI/iOw7OcIiegJntV99iEbWEKoensu37F5BGc8DYf30 YlFGkP54vpTkCpzN5IHdLW/6tQVj/ic= ARC-Authentication-Results: i=2; imf27.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=UeuzUvsV; spf=pass (imf27.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.56 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709530; a=rsa-sha256; cv=pass; b=Aj4u4jFz1CF12i9YfpEITvSI4bSN8pUAyOLKEb0jswTEC0XQPDg2uGEZ8mkGYJaUTjdcwF 9U+GUxhG6kJBnqRhGpm91lvnOL4R0wQh5peNV3Jz/x2oYotLqmm/Buuh8tKnea/1i7gJkk 5OAEXlQcvDYyiV2BfqeOYK0VJCc521g= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JNncDq4leDpXispeV8XgA8glYHwBncOAQ/xyxnedFCWyvWk+bTH3GvOY4dBrknn2K/Uqfrwhs5cMxl17jwgGexWTEzdFFpDgKxUIkAWHVn6UQUXPy1ZIulNKxYTnfqJbQfkK3Fo5fAdEDH4niM6myU/HXP9h9HK/5QHKYmVC3YaD8FpeiOspzYjPVP2bXcczS+eXVxK7v2Dxcg9ljbJTFzmrtyeMLBw02xm5uEqdIYku9oOVKHn0PIYsQ9nTUd4+LSkz7EOWW0cfF1ZfMh0GNsH//euNfp2xnNAbuif0eiVxwJFgFvwQ6Mh0sdCu69a58O0L0HhG27VP1HC4EtlMzw== 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=CIFsFkwQqOlhv0D0MCNi+ci6YOVC+qI3Z9fzJ6ddjZY=; b=kQ1V181zScj8Diab4JrK9wxBOsBmQXUQxUUU7/OS1YjmYoQpzqE7pESeg6TmfEJKFfI11Q/tw/DyprQhyob0jQWgcEykCk5sTSRMsZUFNkakeow1VecgAoLxWA7la512/PdQ2XGntzBYCGFOMm4+yDoQbhwpPP1YPaEEBysX/EGrMoA0UKaj2D9GInFUitragKpfRc17eNU6b19Pmc5jnyfi5XuAGoa5j+dPJ1XRjw6kF4VlPzw57SDPam7FofgxYBgBv02MCtCjeHkplyZCj6URqi2eLD6QCR63V9QA2ntF/6yT4dunl2yylC4K/4TrW14DTFLrA0F86558UndP6g== 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=CIFsFkwQqOlhv0D0MCNi+ci6YOVC+qI3Z9fzJ6ddjZY=; b=UeuzUvsV/FZRT4GLPdp14+mEF4Qrk/q1x6LDL3tj2x3Kw+Uu9/c1RQa89lQQUIRGceAtVmvK13UCCGdut84IQEm5koh8Gu8rkiih84vtyyLLeyF9rkefnB1BZHd08h2RFgtYoDDeuXRZ8MYx8bJ+y0GIaTXkfGAr2EBPC47WSrwzv+9j1yc6q8Uah6KWagSHth0bYRB/ppI3It3vuGxVQE7qyWEpDSm22gKs95t2zxrxa43eMSkePEnRciWlYih78m+gSgQBruRDINBn+1Ib8gDCoo/YzzopdRMhGQR4Fcj9+YbliaiFXIGiWE9uFlQD3qVAfuPpygyxB9p98q66iQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB8537.namprd12.prod.outlook.com (2603:10b6:208:453::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.22; Tue, 4 Feb 2025 22:49:34 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:33 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 12/20] mm/memory: Enhance insert_page_into_pte_locked() to create writable mappings Date: Wed, 5 Feb 2025 09:48:09 +1100 Message-ID: <7db953c8cc5a066b4aa23dbdf049c6f35cce7b99.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY4P282CA0016.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:a0::26) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB8537:EE_ X-MS-Office365-Filtering-Correlation-Id: 14b365e0-394c-4b98-4b7f-08dd456e310a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: vn+Vix7NJ9uCFxyIiatqGQYemjDceBEvnjmgNsupA9EtWu7p4c+Fi7sGLSsd/2V2yFoqCGvm87Qquw76qGkabU9sv+Hsbgixj7RrLdOZ++MgpEafz5FjgBWqWiNu/tbOZFVlO7VWp10Jut9PNwSM2YI/EBtjQV9tIWJoq5ilB8i/vNM+eySlJbTchSwhMTHdW5NcPZk8BaG01vDiWXhBoZTFJfBy9W6sRzJsVo4FcsvwGKl3fM9Gx8V4sQ54Tw1J+Sehuo2TgLwz+QS5bdXbJrXOsrWDOU4wCbruxaTdQsLyyDPR30mbgHDYlkk8GaWi//NcKVawCyrCChlAXBFId3krXx+EbfaYOTqKhX2dKaat7Aj1+jJSXowB9g8iqiuygAisw17NRjLvg3A+Km2sndSlGYcdzcZH+H9kfwWPmk7QpatRZb/PnINak07cx5Fa9FjVQzIGVp5QroJzMhiU8AQUc7eytT3E0NlC/PGEWUHoIrOGhk+EDRTBPgVn1MgRTEh4CahyOKOHCSoCHYzwRatAree70Wa5XiRVxjd/G1eHg2+H5v+U+TPk8p/+4I6Ke1E3NQHOzFW98+bM5xxWr4K3j2e34O97dYpbRG5Zn9b7tT+/M1Q4yijZ/raKCtdE9MGzzBZ5NVUKXncVyyc55JZxvsWfMGQyOjn9u4Q7lrnssPiAOD1lePkqd6Wtf16HhqoJS2UmcBcSirN2+AV6op8R8JgKH0utqzfjkMKdDQ9bg3VI+dMeu9xDv+SzPgEwfkQpF36OVg3xgGI9eYsH+DFpgXcsw0hzn4sLlRKV9gtkl+yzc5gyUioQV9ojdCb8kaeKpWRVONvYrodUi0/zzaVSelCSuNrBDgoBOqL5N9CdZqaAgBPPnLAMO8HwZGhWCGhYEgG1WttK4byBB224Qzidd94tQAFXvFAKz4mFKzmPeQd/ItUSor+9hB6isamcRRm8avo0gBuCxJtjDYcw8E1ES4zKa050b8wZW8AoVz6hO1t8kqpWMkgUPDwXBNfUYXgr6BEfoZ1y718O5K25bGPcS+FgOnnqENU/um5Ptd+NapJMSGvBrqPiQOSCfG5EfFtk+u1DOK94eKXTJ3G0066ZMJ6baah0uJILAxp+aZhhn5EHzpYCn9tDc2weeEXxRm/yo/gWM08JNLb27oS2Csyhh1UYFaCY7AAZDKsh41X3agse+vxgxEkBu/1Iga/NlM7Gsz4olK96PrQ739SaHBsAz+zk7Q+zOJgBlC+1pl83+/6CB1V/T3KgcIF8UaClgFAWIwB1uh801gSNmj3WlPZEogqFj42LwYmNuQtvp0/YSjI75zhQLGMRG+bpYdnhsYkvqwEwSGUonR3Rk5kL7853MzosvF/riCB/HflcC6vRPKkLxsZCYb+u6eMnrBfG X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WUX31JjS5FYA7SYPetpnxfn3Rck8OSDHWFo9Jp9c/xDBMjhATEHr8vBjQvE8QkRN2GcUjrDNkaaACLdLy7kSb3WdpcxprTyUWgyHood6H279Bm6mmM7aDgYHyHUi19KG7Ek8hPJjSI/9Ep0M4/odxRqHEhZW3lh2YZ13ndSG1PJDq/4np/2jKzZlcC+O9d5WdQOr73zIAGVgbPHJnZKJhtNgap9Cw++0I42/qIEwqTCR8mlPoAXXUpE8jUcY1j69+ni65oECz8YbkLykQeb0k7mTEbTnXycwN+fWw0y5mP52v6aJA2rwbB50+oib5F7SVs3IRSkfmsrUIbqZkJZc0+mKgehg4w9kTIpNKbXL3HVQ2Kek0GdfqROgKNLuErxQriI9N3QzCCBmBLfHtwr2Nn6uidutwqia0sNF8d0ZLiiE/1HElOvGOWFWS13U361MGgT8CjHwKyqXtnzDK816TB1KoRkG+c4JPX2ymgJtFQ7Lh/C75NOjEdJ0IuDmWxYB5O+6BYZ11ILfzPQUc+tFU3BgnsU2rSfIvLjdOYWEJiK/mjoJQ6JqUY8DxUy3t32HCqPvSstRLrUOVJETwRj/DCJzfgwSuMtlSljEXa3qZDsu6ABcnltVhVtB5PlK7MhyjghoQvMleKJkr36zd/UOnD+jlB7XFJZsJsxSwPbkHfgxMyp4Ju/34cAHqcVaUtgj8pssLqMiDTqX9iCmi+CT/3HhhMxyBtPYhvCrowID9FPYuT0p6BCCatZYgTT/U0oR0Z4d69+rua3RHIFN72zNC9NHntiUhcEWxHPuBbSnKDjR9hkjAoPqYL0qGWtKK5fpz7LSuI0Gvot4oDPaqU/A+epHyn+3gNq/o4iZNhU6ahl486ZDRw9YTatPidqkH1DnPRkzHKDJiP1FEatJZQA/OqoOHkcDhGIryM9DPizFDUZscf8nSjvYwRd4fmWnziv+YvkKGsEQJ7E8gxw3/pYJ4QVHSLZyWlTeuLd2xgzpJDr+lmtpl9oWomROmqXi//kjo6KWQJ9TLvjftDvDYS1PhhrK7BfRDBZ1Jo6RGBBoMhhT1VOgrwu1WfBeahpB9Q26o3DBRD/XTTWVavBI6pLjDH8mRDSrO8lnn/178C0BflFTqfib5ha/f+RFveawI2P7mRh010iKvmCABoI3sb++qZ/TfXWoy10QPPLcWHlwPfojxG3UKWMKIjS+rVS7v69yBXrTPJEWnulSEklIYTdgc7+9B620pYM80jOavPckfmrKpe92pqkv3XpYGUhMtMQwG9BPRBuX7C5z4nogdY1XBe6i1r7UtOhyNvmtPIh6ABpcjJOQqh8rvpP6HDGwkhjLgBwnx2y7euivx2Ix1xdMf97CgOyKmH+OqGgAatrsiB5Y9mGsXESAcid88NmzKOHt2LvqkEIlXD/xCoDCugLbdz2fAx0NnaDuh4XMX8i41QtW/ia513RWsoXvZS9SgOQdIoXfslQ+vVQp9rHdQNjqbjpZu5Akz1mP+90zPyGzhlDD0W+ZPaVRCgIa2hWD9/SMD87Q2XufuSvHyAloGEOsIkUUkqbBe5LkKrW/mLHXcewJxQbgK6VF3wkSVrgZqEP1 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14b365e0-394c-4b98-4b7f-08dd456e310a X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:32.9407 (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: Ju/cNraWEBsYWJLoHGjgSPwdono/C91e7ntfts8uQinGtRlHMQTIoMeopjIgaXX3DxuBTMmy67rC6fvddwB8hw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8537 X-Rspamd-Queue-Id: 908FE40012 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 5rsjzueuwaartsdydhhwnnqtytg81b5k X-HE-Tag: 1738709530-236020 X-HE-Meta: U2FsdGVkX19F+SHbHJi+a1pIZsqzTxxEiOcUD7TR2lAp0fMCtkB5wXn3NRqut9A12qZSt+xIlI3BMFMXFNlfRIMq9KLkQX5dPqQ4OhGIU9kO6criZjym6sh3of8q6JO4JqfN5tAZH/uxYn2zXkBMXyIpOHMth/s20gk2G1BJqLItzV/F6G9mnmLQu02JswP+eFXIueQeeUEAWJQoCUNzAXWyOK3woB8yMEYPHo1/BfBgqEkKfMzuEL6r3elDt4bk3WjrgZYTGIU728tFQMSBmrY6EgfjmMlWRmGyLdMnMqF+YjrrH20OZE97TBFqrapHbDWmc+c8KSVne3G3qvMyNR8WTTv1Xaa3pmeflxxFgrUleQRa+mp/b9IH837OWIveGDVNHBi95n7+MAUkjaXHj+Ytp5F6gHvkjbzR/ti3zOxW6KV1pdcN4U8LNFfgAtwrWT7nCT/TxAU+unWZ9YxsUv70sJz3YjrV1jmK43dDk8jdbgwwrEXRadqtUvZARQ5UxOlfFiuzZd/xgl1qb/Kn9qE5a+P727xgpEIYXhLCaqIwlvQjJP3m997sriAv9ERNU3NRX7owsqmu6XTRAiDP5YermJUnQERsOhzxwvYdstVHLm0hoPcxA8wMsFeNf2GokuZQj004JBOzfmON1yW6NH5htkg6mz4oJBykr18BvCH1DTn0qru2GXfx95qPIUzUxy/YyNWffvyxCuXS3tiqwrhZ8e0240HTxhh/lQSHqF0ESQznv6MxBmYaqMPZLnWqcpxFDn90XsHcL5MuRZnwLEQBtF/IaA3MikasZkfJ9ytgAexMhC2MfoBmJoK+QH5VRE9onv7o5ngM3PpOvON/j2T/I7Ku2ZZOOVg+hYUgh8Jt3YyRUpQJml4v5M2YJVPuA7uG9TZ/gCkLkiQRwq6Rqs4JsVjpKn9LX50VBq5L5PwiAZrxazQ07Chb/YBhRtjxnWJsBblaCzPPK3UIjfC 2RciBtlS jFphCDOZVVxhrMZwMeUUQ7I/iz12PoDk4jgqqQKOhSG9fi0ZMM7DYsJt80xmdJd3mhHMdhk1bpqROYXUJ0HPGxhJF8oi+xhrMM2bU1gdPbM/ixcPRhe6NBA0NoK9shmWevseZ1yXN2cHOoZvdFxibgHMFchu9xywNvzL4O+X1ryjRcf0eMUSDZ7cW/obtjjbJwo5lrJssgHjxApXXcegAZ2iFtEcDQujzwLr2uVK+qb8JcvttUPb0ZkTNlivg4jCdiV8frqB2ims1y9t5UjG6160Kp4L5T14Hu05+QlpGwf8a4ulinZ/3NzlJQBLRk4dBGHWQPcTe//aWuNJnrOzOLE0G58563UHad5iyQE6wTDVFjW1PJ4IN57mmvAp/cSHk+ABYU1OOgbxuzbuXlnt0dcKvBGMRy9ZJSZI4IM+eER3oRWWwL0+GCgZavP0PlYFDIXaAEA9KNV/I6NJHA+SAtY6q5gerOu4eB/ZvP/IKncMJKmI= 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: In preparation for using insert_page() for DAX, enhance insert_page_into_pte_locked() to handle establishing writable mappings. Recall that DAX returns VM_FAULT_NOPAGE after installing a PTE which bypasses the typical set_pte_range() in finish_fault. Signed-off-by: Alistair Popple Suggested-by: Dan Williams Reviewed-by: Dan Williams --- Changes for v7: - Drop entry and reuse pteval as suggested by David. Changes for v5: - Minor comment/formatting fixes suggested by David Hildenbrand Changes since v2: - New patch split out from "mm/memory: Add dax_insert_pfn" --- mm/memory.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 17add52..41befd9 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2125,19 +2125,39 @@ static int validate_page_before_insert(struct vm_area_struct *vma, } static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte, - unsigned long addr, struct page *page, pgprot_t prot) + unsigned long addr, struct page *page, + pgprot_t prot, bool mkwrite) { struct folio *folio = page_folio(page); - pte_t pteval; + pte_t pteval = ptep_get(pte); + + if (!pte_none(pteval)) { + if (!mkwrite) + return -EBUSY; + + /* see insert_pfn(). */ + if (pte_pfn(pteval) != page_to_pfn(page)) { + WARN_ON_ONCE(!is_zero_pfn(pte_pfn(pteval))); + return -EFAULT; + } + pteval = maybe_mkwrite(pteval, vma); + pteval = pte_mkyoung(pteval); + if (ptep_set_access_flags(vma, addr, pte, pteval, 1)) + update_mmu_cache(vma, addr, pte); + return 0; + } - if (!pte_none(ptep_get(pte))) - return -EBUSY; /* Ok, finally just insert the thing.. */ pteval = mk_pte(page, prot); if (unlikely(is_zero_folio(folio))) { pteval = pte_mkspecial(pteval); } else { folio_get(folio); + pteval = mk_pte(page, prot); + if (mkwrite) { + pteval = pte_mkyoung(pteval); + pteval = maybe_mkwrite(pte_mkdirty(pteval), vma); + } inc_mm_counter(vma->vm_mm, mm_counter_file(folio)); folio_add_file_rmap_pte(folio, page, vma); } @@ -2146,7 +2166,7 @@ static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte, } static int insert_page(struct vm_area_struct *vma, unsigned long addr, - struct page *page, pgprot_t prot) + struct page *page, pgprot_t prot, bool mkwrite) { int retval; pte_t *pte; @@ -2159,7 +2179,7 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, pte = get_locked_pte(vma->vm_mm, addr, &ptl); if (!pte) goto out; - retval = insert_page_into_pte_locked(vma, pte, addr, page, prot); + retval = insert_page_into_pte_locked(vma, pte, addr, page, prot, mkwrite); pte_unmap_unlock(pte, ptl); out: return retval; @@ -2173,7 +2193,7 @@ static int insert_page_in_batch_locked(struct vm_area_struct *vma, pte_t *pte, err = validate_page_before_insert(vma, page); if (err) return err; - return insert_page_into_pte_locked(vma, pte, addr, page, prot); + return insert_page_into_pte_locked(vma, pte, addr, page, prot, false); } /* insert_pages() amortizes the cost of spinlock operations @@ -2309,7 +2329,7 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, BUG_ON(vma->vm_flags & VM_PFNMAP); vm_flags_set(vma, VM_MIXEDMAP); } - return insert_page(vma, addr, page, vma->vm_page_prot); + return insert_page(vma, addr, page, vma->vm_page_prot, false); } EXPORT_SYMBOL(vm_insert_page); @@ -2589,7 +2609,7 @@ static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma, * result in pfn_t_has_page() == false. */ page = pfn_to_page(pfn_t_to_pfn(pfn)); - err = insert_page(vma, addr, page, pgprot); + err = insert_page(vma, addr, page, pgprot, mkwrite); } else { return insert_pfn(vma, addr, pfn, pgprot, mkwrite); } From patchwork Tue Feb 4 22:48:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960092 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EA24C02196 for ; Tue, 4 Feb 2025 22:49:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADFD16B0099; Tue, 4 Feb 2025 17:49:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AB6D96B009A; Tue, 4 Feb 2025 17:49:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9311E6B009B; Tue, 4 Feb 2025 17:49:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 75B676B0099 for ; Tue, 4 Feb 2025 17:49:45 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 332C11603EA for ; Tue, 4 Feb 2025 22:49:45 +0000 (UTC) X-FDA: 83083755930.18.37CE774 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2054.outbound.protection.outlook.com [40.107.237.54]) by imf10.hostedemail.com (Postfix) with ESMTP id 7480FC000E for ; Tue, 4 Feb 2025 22:49:42 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=gXTmgui7; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf10.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.54 as permitted sender) smtp.mailfrom=apopple@nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709382; a=rsa-sha256; cv=pass; b=mwS14YkkhIqy/EOsiEHQNzAiiV7Kvi1AwwEZNj6JtYSVaAuEZ+3Qjh58j4CrM9eRoBllMI GinVYf4QcmcoSH7DfRBnJtVqUsyCsWTKhT8rOwcrTfsr8NIAV0y2GyR3vzq9vTMFqqIAww WrNrzeagDcnUwqYhlY/egBVmwRyd73A= ARC-Authentication-Results: i=2; imf10.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=gXTmgui7; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf10.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.54 as permitted sender) smtp.mailfrom=apopple@nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709382; 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=e6WP0V0fQJGdhyfUMNqOTpvbS27WzYndIUFVUJH5QuE=; b=ZORA41EmuPCulkyHI0V2OJEMyVSAf/BFe6crBFpC2o9eoCDdRQtO1+lizQCFykGF7MReBQ fFwZGeoRVyLIkJqPrUU6UhlEIPz4gePRcZmb3D6tFiv96GRorC2u6I3kDK6z35PTVna2y/ 32/qe9leyicUx4VBIchquxVgne+BTA8= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iXOiQlhJVE8iJBa4x7CknlX/wHsPUUbE3CdZiAMfrfUTjoekirAWRRf5P1gxhkPvig6Z/g37rFBxD6qd6ywWc7lDKwP4Xl7SAHAzjJE93vercAJHmNovSGCOB/M7w13ZwalUx0XxsgVkXE5NLEHtz0vu/t/iBNjf/tTgo6vppPoLLzEgsLCPj+nV3RvqZrbqPWwUzmAjkABcVghN26ze606fUYQKBRYewPo3azw5whP9lriLPAFaEiVobkLYIBCtyrNSJbt/P31zCMCf6QoED8K86WtdQmLZSyglfwnaDAcoF3XZoUfijddU63pIJkx/uZzgjQIJW//7XdVtvuSzuA== 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=e6WP0V0fQJGdhyfUMNqOTpvbS27WzYndIUFVUJH5QuE=; b=ozTwsi29PwuBntF3TSl2d8tkcB5NvfNKpN2S31ExLl4bIhd/0mDDjkisN+a3HDq4plMz3k7ToCKzmWhQiA9aLrvD+fJlHOSMn/umsPAePx9u919qtgM8oFcYRNxDzIh5AfWxUxgeGr78LF0pnc6t7Byl6zJr65Lhj3NtnjAL6MSqg8HNP4xj3urXgv4K2Rmr9s2vqMbzhcMstBrniB/Q5WRcMUDs/VUIcFS0zPGwF6XsBRI+iAMX4/iDodZZ5iPqdRZT1V1HfNppI0HgQgrftlsocdxFaDvL338uRtMrhbutvbSQ6JHwhulX8mCBQIq0vzbP6KIWMnKGSZkGBQjBEQ== 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=e6WP0V0fQJGdhyfUMNqOTpvbS27WzYndIUFVUJH5QuE=; b=gXTmgui7TS5V+4eac5reT/8yloL4oplajehNqKzIXySOm+ZU5oyVpMqwCZdLRgqPv4lzp8syeuPgWhMOy1S2wc3RHZYrmO7nG5B5x+aG9tQcnyQeP597FIPuOg30b/Ch0pTshrRAStHYavkoLwEMcUIOA//54gE53DAj8dkxe9CvVDVW2ObQpnXHGrd7QryR/ympY8Kayfmz6iaPm5YfTc3iDc+uCDIq2AC3tpQnXNpQ0Cx0cuHKi2FxXS31VYth88Q8XFm6Q7PLdweBh1aKyNeuWK87fVz98MKonPGZcwlln0Ew93L4+VX34zD4PZ6NYWq6HchUwq61Hrr15ifGXw== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB9027.namprd12.prod.outlook.com (2603:10b6:610:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:49:37 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:37 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 13/20] mm/memory: Add vmf_insert_page_mkwrite() Date: Wed, 5 Feb 2025 09:48:10 +1100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY6PR01CA0117.ausprd01.prod.outlook.com (2603:10c6:10:1b8::18) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB9027:EE_ X-MS-Office365-Filtering-Correlation-Id: a9260066-97fb-47d9-0963-08dd456e339b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: XlVWqFmpFetrneddj7Hj6L1kWwj0LF/ZBgxsGSHc9+z0XUwTs25reLvf30x3TPTtturg5Fky04366+KVy9gFxmyo7gxpuSE725L+vAmdYv7oV6/WKM4o99a0xIao7dpGPj+pc9VlvDMbT1pUZxUyc8tzaSd3HlqELTYUibHtGXwbLsLqhCkn81AArF1LEUp2Ecy9V2brK/ieDoQZ1ziepusKiQFx0ver9Wc3qlnqM5afKr8uwJyy1cwb6A5p8m0dMvL9h68wc9TAuYAv2CMVYBIoTxQsfGcmUv8uYcB1zsr/ulFVFL7ir4tvIgaNCNQc80f8hCcTqYq/4d4avG0syDta1V/1n6/PP5L/o91jrUmBCsiewF3cy/vkkosaGj8v0OCUMrTtu8VYWhdPA5sHOtTAEl577ouP+wtZPg07vHIQsCINoFX1vFJsdtASVbd5MY1/VwAhvUgn0cpFRAuIiKFQYYZM1iozRrnsjTW6XZbZCSaqpxJmbnYpXHAk+sCHougf0UT8UVhPqs/edlUV4eDv7byvdFRtSakQSiNMT8hS6WUrWoUfJS7IFqCCl0r3m47Nn6pv90hWzEGwczvv9TCFgWb77R0m49+l2ZGoySzmxLsN9yWJtdUESkvx8kZQivsD6DvWhDz8wvXTIDllAmJl9n8nVm5YcE+x1lszxZ/k7fll1HtmfBv2q/37njWXP3xrg9BFt1EoZtDDqxm19vNqC+ypLXS6kMWDlsPCA6AWEVv32RT6TeX/npjW2ouFVwttYONbtO78R+FqIXK8XQU1Rik/p4pixp/mrlGinmyA1A92nZTm2otpDaJSfHpTzVhHz12sxhiJ4xd6TOYNGChi+xkywrzV8izTxjeXNeyQ4ldqwLY3TztJkxWREq+18FMj798gQKs4iOBVP8fMdLPjLT6DwdXbhr5RiE3Ot2DqQbIknegdx4tOGXw97tKIvkIFkCtH6dFe75n5v5LQD6X44THPM1YoOJmh2e4TWs97jHfU7CEno4MeCYKqQrgikn8BiVxX4ekSZFc5w5pUD/mZFMU6uDM97xPE+h4DK+j4sFU9fIF8ezxRd7SrGfrz4BHgzODJ0sekOnhZrrKevJ3LTAtXudmwza3EMS1Ygn6Li8ePZxhiUBcsxwIB5zStcTZVafelMiyP6/qx6nOdl5PZZjvWUG7e7aGMA4pgMJFI40kbyUJiuTAONeSEvJteTm21+20rWaXX8aVT0yKnlKdvXCV+x8CA9UBgLGvGqHqmn9/fV0CbM76LAGp7cf4QruJ3pUs6SyRlI+mgIRo82jSe7RGwOCy3xnUEIPCXJGnjceCvKMFAlNK98rll/8JDt9AOrbB8zvWUztLnYhu5nBuqMxJEg2tiGqmYA+RZW46Yh6fWxu7YHxmhhpmVvyel X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GxTkNFKjniDzrFM/6jGqpaPzSGAfEHU2u8mGkxqtuog/YaqakTO5lncdR621Ui+zsz6hVPdFBdvoV+vUbOqiEbKssyvRnXIvDpdIwbZtAn2AuXzV2R//libCbFV935LfLES2i8AfoHLI+8qwAkqP+9WImP0+o+TzPbEQ+T+5Yo8S7wjaziiXODLqn9gbQrnd/GMlFKcAt46Mw8oahW4icw5AHHofY+2sWmLZe9AmvTO+Sbcx4MAEX5gQw2hL2xNXkjUuZ2uPwWX2nPjWF+FxQmDkg5D+qB3WJvxT7vV7vHbC7WWNw6jccJND9bEUg9VFmkVZ1oZwLEy7cHhnMaZrKkS2H21gooLo8llGC5IJrr8fvSNQidkErQExPO23Fk3aIxn3h6XYG/+zm0cs/BgaT7qzBuZpwo2pnDEMo/IlXUOttS1BqMTihHD9BXP9HI+wDuAzCCaRYNRGmL0AfscLYiU6qW8CfX97EElIMbPvaGlDcUhl2j8ljBCvOPci0uFdgo4Ktzk2aEFDfUwZIz4nu0kp5pnyTVxjRd2+4/Cs8lJrTXuYNXRLWO4ZN47ZYNhkkBQ4W7/VXH/C8+FEvVBHd6SQs+aLAV+I+5ThSwJ5ja6TZGWByQL6RLAJtkhxZBBy1cSk00KMAYGQWDNfgctXupPs3sgW7ChrFgsKQ0Yo97RAY6uyTu+DwIF2cD4MzMyJ09McvWsOvV6E4Y7GcVY4X7o9Uf/hlKz4Fgy8B/N/J5hY+qdc3a3HIIznDXvLV60GqwuXDQ7rII8kFOo1GLRsdjPs131E2d7wH8K8/YqaKVzGzTFRN8Ep4I7rSTlIFl2dmJAkT3iFmaHlX/ARRxx9H4E+8CN/VHGDV5icIwpxHmcP3Vr048x9+SXzPSetB/NkFWMkJyJl14rDGzXCUu8AGOYU0kr6QUIFRa3A6NTW3UIWi9MM263bwLmg33jab7nW5bkD2icLfJnrSFhMPKrRp0zgUSTpPJMQiiyVMG6oInkLY2yBbVDs2b5JbgMWnKeKGndZN5sqIlpMu4oWx/p3+8Ylq4hSXZZcadX9P6t3zERJJAlnG8DZ+Hwh6onnoj2jhUryR4MnB6X/Eep6CavqsS7N2n6eLsg+HUtd/oEzIOxLS3Ec2CZPW+rt5ZOcBQg2r+7Sb2vjI02vpF9CwRUcLAe61HRjYW2cLIklD0+bVL1K1pErGN26jjFiFccENA0Gos5+uGnYdkq2S4xZhcmIL10OJSwszkgS0NQQsI+SWjmycNLyXXLaZ2zBJlKfcgq3LuUuwFxFSWZMs2+0jHo3Io6G38/h8BPW/9aC5fizbxI4LM6XFim6IK8/eCk9l9aHaCk9BkjnuSy+r87DyyMi450mDk18vh8L6oBsc+bb2KfQHoFb/kyDvCrgEhkP+sQ/JMxm34j5fONYZ3oeHIB2sIFARThBAsmBVW18SzkVQegSLg8JGCh6HeRXiKYXli7MH20beyWYtUXJc5VOPdSmlb8Y3Vguzep/t5YEuaOw+ZGKeUhCy84z4KbT7PwjFnS0N3HUg4PQUx888eXDfrXvwWqAVu9iw0tg1Zb7dL63sPq5EJGX/1AY+hSbBqgGNtVa X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9260066-97fb-47d9-0963-08dd456e339b X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:37.4758 (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: V5DXHCVub0jaqxk38j+Xo/3i7tM7evtV0ASYEHdn7qKjYjWu383PPbPoPCcfC6uT0KDslZpi/GAdcqoPFg0A9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9027 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 7480FC000E X-Stat-Signature: kteq5grg49urowbiij5m3xiykfaz9a7s X-HE-Tag: 1738709382-44877 X-HE-Meta: U2FsdGVkX18pUW5wxEPzH41GFYpAhkd+i9pYmUI8TNL8P3i2tMX2Noy4PyW+ipygw6TEPwRCSNLnpAEaPkHR439IjaS208Am8Bbz8ER86QeGs0DlQ+eRIvL2RwJWnm2pWOFI1yNl7bTYdEI8eFffmwGUDyNnCebMFeThToeVehWI8OvRxyTAkPQuLNaM+ZFgvDAFnxPg1awSJnpesp7IZquf40CfQE6QyTZKOjmS8R99wowdCx85nmmU/q0vs3EnOtsM6E8pXbGO4pOTAHTzqOQfqcMLHGHMJTg3PiHB+7SfXGvVtLNzzlax3/+UylgsPkcdtF4MoGxjPr6Mr6vNMWYkZZIlud9Zq/3gfARaaRom6RSbbAZdK8dUtmXchHQFQjhnJeD6IvsuP94a1id7tuM2O0o5MsCfaLkBI4Qm72aNlAtgZVsKeIeD4O1Getg0BMgD3BBnjhYZkVBzAQ6/xtbmU71VkC007Wbu9k8auY/VF0AVM42COlf+v6DMzI4nIRAnxgPL80AOTKDqjzVlveK9Pi2b5Al3MCzVDaFvOjcUNWtc0R3ji2ah5eq6QIOih/7H2ZHJgfhs+BAUDKFeEYwgjWoL3pFZ8HydY86GX3TxURqTJVNk/UGFTNwlPq2qvdTKrD+uzKoY5tN2kcQnEA6KFrj2yitLwnip5B2suTtseW+mYrFY5hWtX8zeFBaussFTpH27Zgq27Ajdn1hJdKqTz59NVHSyKGh6NK9Q30zyNCI4/f6haG3BrkKqY6/xnUSxYFUqbftHgmONssRcnvt95B0KfxfYTXbCE6rulD+6TywzuDQprJ7g2ujptFfHuPTFV2jG5AcBvYBY1alqcXaFDnsUicqhc4lEMGuOSuOC01A9JUZVgXt6E0Yt5Aauf744oSaAzediPuDwF+EGtjtLtHVqhWNdgw+KTWMgw5Kw92Z5AN2caW+f8UI2d659CiuN2z+Pq5ow2yLCOG+ j2KuaOB1 FUpkW6vUGyPxL03OqeQLyHrJtyTCTuYQrWU7jhEBJVnDQkYe0QSyt+BNGRanmslP2DHONATgi15yRwMHibhy7oCOH3jDXrZeX0osV5DFgGOQV8zw5yPTD79ABJxCPg61ENxD7v8Fk6HZn/+hIp4Qrlqfb1gfGW7yshSCLz1DN8eQsdzhoR2OvBEOV6dXZBmGV8nMWm8lOhxgbvWuhrvvSDPUA+vtDnVcsqvck5H+a6DCrF/Snw1spP/Q60UB0WYbOM6WChgahkzCA9reUdmS9KFu2gYqqSCMD16M571sBb6i5d2fTZD86ZJ7YgyO7vKmtJwhddHPgvnVE2pUxfRazd1KxmIrL6YbhTq0RCHAI7MTTaz+DgkeWugVFvwQR0dxKNeKQH2KqPqaghRYUqcr2XCid5VTtBAMVCeHGjrX7iRp4yKdI08q1xO7ASC4JHY8VNpDysF6l20DlJGk= 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: Currently to map a DAX page the DAX driver calls vmf_insert_pfn. This creates a special devmap PTE entry for the pfn but does not take a reference on the underlying struct page for the mapping. This is because DAX page refcounts are treated specially, as indicated by the presence of a devmap entry. To allow DAX page refcounts to be managed the same as normal page refcounts introduce vmf_insert_page_mkwrite(). This will take a reference on the underlying page much the same as vmf_insert_page, except it also permits upgrading an existing mapping to be writable if requested/possible. Signed-off-by: Alistair Popple --- Changes for v7: - Fix vmf_insert_page_mkwrite by removing pfn gunk as suggested by David. Updates from v2: - Rename function to make not DAX specific - Split the insert_page_into_pte_locked() change into a separate patch. Updates from v1: - Re-arrange code in insert_page_into_pte_locked() based on comments from Jan Kara. - Call mkdrity/mkyoung for the mkwrite case, also suggested by Jan. --- include/linux/mm.h | 2 ++ mm/memory.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7b1068d..6567ece 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3544,6 +3544,8 @@ int vm_map_pages(struct vm_area_struct *vma, struct page **pages, unsigned long num); int vm_map_pages_zero(struct vm_area_struct *vma, struct page **pages, unsigned long num); +vm_fault_t vmf_insert_page_mkwrite(struct vm_fault *vmf, struct page *page, + bool write); vm_fault_t vmf_insert_pfn(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn); vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr, diff --git a/mm/memory.c b/mm/memory.c index 41befd9..b88b488 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2622,6 +2622,27 @@ static vm_fault_t __vm_insert_mixed(struct vm_area_struct *vma, return VM_FAULT_NOPAGE; } +vm_fault_t vmf_insert_page_mkwrite(struct vm_fault *vmf, struct page *page, + bool write) +{ + struct vm_area_struct *vma = vmf->vma; + pgprot_t pgprot = vma->vm_page_prot; + unsigned long addr = vmf->address; + int err; + + if (addr < vma->vm_start || addr >= vma->vm_end) + return VM_FAULT_SIGBUS; + + err = insert_page(vma, addr, page, pgprot, write); + if (err == -ENOMEM) + return VM_FAULT_OOM; + if (err < 0 && err != -EBUSY) + return VM_FAULT_SIGBUS; + + return VM_FAULT_NOPAGE; +} +EXPORT_SYMBOL_GPL(vmf_insert_page_mkwrite); + vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr, pfn_t pfn) { From patchwork Tue Feb 4 22:48:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960100 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04243C02193 for ; Tue, 4 Feb 2025 22:51:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 871EB6B0085; Tue, 4 Feb 2025 17:51:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 820976B0089; Tue, 4 Feb 2025 17:51:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 626566B008C; Tue, 4 Feb 2025 17:51:26 -0500 (EST) 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 3C5796B0085 for ; Tue, 4 Feb 2025 17:51:26 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C199312023D for ; Tue, 4 Feb 2025 22:51:25 +0000 (UTC) X-FDA: 83083760130.05.A5B37D3 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2079.outbound.protection.outlook.com [40.107.237.79]) by imf02.hostedemail.com (Postfix) with ESMTP id 0182780005 for ; Tue, 4 Feb 2025 22:51:22 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=jm6YW8nr; spf=pass (imf02.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.79 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709483; 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=eEal2QhpcZUA8+Sw0W5QaF/SstEg/0aZ/xHzs8977TU=; b=JTYmQq/On/s7PPJ6vujXpdUg1TZ07KKVhNvQRv4JZI7IN7E2S6ljoQOdLSl6eBBSgrLFUf Wgozffg3Mem9Y5a4yqW7qcYS2FhPMlHdE10rVz2F+AVRrOVu10vgLvUDF2CFHqn7OymTgs YDfr777TlLgHGWPrfgwL6vvga1g/DHI= ARC-Authentication-Results: i=2; imf02.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=jm6YW8nr; spf=pass (imf02.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.79 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709483; a=rsa-sha256; cv=pass; b=epWnNxeAp8ilVxjn2thV7ACrzrvJBHdXEF9gDu3l8bbNYQmYyT6Hl6Q2biBqV9PMw0CLpX dcr5YMiINBiXgru34GljHmst5TjloD96JghdEWjkn14HRH1qn9C7OxkFJyvt8GMOnBBldy js5TdPx2BeF3rqXE+3b4xS4bA+jtR6c= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E+w0NoJ7VoEXB0/Ehmqoaqhv/F9vNDWn7DUrKaLabLAnlmYw15mN/ueZyPc3MVv/EPDVqmDSLDXHfmA5fWf2yQVCEkdUsvTd8QiN428UbdoJ/OZExUpzfS8m4F58B+wnGAtEU3wEPW0njCRCgktxcuEEDjHSvVVr6L0CsQa48Ul/FbpPwRkbtj3eT6JEbKJOl9W/xEuK4eSAOjkGX4jTfHi3XT+DO2o1NeabCe6gkjHon1wdsSQ8buTSxG5IfOzpvItcwGx2uDgYIiHVeGeKf/wZaDmEtI4lnr3IIJU+1XMhR1rrlshtb5crirQwQqRtypPnkEgHHp+KxoyZG7nxqg== 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=eEal2QhpcZUA8+Sw0W5QaF/SstEg/0aZ/xHzs8977TU=; b=QOjU1cX2iNMbbSCEn3pBLvjp1vhCpypcNLotFMM3VouOKhfNV+CLz4yfSFFNkVYwVuzAk9CCtOCIzx9cy48j0wb5u2lrwPpnKEt7NfXHjZJngx+GZXHJvwkGTKaUjEFr75GptUyOjs2CreAUtAY4CSeJPJPz9ScA0ni2RLUun6brw/3+69X6jiwVQ3if5KVP3FhYtjHtMCl8/tw3oXzTRd4rIgQeXsNoTrhMlrmd1vRrbUmbEPfRGIgBO2sHGI1fzcPFyZziVaicfWF9eI51Deh9Vw1/HzoXbROlA7MQRfz9ZtuM9nBPOTsV3dnC+RCA0WEnZwBAeHGKALOeKBVT2Q== 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=eEal2QhpcZUA8+Sw0W5QaF/SstEg/0aZ/xHzs8977TU=; b=jm6YW8nrByAlhiY9KbQkqhvyXbeh80OQV6YHTKBwgfMnUvRIyA+pON/nxmE2zf/S7P8ZXIKZ0gsg71sZlTORtA3reiCiD+kiWQ7vc0w69FyqSIZg3cXCDBHBkAKB2jWrZCPZ3gF/fSJCDNH0AQdktgaBgYJ2NWHoocoS6XrZfEQa+nzz8ZjcEE04tRRZrxotUfRuaHKKOpOP3J2Twe765tn0X9Xzds3u+j/sKeHpuZXAIN+EcRKPookKipMgggEDYn6CdE3CMDmfe4BvWpCLFS1PXfIdpzXARa9r1OkEO2E5Okq+xBnRG2GUTGyFCHha1kgV0Yo429+jG/PLh8skzA== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB9027.namprd12.prod.outlook.com (2603:10b6:610:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:49:42 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:42 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 14/20] rmap: Add support for PUD sized mappings to rmap Date: Wed, 5 Feb 2025 09:48:11 +1100 Message-ID: <1518b89f5659d2595bf9878da4a76221ffcfef60.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SYBPR01CA0072.ausprd01.prod.outlook.com (2603:10c6:10:2::36) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB9027:EE_ X-MS-Office365-Filtering-Correlation-Id: e7a772c6-989a-40ef-19f9-08dd456e3698 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: Th8rjr8KI/+j3VeJzyU2bNT9ZjokjiB14uPlD4o5N1nVcO71wq5inoxCnopdJ2cf/Aw13ZU18VIIl12AOTyLWkw1CiDxdgTbsOMpZQrtSnP1FLJ0lAthf9bQvrNoAscl8jXtsI089OJFC0hmwe780zsoA9aUEDcRHHQpIJRzaL7lF9qgXkVmjsTY1Pxnz79UqTelqA/3s7Cjnr9QP8kmFtrFHFyGcJdIikQwfsf+4E9L1q60hBsPYya0WFan1g5WcUX4zJl6wLe2m89/N22tyjqrs+Ax3a4D7851rCnQ9NmBbEg4rbVqp2dDz0HUnFI72HYX/RXb13FJ6FjXYxPW1XTwixxEt6A0sD4hDZ0guPyq5hBFTlNkFRqvpDzNrGp6Rn5n37WPF3BLB3TJ0gT6JEFRmFK50VDvJ+5KOxvPAiYr6VbdLLsLeLIjnR0igOUiv21IZea0qSPDvzy+eUwtumwZdwyweHP9tvUCnd5NLoMiWu96TFLHSTQDtm4P5+ybUOdVXGOXfYnzNihwh1S8KWWM4zqF+QpYA2i6Y1+znxifki0UzRImm9gO+4C44uFzhZZmkWfFGB/fJj9STBAsb0HSwJInF1N8vddUjblmAk2oSDywiW8LdaJexsbyeBfyR1zm9uk/8SIAX/Y4jibOdskOG9ublZNO9hqD0zuwTUPWfYPgxf3h2gdOz0Brz3Js68WIo+b+fKpZ4tn6NAvs1rzY2/qxFAcymLXSGbCRsuFNFZmapUx2dyiDFbNCow7Su2Nq/aQBczMFoy42wu9uyIwemwVYASRSDB/Sp3g7A6fl2ShMtI4bsUovVDiRFObai9VmMFvi8t79XW9mdVLc0jdIsnmyXxzhQDzgveGbOwL8dLgQGwds9ekmaGG1TspdANmLsPCQEo7XOLFaSR643MGxulM8rk/Dr9H0pIE1C9AzV1n78KlRU9mNLw59wi+CL31pzUuCkrE6wzCKXw2iDz/nc8ulQyDj2usmDA7RggIbyj7/IXhqMfAOP8+QB/+3AtvPqWLcoyelnHETAOAqtWZn8BlAgiegAqrRUoQEVeM3miFWhSx7vB80V7AeviPWlaSNjq7DX291INp/00BwE4SAkJQlttf7exa2UxqqiDQ33tDoeh/loz8WW1fLUDQmLcnY8AVqNlZTGC+09PEEyTG7TtTuN0JfTUm3t1B2qZ1SPIbbSEr+kjcSuG87nTGR2JMAmA1U8Tuo9/r2C00GT+eTu+SzTUhnU26rp/QH3N3h8JjBBCgE/ZDMzh6PRo9M2d0qyw3fpwlvv0JpjW7P0z7sd32dM2s9CgDbPt3f/joRQfY687hXQ4c7UOztjwVGCyxA2zjIeZ2H43t2/slWVb37+5HdFFSdhWZRMfiYSCSe8lCFtUo8N/VnKi2C7XSk X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E34Wt4+tZEPtsyjgwV2/+cOUzIMg/flPWowKiI04gwXhmqK3j1+NZzbhvK8qzxyNWdDyz+rzo5uKXhJPHdRAi272G/aLMnmBVHOmvhDkO6sI5HHiPPZFubCcmPLtT0Q8A878+wCkoRKk/4zq+l05yJiI0XanEJAUBMDz5CGVYOh2hJGbBH36tcX68ksKttrW3jMjUYsDnScDydYlnwyqOLsh5Ri65BvTKNhJqnjFhcjmNryv1+6NPz2N3jyuVQC1pw1c3zjuyM9p/yNIjdK/Vx1SMDG3tQykr52aX+NLzOnQOFRsHV5eiTT8ANKWJGnOYOhVKnekR1Wd8ENHWpjlULyguRHdLBvCHrC6ZjQC3B5euFm/Q9kNjbzdf0ZER+xAwaHlJtXMumKePOmjfxPfwqfqXoJ6sXJre4F4U+VCpIB3KcuyZE5KEXYFlRSuw02exbfwZ69ug6B5wRYojskFBvi5RbSDNAzO460HEMlXveHI3OhXqm4Hic9pkcWAwWB0l5xRjseRUeGBCWCCrnTE4+IOcaFfsJ0/+cXPWOiPLfpUo4822UBFLKBrhNPxu5eRHL+cKr5Yx1/Bsp6yn3fOGuibqyGWFyaiNZmIvo/T0B4/BtLIDYISbzVdbgtNixGpsJ0i4zkDZ8qWcx3Cs9UWKL3AMVQhoz5QdtBAbkHLAbw919qSjDnMVaAi6S2/2tuyb5qZOUC7bWQ1w2Jm8karyH89yZN/htLGLNQI14VtX96JmVP1Qpyl/pWbS3OTnddrywBN8mVLqXkMUUCStmbp+Av2XkzPzZCoMXKAgQcx3ftefN1eVHfnQLkeFc77gAHS28E+HBc7Y5HO+Qbu5N003WOfuid3RAYg6oW+2bFqFgoM71EhhRb27TdCM6hJznE8SsycduWWsRO2aUDePG1j4BbX+wU4o+lvvojAwnnyEisIEkVs1sATL5MRziyw8fM44nVvZq7mF4f30M/OwcjO1REqtLvNF3bfMYKkflzyXWR2bjSRyjx5wtUKTCUsUZwGDzN7CkceyJiik8W9Y6R/gMj+FryBWnM0AJKbfATLiwSkgV9beAE8wlAuc2tLKcniNjRwlINqzHkPN28VdNSp49xazgSFuUmecW2ejmDa5NJDcueqBut1kyxmLnkCb7RFEHPwRMNua5/0QRs9+pcr0aUMgbK1/hFD2tBc0M/J7olhkvY7obr9ZiUcGz7FPOB/oG3rjT6il0zqXs5F2CZfIcPBT/IGEpa/iEWlUc9CTozImJgHs8lay4nMw2jdev0W69Uy+kFw9Dg8EUo01FIdY9ashyLZAIUcKyiRAtCoVxIWcjrAv6w/AMLBlyKlXC0zuaP/bPfMA2Qq9lhFumoywra9TAAEOHVA0gyCSgwQC8lUH22nOe6ERld8FMJ9z3Rfi+Rw66C8ssHqbrvmdnTPvbxG1HCgNcYJPDyw74cX/HKT3bqcEFvdcApsKkSTYX+SRvDcfNKNFkbs3guMQ6t0dIMNr0J20AEPeN14PZi0BKUAOfnCJo+sgbU+CqUN6Nomu/uYykXtJVGlJ+Y82/WzVF4sFGYCBHhuM1pDUVak6RDyQdJiFfusH6Ud2dKfQEzJ X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7a772c6-989a-40ef-19f9-08dd456e3698 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:42.4451 (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: LyIuAARsG8hSHyZdyBWDKVgnNtpu3oon6iXFCOXW38pbb4hEvxjSG4sA9PCFjITv4vRYe77DtIdzDDhxezX1bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9027 X-Rspamd-Queue-Id: 0182780005 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: pjii9z7p8jhpdrq449nq64ns6raycgkt X-HE-Tag: 1738709482-972028 X-HE-Meta: U2FsdGVkX18pVo+8eV1c32UEZ+mi3KtaNBFGpz0H7Sedz43yyEXUvvdcXmAEpW+j9W9Gk9Gxiw4MGwkvJIVTR95tCphYiUMo6zv3weWOTR/4P7N2NtZ+PNaYme1mqyzv8LAKb21aVWgSfVrk3tzQzQ3U+qGGyq7fvtiiFiqKD6W1AmjpPIWwEbVsPM+9JapdAsZiZkcf6nx3g3UD/Q0nZwtoZb92cGLEfQ59z9j2K/8PbXsvDAa8U8l8ft9bVMRkAxgWYPBO6fT4rpk5e6d9fiqNR2UfeGS6xA/0/vqQChuss+pJgc3CIpJ2xA4yn3aQ8tmaJILhgB0njq1CvSrAGeq0/z2hyYcI5eePEVQc3MoZFdsh0dQJAk2vRTd6Nd0j/5O7jfEK9UCkKbHxoZTWonxBhFFrIuY/aCwZmeLkMRb4GrJff1v1DkHVvo66IDUCz14WIhYYvS0WeiWHf2NtI/CWGWV5mZUWXpdbi5ejqttSYPt9x7wi7YtM7FJqcJDa6Pt3y8cO3ek6irx9RALJP51eAzVGTVlO7OxB27RuSJNH55aKv5kjR1yXJNEDOgWUCUV3VQCPjOagtL+xrOw4tcXSyxvZ1a9JIp4C4aFOVmcaUludhYeE2tnRBYsQ3motGt2TX5YUBaATegQWqNFeLXAK+pQcZvPzc9Lq4RIGI6uu5+F+svRMagxbC6l8G8YvXg6V9umlFVLooSqQq9mHFsc5XCCpY5OTta2zGAGIU0SaJrRZEOiEAcdBPNlqjaHC1o+KV1avN+zY5WXSbOytWpmF91LorZTpylSbaazhaTIb4hiL4oG6cWmcNmhsZAzTkgaWDO22roDv6H04gfW7zzJmZtFBko7IqknQQlEPffY9dfn2ypQBKyfVeQBfX9HXlXTbRItRtsQ/9OYm9abvWGeXZJPs0STMa51OxJJHjRfwrKarsp5bSZobv3D6+lUD4k9bR6fJIA1FTHTQVTI VQwoT0ko sBsCFyvUVsDtltYGtGqqPjAhc+x337Dd8rpeBoZIkMM53aLtgNNjWGqnD6JxwAYH1/FSwVxfGj+ebtW/+zxSgxtvCRGsiShCC318QOige6PqQ7YnJtAx0RmwhF67Yaetp0Cv9XeAie54WjynzujO1cZyyvkZo+cTe5sz4KN+oSzbNoWoP/pCarLq4IRegjMwukL//M/CINoYAYVndEWTZFlNp7gUS7uEAtYnjj2EyxRkhuc5XpXvxj3FgUnmJDqAhexXC0Q169F2EHCxn/9NF2jwA8+NZ8ZzHay6xZikyAoKVgl7pWaJ9xifySN8FJVf2Bulj/nOLeWFF+ROuzad7Tq6C52JYigq0CzRqpffuFTzF3riniRw5ejxUp14tjHF0sUSQZU39ohIAJ3BtNTfDm+PwoAyftUZPYWm/RsY/4ubpawjUnttTkIEXkMFr7LRlDAIATQr3RfAPm4M= 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: The rmap doesn't currently support adding a PUD mapping of a folio. This patch adds support for entire PUD mappings of folios, primarily to allow for more standard refcounting of device DAX folios. Currently DAX is the only user of this and it doesn't require support for partially mapped PUD-sized folios so we don't support for that for now. Signed-off-by: Alistair Popple Acked-by: David Hildenbrand Reviewed-by: Dan Williams --- Changes for v6: - Minor comment formatting fix - Add an additional check for CONFIG_TRANSPARENT_HUGEPAGE to fix a build breakage when CONFIG_PGTABLE_HAS_HUGE_LEAVES is not defined. Changes for v5: - Fixed accounting as suggested by David. Changes for v4: - New for v4, split out rmap changes as suggested by David. --- include/linux/rmap.h | 15 ++++++++++- mm/rmap.c | 67 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 683a040..4509a43 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -192,6 +192,7 @@ typedef int __bitwise rmap_t; enum rmap_level { RMAP_LEVEL_PTE = 0, RMAP_LEVEL_PMD, + RMAP_LEVEL_PUD, }; static inline void __folio_rmap_sanity_checks(const struct folio *folio, @@ -228,6 +229,14 @@ static inline void __folio_rmap_sanity_checks(const struct folio *folio, VM_WARN_ON_FOLIO(folio_nr_pages(folio) != HPAGE_PMD_NR, folio); VM_WARN_ON_FOLIO(nr_pages != HPAGE_PMD_NR, folio); break; + case RMAP_LEVEL_PUD: + /* + * Assume that we are creating a single "entire" mapping of the + * folio. + */ + VM_WARN_ON_FOLIO(folio_nr_pages(folio) != HPAGE_PUD_NR, folio); + VM_WARN_ON_FOLIO(nr_pages != HPAGE_PUD_NR, folio); + break; default: VM_WARN_ON_ONCE(true); } @@ -251,12 +260,16 @@ void folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages, folio_add_file_rmap_ptes(folio, page, 1, vma) void folio_add_file_rmap_pmd(struct folio *, struct page *, struct vm_area_struct *); +void folio_add_file_rmap_pud(struct folio *, struct page *, + struct vm_area_struct *); void folio_remove_rmap_ptes(struct folio *, struct page *, int nr_pages, struct vm_area_struct *); #define folio_remove_rmap_pte(folio, page, vma) \ folio_remove_rmap_ptes(folio, page, 1, vma) void folio_remove_rmap_pmd(struct folio *, struct page *, struct vm_area_struct *); +void folio_remove_rmap_pud(struct folio *, struct page *, + struct vm_area_struct *); void hugetlb_add_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address, rmap_t flags); @@ -341,6 +354,7 @@ static __always_inline void __folio_dup_file_rmap(struct folio *folio, atomic_add(orig_nr_pages, &folio->_large_mapcount); break; case RMAP_LEVEL_PMD: + case RMAP_LEVEL_PUD: atomic_inc(&folio->_entire_mapcount); atomic_inc(&folio->_large_mapcount); break; @@ -437,6 +451,7 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio, atomic_add(orig_nr_pages, &folio->_large_mapcount); break; case RMAP_LEVEL_PMD: + case RMAP_LEVEL_PUD: if (PageAnonExclusive(page)) { if (unlikely(maybe_pinned)) return -EBUSY; diff --git a/mm/rmap.c b/mm/rmap.c index c6c4d4e..fbcb58d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1187,12 +1187,19 @@ static __always_inline unsigned int __folio_add_rmap(struct folio *folio, atomic_add(orig_nr_pages, &folio->_large_mapcount); break; case RMAP_LEVEL_PMD: + case RMAP_LEVEL_PUD: first = atomic_inc_and_test(&folio->_entire_mapcount); if (first) { nr = atomic_add_return_relaxed(ENTIRELY_MAPPED, mapped); if (likely(nr < ENTIRELY_MAPPED + ENTIRELY_MAPPED)) { - *nr_pmdmapped = folio_nr_pages(folio); - nr = *nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); + nr_pages = folio_nr_pages(folio); + /* + * We only track PMD mappings of PMD-sized + * folios separately. + */ + if (level == RMAP_LEVEL_PMD) + *nr_pmdmapped = nr_pages; + nr = nr_pages - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of a remove and another add? */ if (unlikely(nr < 0)) nr = 0; @@ -1338,6 +1345,13 @@ static __always_inline void __folio_add_anon_rmap(struct folio *folio, case RMAP_LEVEL_PMD: SetPageAnonExclusive(page); break; + case RMAP_LEVEL_PUD: + /* + * Keep the compiler happy, we don't support anonymous + * PUD mappings. + */ + WARN_ON_ONCE(1); + break; } } for (i = 0; i < nr_pages; i++) { @@ -1531,6 +1545,27 @@ void folio_add_file_rmap_pmd(struct folio *folio, struct page *page, #endif } +/** + * folio_add_file_rmap_pud - add a PUD mapping to a page range of a folio + * @folio: The folio to add the mapping to + * @page: The first page to add + * @vma: The vm area in which the mapping is added + * + * The page range of the folio is defined by [page, page + HPAGE_PUD_NR) + * + * The caller needs to hold the page table lock. + */ +void folio_add_file_rmap_pud(struct folio *folio, struct page *page, + struct vm_area_struct *vma) +{ +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && \ + defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD) + __folio_add_file_rmap(folio, page, HPAGE_PUD_NR, vma, RMAP_LEVEL_PUD); +#else + WARN_ON_ONCE(true); +#endif +} + static __always_inline void __folio_remove_rmap(struct folio *folio, struct page *page, int nr_pages, struct vm_area_struct *vma, enum rmap_level level) @@ -1560,13 +1595,16 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, partially_mapped = nr && atomic_read(mapped); break; case RMAP_LEVEL_PMD: + case RMAP_LEVEL_PUD: atomic_dec(&folio->_large_mapcount); last = atomic_add_negative(-1, &folio->_entire_mapcount); if (last) { nr = atomic_sub_return_relaxed(ENTIRELY_MAPPED, mapped); if (likely(nr < ENTIRELY_MAPPED)) { - nr_pmdmapped = folio_nr_pages(folio); - nr = nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); + nr_pages = folio_nr_pages(folio); + if (level == RMAP_LEVEL_PMD) + nr_pmdmapped = nr_pages; + nr = nr_pages - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of another remove and an add? */ if (unlikely(nr < 0)) nr = 0; @@ -1640,6 +1678,27 @@ void folio_remove_rmap_pmd(struct folio *folio, struct page *page, #endif } +/** + * folio_remove_rmap_pud - remove a PUD mapping from a page range of a folio + * @folio: The folio to remove the mapping from + * @page: The first page to remove + * @vma: The vm area from which the mapping is removed + * + * The page range of the folio is defined by [page, page + HPAGE_PUD_NR) + * + * The caller needs to hold the page table lock. + */ +void folio_remove_rmap_pud(struct folio *folio, struct page *page, + struct vm_area_struct *vma) +{ +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && \ + defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD) + __folio_remove_rmap(folio, page, HPAGE_PUD_NR, vma, RMAP_LEVEL_PUD); +#else + WARN_ON_ONCE(true); +#endif +} + /* * @arg: enum ttu_flags will be passed to this argument */ From patchwork Tue Feb 4 22:48:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960093 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id D594EC02193 for ; Tue, 4 Feb 2025 22:49:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E7FD6B009B; Tue, 4 Feb 2025 17:49:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 698326B009C; Tue, 4 Feb 2025 17:49:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 512D86B009D; Tue, 4 Feb 2025 17:49:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2E3D46B009B for ; Tue, 4 Feb 2025 17:49:59 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B47511A02A9 for ; Tue, 4 Feb 2025 22:49:58 +0000 (UTC) X-FDA: 83083756476.05.93A0A43 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2088.outbound.protection.outlook.com [40.107.95.88]) by imf15.hostedemail.com (Postfix) with ESMTP id EED32A0009 for ; Tue, 4 Feb 2025 22:49:55 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=TSwwKVID; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf15.hostedemail.com: domain of apopple@nvidia.com designates 40.107.95.88 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709396; 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=dAG2pC4wn34w/IYDUy4du+dUC45w16AMiF2TUnuqg9U=; b=7/t2mvqAxTTqOHU3Um8B4r65ZgjSMMDsKDlEDWGXFdvYYtw57EWMQrGSkHjHw/lRtfpTrx Ea4581XyNoHS5bEbi5nrB0pQ9EIT2QOpOOYsFwvTWl2hbxRmBF70IVcgBPdVOQJGgNBZVZ bQQP83Rm4jgyRT37AGQzedmlzDocSNw= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709396; a=rsa-sha256; cv=pass; b=L7b82Pm98DuRmepljIz2RK/SqtTreCDts/l7K+D2VX8bMYJAYOZT1c8W/sNhR/O1EeVoiD 9d6O9QMuXs7N7hRcjiZ/VyUlmA/RjbMkm69kRrMW1HHJfyxCsiRT3IN2RiJXHZ92MzK4BY giH/WRDrKWMbogxoH6LDX+5jztpxOhs= ARC-Authentication-Results: i=2; imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=TSwwKVID; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf15.hostedemail.com: domain of apopple@nvidia.com designates 40.107.95.88 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m5shDIP2AUDF91U0yODxYNe4TRw2vLF2atv5TSm4HoZsLWib+BX1EqJCZmZNorYB/hf7iFyYvgd1/+6Fedi+ZOZAMu1fdmHlOu7Zyz835HyfrySKop53BFHT45CbdTCyHjEC2XV0ItuPg2zhtnuZys/KaqbNlBkYItVeDgaQIvCjPHolhzSKpp5Y5O9gE3oIuz3XuhytKh5KgqhmO0bjmZwoGUhY7HFJcdopkZp7jQdtYbD10+9v2BX0gouQTvxBNwqzrar5xsSPk/5V4ZvbkKX64faMFwxLqJiBMceZiNjXcjIGy7K1IxOvHQBvGt0YGwmkjfmqWoNvZz8aD38ucg== 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=dAG2pC4wn34w/IYDUy4du+dUC45w16AMiF2TUnuqg9U=; b=ifycAn7oMqgZ1gR7z7bsB19hnZfj2RH1pw/dPazCUTSY+DHm+zwajfcxprBL0yThOMImqtYXx07yIg47A7cnNRDGN9us4a2OcAS7ZP77DdX+/H892RtV+ANVyejFdN2pS3TZbnEGgTdxjEX+dJ81ZZqMBGuGVSbd1b0u4kXFvj/VZjxTHplyig/G+yX5sbX3KFvIfC17SZGxHXFHNufiVVzJcEGdvYdvlnwlImYM81q2Q00oa7NAcqXkLi4yQGoniP5+YRo/sjOsAAx14nj5Xz+Mb22e6+r7yfvWouzUS44fOxhKnfJ4gRDLeLLEOX1LmXsNS8O2XMYidRmThnvcmQ== 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=dAG2pC4wn34w/IYDUy4du+dUC45w16AMiF2TUnuqg9U=; b=TSwwKVIDPycxCG4dEpTyucM4WZtS+/WRlHMnDr6rxyxGdZ2uzSUrwbrC4XRVU1TOYczEXsJ/Ik/PJDSowHQIrexRHjeA5vBdLeCJUDwU6d5nkRt3NIjqgkR7x3qM046GSoYuWzTJRKB1b06bHoqucqAPacOuXbJyVKxxVIf82H4XZ6BgKb3kd9zPRcTh0BGdi7FJ12Sm7F4nF+MJ4SQOygavAHm9iSCGerWpmozIOQPmH99pQ57ZmwS1Mz2UObsLLjb376I4Z13MHUlqV/0dB7RXrkzdtUX8cfj0Zx0PaEcDFP1TE/Qr5RIyeK+Nmkl42vsOG5gi/WVrJudqPb5qPA== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB9027.namprd12.prod.outlook.com (2603:10b6:610:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:49:47 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:47 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 15/20] huge_memory: Add vmf_insert_folio_pud() Date: Wed, 5 Feb 2025 09:48:12 +1100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5PR01CA0028.ausprd01.prod.outlook.com (2603:10c6:10:1f9::20) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB9027:EE_ X-MS-Office365-Filtering-Correlation-Id: bbf5cbb7-c9ac-45ed-8a3a-08dd456e3985 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: AHgCqeKxkIDRJqlEScjl3mdrlvhIWjbCp880T61f/KJxhuYP28xdDxkMVf+aCiBqabw9tEeXbNzifa2YUbsLBHa/wQv5ktDMCx24MqRIzYs4LTrNuCE+QOqqpgiNbyjAkpzj/nCug9z74FVceEydGYbjKN7DMfXunHrIBw1ftL+jDlmiShcYOPL3D56J73MtxbudnZvH6gDd+Nclc4EjqLWgFl2aR/kN5gJtFIUDsQPFDj0+DEYfUvxvbxlfEKaN7kiMpyA+aQmAdHAmEOX83NY2lwdbuHAGhr7fFchLqi9XLfyzKIoOEVPZY1SRlrZyaTXU6fwAHH9rdCAVn8kkfwBJhh+49NKUsWttXoUsc68Xl4QkBAt8JWp1puIWBR4jqvBqPNMalswNItfleUsDf0dmcsuVA4qDSNut1wgLi0CyehzlphRyCErcGQP2EgjJNAjuNNqaGtyGj/CvO+AXWJgGYxvDoOPlz21TJY9nDLrsr3mYWNktvlpTIsxZs5UXb77tmTL6IurEjMBC1dQwNUUN3SknIm4w68ltJiDS2CWCKhs2cYDXreZ9rR+dLQHMrKMzgm3RjxR6DC1kRh7HOc4WbIsiuAmiFfkxeRS1+RxKJYnBdF8s06FBOuD7sfqO3XfdtJ07IdwkKwym0Fa6KgA6C8Z0Nf4q83hTJnoOf2SuBvMtCaQPWpKKsYeT7JHi+7PP6BGB3+WWBDzC/QrrY1WtWvUNDJXBEv6ZYGZLbpJpO0HYWgwBF0jY0CSs0WQiIi9nILSuznpD2JVZuz59U+8tEC8Qvl/dPzb2sYrpoxs6Ov0RqbPTYszE0OeNtlb5onGukFWTILkwN3JPJTvKg/hZ3BHKQc5mpnuFXmzSVYSvKJ6bJig8qafwnt51F13croRvf08ou2xYNfj2fgeThfzboPhbttidnfFWdjJpxBGNhJbyV5v+ggkLBYJgOiTXwvNQMLmQKKnzhwERaxq8QXcFaEhjVmY2Z0yk4FamCi6TO4INoJ0/nssJ7LPbUpla5dCRFa4J681mGi7QG05Wzf6ViiKWejjY+PlYe5oqk1Kcc9hps0xR4OkYZGCKTqlSY/f802fWaH+m7MorjVlyLp0oAFWone6r+HCjm8VH2EVntiXSGTxvDuIlr2w6QFdjxz/gEgQGAtSb4GnTcMxaM8K96U0BCeFBM5YJSGy3dOmMJb+DFx8pQl3VDpeVIhdX8sNJ8H2Cd22LPhx2XHWkUAZaX5/+55FrQ7RbXWTnRNAmAEbyb12yp+cyQsnlrf50RzoG8e9/NGiUK3/9Z8gA4MKTVvLg/hsFvLDYeZoFHnA5MMgQDn04BrUcCXJZ80DkQiLwJR8oAzQkaEXbmFk+gTdWvaPZpdP+ghXUip3jQafQIM4zMnPFPNOTor9wOXfC X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Wo+ZnUdR1YPxGk5cOlbULInci9DhTciy3Kp+vZBKZpyPC8pBBvaKC54wdnyd/Ha+/i8nA6lie9Zx+2qvrVRcc1r3XHkeQQRoRWD0zqh7FZv5KyiCTCN9k6RmYJcBsXMiam2t4q9BRaOn8L0Je+hu9qjBkbstBcJ0ZHimpS/knJPvsBxubzS9dTXQqBG2DulGxNvi0QmWvjuiyii69wFu7mewakHaFOd3MkxfUQDwdqgHvWDWTRxJ8UHL/WU5MymeVRfXWcCDwKIJiwawLLvDjI5i1+LN/oWMHLlR9EcnDbksW0HcA0FI06gzm94qFlxmNnZj7pYhUxQZM5VBryRlLBZ/018pRy35gK6o+58zxan7XfmKVSbDWOqahq3XCr2atR4CKE5M/Il41dMgZD+wnkBXWy7BO8RsQ2jR4O2/o2GxYyYoOhVNt3dsV9CL6FonbujVt8mg/sNZAm8SRhvHYZ6kMSdqurIDbihKLx8Qw2Xy1ha6mMB2XNYE22wBIYFNbenXmEcZ3I7LfYOmx6Hw7obtqthNRX9ZKOFlxJqkPg9WVkWMfyvYRsJUu0y/+rO9wGsPZYNgrEYBZO3wqZynSsYQOWC4lQXIrkFg/iKLKvZj/37GAgKdQG2ImSONrVlCDcDOYZrF0oMxjpMLiFJUpCu1Ac2QhvldPx2CQUpcOlqBq7XA64m+2ai1VIJ+JIXYQ5Ur/DOBRlwPP7OqzKc5OpOP5d0uZFVG1VpjKJcrQ8Vl7aKtwUyKME8JS1bhPFZfG7cgwiALgnMUivyDpd/60dfZqCsAUwUHh2iWzpImWaA6acC74M1OHGA0V8uc8E8bmyaTcB70DAGtk09Z6RiyimLaQjMdz6p2tt4o59VDDptwxQ7qjHvQ8bnB0AAPPXSJSJHLUXAyvrDOunN+i9+6WSFK0ayNVzWAyS5VAByymj8LPWsLbIU6V3IA1vb5GHqpvWtFss4gE4NwQWv83tTrKOUsXPKoapJjEj2sMu5armVtHpfEn9RgGRUwPkLol57AL3iBAePVUKxGPe7EeXluGIGX99jDp9AWq+9/Es/FCcA7gTFwCaOZXBDweomLcLkogAe13YBPcFpnknLdaYJ7LDMMdbdKQ+41gAXc+c2HTaqJFVJadq0N0e5rxngEHeODF+gPmQ8yg0ll7epXhMmByY8nGjEn7ZyJYQBFM9ah23Q8AiLCc2jXLtNMw07zjkF5lyMKj7NyiHnHiJacKrOw3itSG27jZEjyWqRe0he+6rJ5A5ETrAcXYrRQF5IQLe8go0vvenaoB1Wl1rlu+8lWKoND4KWD6IfMXtY5rAKHUb7IS+jD46+RNFMQPgDU1CuljLCNzrtpc29J4oZUypwrpe/wxXgdBRLw1Lw6ynbN4ljOExtbJCufv0W49Ai4JXX9kiucjWRPzpqcX49KOaRhfiAr4tUmGomruCF8IektU+dUYhnkt8Q5aiUl4EXR8bdcPnF79pzOctjUUPfFN/JbwmvduAhX+IS5aFwAMLI+CfY+mKkRiQ1DU+qVtO0SuokoAC9CLz9y2E39c9W28DAEvZvrulIM/xBWKxlPV7QV1LTJOaMYkERtXMuYvPsXK6xk X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbf5cbb7-c9ac-45ed-8a3a-08dd456e3985 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:47.3305 (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: lQpce2HIaa7/FbD5CvGwVuUCpJBUE+yOcTDCqtraarNfF0ysLkRGTw8jr5p2ahhrvpCjrGfU2x8s2Oo4tYwUHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9027 X-Stat-Signature: ccaixod7fntocykktn75bjnasobc91nb X-Rspamd-Queue-Id: EED32A0009 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738709395-501406 X-HE-Meta: U2FsdGVkX199Ci3fmw0ACznShL43orr+jktYa0znFhOiJiWde+BM5TURBuX0Jgqhsjy+OGPf5e9ga26PrS9UrzEA315cxMC23q3UCWUmC4S5nq8O281yvUSar1XiAK9K5whwgZIKJWWoiQTco0IEn+4eGN8COpSLcalG7ULMNJKow46HdC/uxl19uS9TPeQGc+8OCztX0m9/V7yNeqrGnp5eXAy9WgmadzR1uVY44cDAHR0JYci81Tk1h8L5Vg/plN+BbrhTRsLu6EPRe+c2A8aZjwdTKljHl7Nmj7NZYpZLWahLKDszHMZ5iugxblK1g8I30fwOeA4Muo3vb1WLjHUsX3WFv192QVwry1X6E83biYEuzqswd9tYhXuGvavMXffgDEFE0uVgAdjG18NofWoo7P4AM9EhMwV753pZxBmTePuJPfAsK8ZbwPax8Pt9b9sbLrdlVis3RjFmGE5VZt61UH0ZNPuXxHlD0uw+8MErlaLKP6/RwRE0661/uvhmbX7gZmN0+vqqQVGFnEjvUBKGBenOUUVGsGd7IcCEWjK49ETIrSdEP3tZ6rP5dmPTyhZhJl1UGOz2vY3JdookVBfvrZPCOvN56KEPPN85DKKjwiJ3Xu4xjMF6DIO6w0pOEbGGtZ1FPkQXB6YsHX/cnUTjk7QadySRkqg4bQY1bO4XiIE5aDu1y/f+yPQwjBP1tt5lDYx4uSIOGX2hZWlTXNHhyR828bfE+vukAOoS9R+2DZ/Yo16GSkenln/287Fp6MwFaphEIGKgQzpQb+xEdmgAJxeTQAoZC4YvbJBX6EqF5u9DGxgZMwpnOkOmYpnMzULdrCcdQqwOLx8nx+XmNlPn9ooIei8FbRgJiFZHND4g0NK8UDJuRXxfSvJojeTUZb0pSWZxi9+a2j+TIv4BfMR4CLl6OKxIWWwmrvVGE+slI/VIAlpjDJZu6BqG71gFIBEhIdvOKUqw3Xncvjc OWAa4mBi cW7768tKcs3vgSRzCfic5TcJ84XwLDoZ50mJU+kbhB5CCclUNesFPSjzwXOOyJPcWIWhxGkQYcyQef0DglvSJRLtGqKtCos+VB/2eQpcuxRPr2pCcW/NPVPko+MAu6imk1lFCVc0R9JHBjjhGLWbH0RtLSyOMcYjI5m/IogEOzuk03lPfBjr+q5TG/F252uHAwipNWYS6DvMsF1ChQSelNMP0y8kUIThpFQdb0kR04pKEpfQmU76hi1FyKBMRxgFz3iSW3NfNX2yKj0LvwPQXMQZ2lQ1QyYIAvXTBl4BabFBteeIHhP38ueEq/BNCmH865iVI/ne/C0fjgpmZQyPIgFp2Pid8UNpe1LLpBlvI72yIDz+A4fq9Q7APgPypv6gf99uSu6yJDXPhzAp0ofq4Js7d+EZYM14Yu6IlW5DPgq2F0oRfoDmQOLPSO+CH3zF6gOhPpbZ3n7NRLBvEk8hr63iUtlBkSyIYscTELXe4Hva1asU= 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: Currently DAX folio/page reference counts are managed differently to normal pages. To allow these to be managed the same as normal pages introduce vmf_insert_folio_pud. This will map the entire PUD-sized folio and take references as it would for a normally mapped page. This is distinct from the current mechanism, vmf_insert_pfn_pud, which simply inserts a special devmap PUD entry into the page table without holding a reference to the page for the mapping. Signed-off-by: Alistair Popple Reviewed-by: Dan Williams --- Changes for v7: - Added a comment clarifying why we can insert without a reference. Changes for v5: - Removed is_huge_zero_pud() as it's unlikely to ever be implemented. - Minor code clean-up suggested by David. --- include/linux/huge_mm.h | 1 +- mm/huge_memory.c | 96 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 85 insertions(+), 12 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 93e509b..5bd1ff7 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -39,6 +39,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); +vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio, bool write); enum transparent_hugepage_flag { TRANSPARENT_HUGEPAGE_UNSUPPORTED, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 3d3ebdc..a3845ca 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1482,19 +1482,17 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, struct mm_struct *mm = vma->vm_mm; pgprot_t prot = vma->vm_page_prot; pud_t entry; - spinlock_t *ptl; - ptl = pud_lock(mm, pud); if (!pud_none(*pud)) { if (write) { if (WARN_ON_ONCE(pud_pfn(*pud) != pfn_t_to_pfn(pfn))) - goto out_unlock; + return; entry = pud_mkyoung(*pud); entry = maybe_pud_mkwrite(pud_mkdirty(entry), vma); if (pudp_set_access_flags(vma, addr, pud, entry, 1)) update_mmu_cache_pud(vma, addr, pud); } - goto out_unlock; + return; } entry = pud_mkhuge(pfn_t_pud(pfn, prot)); @@ -1508,9 +1506,6 @@ static void insert_pfn_pud(struct vm_area_struct *vma, unsigned long addr, } set_pud_at(mm, addr, pud, entry); update_mmu_cache_pud(vma, addr, pud); - -out_unlock: - spin_unlock(ptl); } /** @@ -1528,6 +1523,7 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write) unsigned long addr = vmf->address & PUD_MASK; struct vm_area_struct *vma = vmf->vma; pgprot_t pgprot = vma->vm_page_prot; + spinlock_t *ptl; /* * If we had pud_special, we could avoid all these restrictions, @@ -1545,10 +1541,55 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write) track_pfn_insert(vma, &pgprot, pfn); + ptl = pud_lock(vma->vm_mm, vmf->pud); insert_pfn_pud(vma, addr, vmf->pud, pfn, write); + spin_unlock(ptl); + return VM_FAULT_NOPAGE; } EXPORT_SYMBOL_GPL(vmf_insert_pfn_pud); + +/** + * vmf_insert_folio_pud - insert a pud size folio mapped by a pud entry + * @vmf: Structure describing the fault + * @folio: folio to insert + * @write: whether it's a write fault + * + * Return: vm_fault_t value. + */ +vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio, bool write) +{ + struct vm_area_struct *vma = vmf->vma; + unsigned long addr = vmf->address & PUD_MASK; + pud_t *pud = vmf->pud; + struct mm_struct *mm = vma->vm_mm; + spinlock_t *ptl; + + if (addr < vma->vm_start || addr >= vma->vm_end) + return VM_FAULT_SIGBUS; + + if (WARN_ON_ONCE(folio_order(folio) != PUD_ORDER)) + return VM_FAULT_SIGBUS; + + ptl = pud_lock(mm, pud); + + /* + * If there is already an entry present we assume the folio is + * already mapped, hence no need to take another reference. We + * still call insert_pfn_pud() though in case the mapping needs + * upgrading to writeable. + */ + if (pud_none(*vmf->pud)) { + folio_get(folio); + folio_add_file_rmap_pud(folio, &folio->page, vma); + add_mm_counter(mm, mm_counter_file(folio), HPAGE_PUD_NR); + } + insert_pfn_pud(vma, addr, vmf->pud, pfn_to_pfn_t(folio_pfn(folio)), write); + spin_unlock(ptl); + + return VM_FAULT_NOPAGE; +} +EXPORT_SYMBOL_GPL(vmf_insert_folio_pud); #endif /* CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */ void touch_pmd(struct vm_area_struct *vma, unsigned long addr, @@ -2146,7 +2187,8 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, zap_deposited_table(tlb->mm, pmd); spin_unlock(ptl); } else if (is_huge_zero_pmd(orig_pmd)) { - zap_deposited_table(tlb->mm, pmd); + if (!vma_is_dax(vma) || arch_needs_pgtable_deposit()) + zap_deposited_table(tlb->mm, pmd); spin_unlock(ptl); } else { struct folio *folio = NULL; @@ -2646,12 +2688,23 @@ int zap_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma, orig_pud = pudp_huge_get_and_clear_full(vma, addr, pud, tlb->fullmm); arch_check_zapped_pud(vma, orig_pud); tlb_remove_pud_tlb_entry(tlb, pud, addr); - if (vma_is_special_huge(vma)) { + if (!vma_is_dax(vma) && vma_is_special_huge(vma)) { spin_unlock(ptl); /* No zero page support yet */ } else { - /* No support for anonymous PUD pages yet */ - BUG(); + struct page *page = NULL; + struct folio *folio; + + /* No support for anonymous PUD pages or migration yet */ + VM_WARN_ON_ONCE(vma_is_anonymous(vma) || !pud_present(orig_pud)); + + page = pud_page(orig_pud); + folio = page_folio(page); + folio_remove_rmap_pud(folio, page, vma); + add_mm_counter(tlb->mm, mm_counter_file(folio), -HPAGE_PUD_NR); + + spin_unlock(ptl); + tlb_remove_page_size(tlb, page, HPAGE_PUD_SIZE); } return 1; } @@ -2659,6 +2712,10 @@ int zap_huge_pud(struct mmu_gather *tlb, struct vm_area_struct *vma, static void __split_huge_pud_locked(struct vm_area_struct *vma, pud_t *pud, unsigned long haddr) { + struct folio *folio; + struct page *page; + pud_t old_pud; + VM_BUG_ON(haddr & ~HPAGE_PUD_MASK); VM_BUG_ON_VMA(vma->vm_start > haddr, vma); VM_BUG_ON_VMA(vma->vm_end < haddr + HPAGE_PUD_SIZE, vma); @@ -2666,7 +2723,22 @@ static void __split_huge_pud_locked(struct vm_area_struct *vma, pud_t *pud, count_vm_event(THP_SPLIT_PUD); - pudp_huge_clear_flush(vma, haddr, pud); + old_pud = pudp_huge_clear_flush(vma, haddr, pud); + + if (!vma_is_dax(vma)) + return; + + page = pud_page(old_pud); + folio = page_folio(page); + + if (!folio_test_dirty(folio) && pud_dirty(old_pud)) + folio_mark_dirty(folio); + if (!folio_test_referenced(folio) && pud_young(old_pud)) + folio_set_referenced(folio); + folio_remove_rmap_pud(folio, page, vma); + folio_put(folio); + add_mm_counter(vma->vm_mm, mm_counter_file(folio), + -HPAGE_PUD_NR); } void __split_huge_pud(struct vm_area_struct *vma, pud_t *pud, From patchwork Tue Feb 4 22:48:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960099 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DAC4C02194 for ; Tue, 4 Feb 2025 22:51:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E15C2280007; Tue, 4 Feb 2025 17:51:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DC584280001; Tue, 4 Feb 2025 17:51:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3F61280007; Tue, 4 Feb 2025 17:51:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A58D2280001 for ; Tue, 4 Feb 2025 17:51:12 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 48A20120256 for ; Tue, 4 Feb 2025 22:51:12 +0000 (UTC) X-FDA: 83083759584.05.2B1627A Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2066.outbound.protection.outlook.com [40.107.243.66]) by imf01.hostedemail.com (Postfix) with ESMTP id 70A3540008 for ; Tue, 4 Feb 2025 22:51:09 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="uBv/bHPh"; spf=pass (imf01.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.66 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709469; 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=W1l7WOnCWjulZpMO6hDM9yKhadgqJOsZu6fT17lCqVU=; b=eCo1t9LBJBKHctacc3dO1UYzcOuNgrQTndoqEjG4m4btwlVWCDMyOb8n0JcRrcQxqBxqGl Y9WFhId/0RoDQR0pcpTfAUDhE9xCvTSWtD4FtZM3bl2FzLKO+kmQfsT9VtgqA7MuaSL05T NjjMMN1IbanI8IHnBUIRuU4sSKC1IzU= ARC-Authentication-Results: i=2; imf01.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="uBv/bHPh"; spf=pass (imf01.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.66 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709469; a=rsa-sha256; cv=pass; b=iqci70vjHl7optbUnY7tUwH9p2dHS/P8O+zv8u22jKcPYxW7pPFIZZ9xKhXj8cgvJT9jQu crzlba9LUg5Y54HOZ68BAs9PJxGpZ5XVI7UTKIiBztbjZaKfq+wrIZkz6rbbsHqQyZFPhI rsZF8uxyEfNO9kZO5kJJBfb1UrmVuNE= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Fky0KmSP1lp/kyEm/3m/poGB9Seb/cKw4hV4TZZY5E4lWlabakFvDJUxPByGztt1t0loBGPWJUCvaJG9fhw3HIWgpor/m/GFPgcS01W6H46o0U4KdtdvCbPGZygnV4immyfdxlxAQpT05YwrhZRbVC+Z+cL4LmbFra0C7qAf35w1vqwADxcDjx4HhFOWs00leC1DX7FD3jsy9VNASC4mSKqdvYW/0lGqNQkHNW1dzwERyU9zxRzlr5I80MPevNuVsvIt0Dppbv/U78raJAQe+2/4oEBRoNsY+g/kw7C+PYdZR5v+m/OMgQ1dTUBh8J2BGMWgstyjo+zdo9JA208iKA== 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=W1l7WOnCWjulZpMO6hDM9yKhadgqJOsZu6fT17lCqVU=; b=yfHEWqOKbyQtl8p5JtOb3/kEx1qGdadkG6eRgPGYNbZc9UgGYEi2w4gZRzInMLTNAgpARS2i+E7VA7fS8HdBvdAfXWUKjyqbkWZZowTlKOvBCifpDmAwampo94WM7z91IxRinX84vwtYsq0Z8avhUAWcBD5T1JPMgsP752dxg7QnQBaGzw1gl+ypo9CvcZMmRI7Q1dYKMZBq5vERkh4bREeDSHnzdTO03vPm0K6UC+phzSBVD43f0jOWUVgSVJgmssd6RUuOiTA0p9o4liist4DyANHtODgsri2OaGSxSQw024xO/+OysEUOI5AQpxvpyFtXGbh/jt6fB0OEbsZP1A== 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=W1l7WOnCWjulZpMO6hDM9yKhadgqJOsZu6fT17lCqVU=; b=uBv/bHPhuyCdXE/6z1Jj/1AN7VInHODXxgVMnrDNsVNVPI3L+4Ir6p6l6KjuncN+cA75ZRogOy++Mo2vO3JpW0pZRB5SI1cteqIMzFwGmPe9GWV+7S0RqMntVSbDQzTwyNdx9kzS5SK6KovUxrPLqnA3TxUvGft1VmB7g10PXfM3zIuK0kb2SJ612CKgl5usNjO/rNJJcVonzzVgJUNfCKaeZfvortQaLILNlGQCeiR05Ro/wI+jzPeBX885/Tc7ctCjEmnQ7eqT5hdckJQ4up3r87ZiP6zYnujDaLm/zBBqM52mtMhFEtGtt0fONVi2SksO19M+WvgURqxEBxn3PA== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB9027.namprd12.prod.outlook.com (2603:10b6:610:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:49:52 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:51 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 16/20] huge_memory: Add vmf_insert_folio_pmd() Date: Wed, 5 Feb 2025 09:48:13 +1100 Message-ID: <9f10e88441f3cb26eff6be0c9ef5997844c8c24e.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P282CA0090.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:201::17) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB9027:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c36f967-edae-48de-53b0-08dd456e3c3b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: FlD8+gQFNQJ+OjgIBjDgTu8+4ZSWAIojeFsGWl6TfvwA+JdOfF1EyUp2Ul1AJZNWrIdWm++9dtxB2xZvxjSnQKJKZdDmJkuHoXuTNSrvw6ebIidERwU8P4XuxUnAwopb5wqX0/rokMEgigcyx0WJXH/47lSiky6u5Gea5hu/wOuGpfjRA43beaMUHtmVEr61fEQVA4EltGnumUY3oJV0as2OAcwH5y8BwwTL4lfazXmIJMkv9HkBH/pUuDZoBdDz93surZtk/6MCVsIe5eZWal4BBNxhQF+mgtjogDco1zbtOromT07YIkAbJEqkfNUsP3BVIK9/XDJn0gdHrA5yBh2hnh/XbZ3jVsQ631EdZTyjeNxbPCtpzKPFHUdygfCsgwWiOksIhefpz8tjzYxqZExwfx8biLy0mk2DtVzI6BOvz0C7g5MADjl4q++TiumQsBV6tfTYpjHTmqQGeIo2G2oV4aLbR3Ko8Vh7R72bgrfHGoQASOUZWzTaStwVNuIZ1XbKh2+Kgz3kekxeNBpWQpczS/i1ap9rPTXnqg497nnHTOKpzNMTKepEGS5WJGsGFRgcWhV8309Q//p8cGZyHp34CZEQpa/KnUpmOEJAOPpMFSjHcihFlXDu6qCc/xkEkG00/IoEkqXTmqnAJoJ3xe26z5zAexVSCsu9F9p2TnLU+ZVZ7HLYTktb1ZV61b+5l8NeOyw9H/NtLiKDRWQBhZvP+sTktzwz8DDOBTRMVJBT+Zx5WFeuDL8qpqbvho2b9jUGJsd3ZPuOwHXQsb6ZxuCmdHagrx7dMgfD7IQJEHR41DbQgkH7UK553/lGjgbe3xZmwRdAjAGiS84xbHwRUdPpmFhBuWiX97YqPRnQB24SBkI+UdINA2VlCdJ6fCOZvD6UK3XjU58LFXk4ky6PEFeCpV4mcMqOpu43KjoMRvXkxYIaNOgwLJXddF8NMqZIAzKuIuxClw/fzpLWKTMybEv+Ex6HSqCVWRygpz95hS2XX84zp4bBYLDNRTq1xqj5Hv1YeUDfIl0wWTKuvmcF63t2FWICFK2Rd07CeakPxdSvIBRMAs2IFXHYvIPRS/2AkMPc97SQ0Uk9RmiecB8D2n5ig1RGaXNbDGizKaoncfAM3EEBOKn0yKvI29FkhipoWcwv29li1L1V0p9zFj8c3/2CJHv8sdFG19jYFm+ETyPXO1pPZ2KTxUOeymenAseQjyeNeNplmMOQFIR5IQ5KJ4e8/T557scw0cWL5aKolh87vlYnmWf2uEn3VV8JmWSoxBzCxuEfheOOP35h0rkTMrG2Ig5r0Rno90pJHpGzPjWVWHPHWPk8sgfa9CcITMqZCksOSCPsyf0XIjTu7GT9XPgQ7JlbhVL+CdgWChdAqUTPmxzqDImbuOUR1Q0ss8W7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ITYZY3hRTCT2e1aQtjdicUtueo41yRQnTwipbRgmTC1w3EMkhEHPyJSag71f70bQcsEdyCwnJRTvOY1rbhNJSnWnyyyq5n8ScsV3zx/c3+glO3R9aAYKGEdp5J314xojrtd1tS7NvpuaJunUe5oSdCRsUprrUeMMYgtHxWi9juB4Jn+6r2Qkk9wZTCBFDCEz+Qodrd0fjk/U1Y1A4NK1doty+djy6FtZKwi0VmuBE9n3lW5eb0X1IMzfImPPnTQEC+m6OispeG9pjgXZzqmzBkkJqqPYPteG4YAjOzPbgawM2Biol/1VSV+2DWED4ej55TtgjHEvwZIWT33SBxdmf0d8Gd7tJumSYwgPDOonFclDu9q5ayodC7GqTWsRpBmdOMMoy5J1nrFuU7Ew6loY5AC4ksWarrByLwZeG+OB8wZwc6ZlNi7RXKzVNSB72GZoSrqkTXj7gHzOynAEP2B12guiO+sDtLHQ3xQP2+7ZcYTeRuU6C2O1vZ6jJt6huJlo9NDw2uvHfSDeFqcuGr1ehAiYL+pgAjGubInMxOc/lku7MQ0fCFZ2+hTXlxsHXG4C1iNK14ye+qi10V1Hmp2NWtsX1O0j9CkBSLtdOrQmcVGfQMiYrHVpsW56tJ6waPwB/ZlAt0ACI4LEc5gCUnqeaqYtDc9QtyRSAYG+Lo0cSplmKEyZk69NWsfUkc2ZksZauz44GVwoPBxJscmxWtgfkKp6n/xHQ1jFytS82jrPjG3eLG3TTPuTkQdoNU0CNLG7j763UOcGsSHeWXa+kRQp0uHLLpRHI5/Cr6nf+kIwWnuj3s3R98xaorGv0G+eDbmL39qobLUopq+lElLbpt9uYA6rXs2TzwTnfwS1u13RWA1P6kySjhIpS1/FB85JsU9bLhMJL9UBUnRa/nLHM46pGfbr9UuufNivwG3Nq7OloFKrFDH8yUA3qwbSzAUH1TfIHNqfhYNO7WNxKQFblgrb90K/qX3qOqdbVvEad+y9XkIQQygUdgJ8qYemZrELFuNxWHAQZGD5A/Wgxj6UWm5DJo5ChXVJ/P4jy0V9gLR6lLOsCmMhzZ2y+7mZsONKxsWcnvRHIP+Xn9uhUqDm0yP7IIruoDub9eYAgEIzRY9u7hpTU2CA7S4ULMxg3dL3JF3/q+WIPyWuijQ/vDyFpw6/Li1nfHfZiDGE/ZsFkR6E2rek3zA4bLO+UQVPx6mEGZ2ZUt1OOW94W+1z7aXxmK3YSuAEBXD8X5CbEtz+JEf7y9miwdQJbcXDrmeuc3gzgT7nVzy/CX0Jj/PC+510dnlBV3DEMZGzMW5q25pFn6MJXWvQ8gbVc5SbbjnOEgVOrxVvL5l+njhwd1vEaEr3bCozlkIAJtCf2TQ5hsAnp4xEW1OM8Ri5vMzN02c3AKBHr3+ZnJ0SJkiINooFxR/XZoSpVmNTdKqaz9KVYsoTJCyYMQ3nQMchk/Y+a6EmH4xOUw+IuKSULVodkmqSW1j4BsK+17MA0AXu6L6UKVYvQP2Q3Dk6St/lhzZwOEFnnVC6+nthVWcHA18HsTXOnN9sor6ioiIbzHa5uQ5xCrAMS2evobuhMFox7TTbk0c5evrd+3wy X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c36f967-edae-48de-53b0-08dd456e3c3b X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:51.8930 (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: mU1KW5DWb3KN7WP6OVwayra1mwsnhb3HY7KFlhdKf7fOrQdFYXEyIQKwBa4u8kgqrrA5zGG/GCTUrlRTFRMnzA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9027 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 70A3540008 X-Stat-Signature: yh5rt84i9qwo1aturxbr51e6emh5ozez X-Rspam-User: X-HE-Tag: 1738709469-79061 X-HE-Meta: U2FsdGVkX185PZFPW00dNH6Mk8c+Cph15uCTCX/vLO1HW/xywCwDiPpOKIZU4PtECdQqzrLYw5at6m6x+uFcoO2ATXzB2EICt42RdxMVMZKh7u0DOXnDZSxtvXkm0dWW/GnBOpjNsPOx8tsbgwL9+uqftqJ38gSqShIM8C//20hZORkEZXQNdECpDuAQ0u173K2RAIYc9NAcGFij/RtB9obKjTj4SlWCB5D7HL9IHoEUz9GCNas4Ug+Zku+6XtCkNrfPgfI1ojApNqTi/lXFDXzVMy11yI9SDp1B9RqXNnTf8Hj/7OAmlTjUFTGVKflZht2YvT2YqbxIpoYNFXb9+yTKX9Hl9KjNFNUbq6wa/gWEVl7jy/u/yj3a85dkCC+xQ689Ex2otoAXm8e9Vv8aL/e/8b0nex46X+uH0EZljZU6d2FhPtfa5DNP7KkR9+Ot9vdNhoeXo6vsZHzHh//BoF1Q0ZSCSEwZduYkTU54I+e1CLW0gXgzCJVjwQGr4tnkaciS+CYrrWDlCp7pnxQtHdg1tMI7A77V0GgTVNvsfr7IugSdk7ldmIYX0mOBc3db4wOBlWfEcXH9R5pPyScGRC8lPbnaqOPSRgM81lQqshtYg4jfum/1C2GEGG0cphbIRchnhNjbvFTFWvFhLozGeCycFRHwsf62qnLsKC3mqqNHFkuFQg5XccBx2zW1adU5hMN+FGQuriqMvzUcLdwBDrrK29P4H6pTtWSglvdiat8GmGDri3OqjlFSrX91fRWwNjkA4XmQMN42F8TNlGmTh2nhY37PBQ+0h8w4E1lgh+ykPr1kQaGi7kXs8Y9zrm8hyunoTT71xs3+8Nf6daHALsCehyykzLxaTk+ceE1ttUvzIw0vbsePFIBGTGTTw614LizcpYOKOXOmn9KlP41Iys9zr/vcf7g4bkw7LBpjjIFkEF4jTH8aXuanR2G+La3S/aRD/0H+/PMVoCv+C4X ojNFBYMP w2yQCjNHVJ9m7lFQ1AMHzuXNcxWBoSPVLGbTWo2YyWWu6k62GUmxTx0ryY2lHOoMasQ+wDjf2exr/aSjnItJDz1o19Y+gvetoxpq3IrF2d5Uv6engncx/iATiF7xbk4gmq+JA9dTBLVt4KVjhcO3n2JLl1YFa3Dxrdte6fivuojwvW9BciAg3aTKt1lbRRW7QY9N3fKLWuT1Fgo94qplO3QojarnTKMASFaHbE1NvmlOmvhIqL7QdU/umq2K6X67de/9aPKwzQ8nu49K9eJZW4jIBfqJ4nUN8ccJuqy+1VtuJrNXeBUUsd/JHWQOzApw05dWdugV2MO0TaMVCLYgcDFW8rRwSS0beLK9qd6eb6CzwcDTpAt4s81fDCoqNUbOe2XhHXW+h69B1wxAP9iQ++lxuIZPUe6ENd+F3KS3Wbe3AmpjhRE9FbH5JIi9koYQury1giK94UTFBX4U= 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: Currently DAX folio/page reference counts are managed differently to normal pages. To allow these to be managed the same as normal pages introduce vmf_insert_folio_pmd. This will map the entire PMD-sized folio and take references as it would for a normally mapped page. This is distinct from the current mechanism, vmf_insert_pfn_pmd, which simply inserts a special devmap PMD entry into the page table without holding a reference to the page for the mapping. It is not currently useful to implement a more generic vmf_insert_folio() which selects the correct behaviour based on folio_order(). This is because PTE faults require only a subpage of the folio to be PTE mapped rather than the entire folio. It would be possible to add this context somewhere but callers already need to handle PTE faults and PMD faults separately so a more generic function is not useful. Signed-off-by: Alistair Popple --- Changes for v7: - Fix bad pgtable handling for PPC64 (Thanks Dan and Dave) - Add lockdep_assert() to document locking requirements for insert_pfn_pmd() Changes for v5: - Minor code cleanup suggested by David --- include/linux/huge_mm.h | 1 +- mm/huge_memory.c | 61 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 5bd1ff7..3633bd3 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -39,6 +39,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write); vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, pfn_t pfn, bool write); +vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio, bool write); vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio, bool write); enum transparent_hugepage_flag { diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a3845ca..c27048d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1375,20 +1375,20 @@ vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf) return __do_huge_pmd_anonymous_page(vmf); } -static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, +static int insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmd, pfn_t pfn, pgprot_t prot, bool write, pgtable_t pgtable) { struct mm_struct *mm = vma->vm_mm; pmd_t entry; - spinlock_t *ptl; - ptl = pmd_lock(mm, pmd); + lockdep_assert_held(pmd_lockptr(mm, pmd)); + if (!pmd_none(*pmd)) { if (write) { if (pmd_pfn(*pmd) != pfn_t_to_pfn(pfn)) { WARN_ON_ONCE(!is_huge_zero_pmd(*pmd)); - goto out_unlock; + return -EEXIST; } entry = pmd_mkyoung(*pmd); entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); @@ -1396,7 +1396,7 @@ static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, update_mmu_cache_pmd(vma, addr, pmd); } - goto out_unlock; + return -EEXIST; } entry = pmd_mkhuge(pfn_t_pmd(pfn, prot)); @@ -1417,11 +1417,7 @@ static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, set_pmd_at(mm, addr, pmd, entry); update_mmu_cache_pmd(vma, addr, pmd); - -out_unlock: - spin_unlock(ptl); - if (pgtable) - pte_free(mm, pgtable); + return 0; } /** @@ -1440,6 +1436,8 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write) struct vm_area_struct *vma = vmf->vma; pgprot_t pgprot = vma->vm_page_prot; pgtable_t pgtable = NULL; + spinlock_t *ptl; + int error; /* * If we had pmd_special, we could avoid all these restrictions, @@ -1462,12 +1460,53 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, pfn_t pfn, bool write) } track_pfn_insert(vma, &pgprot, pfn); + ptl = pmd_lock(vma->vm_mm, vmf->pmd); + error = insert_pfn_pmd(vma, addr, vmf->pmd, pfn, pgprot, write, pgtable); + spin_unlock(ptl); + if (error && pgtable) + pte_free(vma->vm_mm, pgtable); - insert_pfn_pmd(vma, addr, vmf->pmd, pfn, pgprot, write, pgtable); return VM_FAULT_NOPAGE; } EXPORT_SYMBOL_GPL(vmf_insert_pfn_pmd); +vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio, bool write) +{ + struct vm_area_struct *vma = vmf->vma; + unsigned long addr = vmf->address & PMD_MASK; + struct mm_struct *mm = vma->vm_mm; + spinlock_t *ptl; + pgtable_t pgtable = NULL; + int error; + + if (addr < vma->vm_start || addr >= vma->vm_end) + return VM_FAULT_SIGBUS; + + if (WARN_ON_ONCE(folio_order(folio) != PMD_ORDER)) + return VM_FAULT_SIGBUS; + + if (arch_needs_pgtable_deposit()) { + pgtable = pte_alloc_one(vma->vm_mm); + if (!pgtable) + return VM_FAULT_OOM; + } + + ptl = pmd_lock(mm, vmf->pmd); + if (pmd_none(*vmf->pmd)) { + folio_get(folio); + folio_add_file_rmap_pmd(folio, &folio->page, vma); + add_mm_counter(mm, mm_counter_file(folio), HPAGE_PMD_NR); + } + error = insert_pfn_pmd(vma, addr, vmf->pmd, pfn_to_pfn_t(folio_pfn(folio)), + vma->vm_page_prot, write, pgtable); + spin_unlock(ptl); + if (error && pgtable) + pte_free(mm, pgtable); + + return VM_FAULT_NOPAGE; +} +EXPORT_SYMBOL_GPL(vmf_insert_folio_pmd); + #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD static pud_t maybe_pud_mkwrite(pud_t pud, struct vm_area_struct *vma) { From patchwork Tue Feb 4 22:48:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960108 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0B32C02194 for ; Tue, 4 Feb 2025 22:54:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 789F76B00A3; Tue, 4 Feb 2025 17:54:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 713096B00A4; Tue, 4 Feb 2025 17:54:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54061280001; Tue, 4 Feb 2025 17:54:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 32B586B00A3 for ; Tue, 4 Feb 2025 17:54:07 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DD6E2801AF for ; Tue, 4 Feb 2025 22:54:06 +0000 (UTC) X-FDA: 83083766892.13.987624F Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2060.outbound.protection.outlook.com [40.107.243.60]) by imf03.hostedemail.com (Postfix) with ESMTP id 328E720003 for ; Tue, 4 Feb 2025 22:54:04 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=EmZyYUMR; spf=pass (imf03.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.60 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709644; 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=mYnQeSJDsdh8zJILm06/U6yssHJr8C0RJVE8HHsEtbE=; b=aqt2pCLKqT+v0qZRMmrGd4DUND8RzFI32fzZQT+TQGFp0CU2lXoAvhUBHcby6YBQMwDINJ HmSuHiSK7mMxPgVlI35lhgfmAgfxowIm4FOeU5ul6yJzvcnkS9IAvz+gV7q6oT9C3r64Xv CJOeXY/ooSSUnld3phK4tSCBTTLrj6I= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709644; a=rsa-sha256; cv=pass; b=L7YrglfSWqZTP3dcaiBOwO2b/4j+2/9xxWN0ejFKthrgnouQUN5qQG0OEbV28aHLMQZUIE VEV1bxzW2dmS9KRTcXz/MgXmrXlPgYunQ/HaM1r2in4LDGeYCRTkE7nnY15fjUgp9wh7jU y2rfRNKZ/lInKNYHfXS/KGNZnV+NNEE= ARC-Authentication-Results: i=2; imf03.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=EmZyYUMR; spf=pass (imf03.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.60 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LLL7DePuU3gXMHTXMFbUl8dm6RlBN3/yKed8IBQgml7ORoBTbG4JyY6DC+MOf+EUce0Syj7Qg/3sPXGdu3yiDjPEnIVTEgWvvUkIEbhWquIiH7C+sxnrDLk/7acYT2x+L2oaKbHkClifkY+/WWakMc3CoYeChg2ekjyDJvvZIsRnZGrQLAulbv7Y644B/7t9F/JwG//UUa9W7n3tiIJllP6ds78ZVxlS0CwA46aGhsLq8/3tkrR40r4S5nKyiVfLnccMgXSA2YECEGEhKqifSgqU5nmcQHY+11xcxfMZUAu+caEMqQCmlCFHKk6K2hxbxOVW9VX+FCDCAixfCjHrBw== 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=mYnQeSJDsdh8zJILm06/U6yssHJr8C0RJVE8HHsEtbE=; b=ACUZly1ddxIebw59uwf5hct5ZqmuNa7RuRStzlhf90eaOkyUDc4ljbWEr7n3BNnRW6mvP2By1Z9QD0dbEJNjbLYmkqVnRZ2iq3ZSHzyFvaxLJNJfSZJc5LbOd+Y0KvdaPv4YVJUQ++Js7gi/kPQ7D69olSPJoIS5kscvndSHOXjth6w8CB1G3tpNYMnaZiZRdGqtNm4A8X9KQj+4AdZ4vEyYnqoei4J12McOAkaAPl4fMjBMtQRcKXO2YNFdVVHyZ/qcc1xElsPSSs5aaFTXYy3RtMiJLpZRehSMQvjZJz2LtkxowRSE11hCWs9yKPotaP/8GHpZE1gpVwwkU0KxyA== 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=mYnQeSJDsdh8zJILm06/U6yssHJr8C0RJVE8HHsEtbE=; b=EmZyYUMRDfPFQBz6Q4rCU7DXLC9ZAyBdVkV+oIqiVUZRC6Tuu64rMdnkUFQUfM0j4Xofu+dGdeVRVq7L2tI1Hiyy7VeK1L92Iao+xf00uvsjUhm6VvP3GY7oI8wSw6cZbR7Go3B1VCt1KZgy/KQLDdFU+vNoPib5M4Y2/8I2YcxKs1LYSVbByjANaF6drBjq14w+hSpDPn+dLgGn4ytikHcg7y08bJwhUshFild4AYXlqXWMbME7T895rnZDxl5RuzeHlZFAFtGJkZzusyqogIDPbBwvWbjzokg6vujDN9Tmok4y/vVLReLD2gW3sO3eATsDjZbGbToFq0AjUg0yLA== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB9027.namprd12.prod.outlook.com (2603:10b6:610:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:49:56 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:49:56 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 17/20] mm/gup: Don't allow FOLL_LONGTERM pinning of FS DAX pages Date: Wed, 5 Feb 2025 09:48:14 +1100 Message-ID: <76dec7814edcc56d29be711b2cd344fc98cc66e4.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY6PR01CA0121.ausprd01.prod.outlook.com (2603:10c6:10:1b8::10) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB9027:EE_ X-MS-Office365-Filtering-Correlation-Id: cd03f03c-c9aa-4dfc-de1e-08dd456e3f17 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: u68h/YQmayZ14xi4P1e4wOKgL3f5J90a3QuN4aLDmQchHhQuYLPi1ocna5RFqlNX4Pl01Ept9lxlzS9wKC9ywU9f1H7OZQVTe/LFpXIZu1K17IA11Qmq6O2e0idOm1hqD6a84z5M8JUN7gaUra3ZC18pbivVEATHiEPwzi3UpJyh3s/+m87WidxTX/WRbUA2Cw9unI8sr3wLeTYkC6QsQi42oLFfmASiFxJMN8zqPK16JHPVQl68v1FhSlLU2bAFBI2AScIdVqihlTLEk25nufkUZYSCYKkvjHkF7IDIsNuCKbw+hiTRKdDMuOInH5aZsKBvY/5grd/asxKICZiW9MKSp2GxWj4tWDUNDVsaBVUlGItPOFqJeDOJANPDgri2dZAgtF/xPf3PKcP90rOmxAA3fi4iA0as0b5CD6y5eEHhi3dVp1fL8nvE6vAUqLSZMnZzuP3c+7OI/8QtZKVlBa6sCv7EvsCsp2ZAzVm8iw/HjHOIm765tjUNfKD7BkguD6w3GnUAL5AAVkwUmAgGSgm2sMJXBJphmea+DuSC+LeGb8/rROiv+Ra5NnEtZKuWCSL1db8o+z+HxFPNw2TaflFEa6meVTpQOYZxdvIiMltzFD19KPuENbIQ9VQgkDnm/PT8Pe6NMtqtZzNuMoxsGj/HJqLY2yucgQFvB/K4Grqu2ShowJW1oczU/uN1LTMWt0zU7VFbc1FXO42eNvocp/tvVuYnIr2+MwlPdpyg3DWTUP2+ImOrN/jdS5KFveGcjilJasRtIn0ZT1UH6gi/kAfyZj3QhoUO+GyeTpcnyacd0GARKK5kbDKBMXr5eJAH3rPaUGbmIflowjG4Y3e8VuoMkneo+//eQxTjfN99IsTNkj9Y0XZVgZWciTboHPWuHRX03kiiWrKW4AUb1KEecSkeucRAdAm+mrMN2dXVA3vn1SPGn4s346bUMnxTWh3rU1FaVYmNNqk86JtscXqymH7I+qLun8R/z5Xw+l+DP18IAqkH0t9ddBz4dr/H/Dx8LXX/Humk+qNX+8mq5XQ8lxGMcvYo/2qT+Y/Gj4NaGJzAcKBrBes5JqAKOl62oMlYqCklAHenTiVCzXg4x9/1XO7kLqjpqfPDPyWWqaYqKfDB8R/+92OUaWqpk1xgm3SQR/W0lLGrdv85QpQmpbSfg4ABvhqp0oH9LdEDHMfxQd9r95OthLs7RiFSzcRXbhX29jdC7/csFk260E3ba4AnJ77QOlAli6x3b7om+9bhMAfM2DAFx067brL7EaOfsI1sFZOrozmkihhGCsRZ5i+7fYZlAH5TX6uaXFbXa0Ug/M2FzHlNjvZAR62JpA8FFKLDMBuabsWwg+6KOBXEgIbonyXQ+fkc08cUYRqX8/wrsD/iKEfIo4Rr9zGvPxL+VdqY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cD3AK4STOMcHAbJUpk9OJ2Z+87624IW7iZSFnIW21bRA2f2KYLmjtrGw2DzeZp03QONfrfN1HvrAvYcCXq4/a+YFZZGBDb0FSplgTjVcN+Y5Xp7ZYOvemuzngmmUM+zbX7hWzqiter4L+a/tFlDajY7CI0toh9X5WKdN3Xym0FBkDnK4vLrfe0eel5X9mTrSLO4ctPVibUVsLN3vph7aTHrMY3WUb62WRCDbjg5tIYQI1XVmPuEeStDFBBwhxtkTQ9opDW2SM077Wi2sKiSuby6KiIGvzRC7WRZNQ+EFZIZdsulvVTAYTGsxmOp96i6sDjHJl00SKQCESFHK/4NDn65YSgoYWBDKfANldHqTcRDIoLeJOGvP+rp8wqbFntZXh2EHkq2rwV2f1ftgkYjM6O3M+tE3XQM5wD5QlF4hAbcCYj+gF8og+rS+wx0Ka259HN9scgK9Ikddlj3ukYwiD0iPJQ7FxmrkQF2X0crnB5gALGWNbviNwTYNYHuysGemBMq/Vi6E8qRT2O1+0jeYqT06nf3HMjqkTDafGYAfW61bthPMgzkq1JzkOStZuuTuJKN0LH/N4uz8NuCRZ6lF3DwAG6P9uJHdTY+nQ86l5iwwRTAkUQRTCaPMXzdesssIX0UwmJreNSJ9GnKTQkWiW1/A2eqHe9Wc5dLEjsbiDNTG7NBkNVfLUbSwoLEOH+Bygdm9O0Lkt2x169r9BbCNUNPzh6R7rsj1jqftOtnm8dTnXuHzQs9/SXB8WS6B04DmIGB1zqZDXIoIuco6XmzuGR1bS7uC0RBtnOPtGfJvw5UW8zgyu43yU3WufF4KCJwV72GN4I/l0wtkc6ReA0WUt/jHLaTfHyguF1FD9lHj7HECBX5cHa0e0lUu0BRLnai2ZoiXQVJNTW+CvrcSCfJksCBriAf1Ojn/chhxtImokMBK8ZfAk4F1XleI3vyGn7RGrCZ1TTnSDtsV/Jjd59pDYMBS8Sw/KbjLELcyIgp9Y+CO6X6Hs9zAeC87onf4K2yJKjcWnCRh+UcN//plD7DMvpu+8E0aPGUx2LZuvnqL4WFKST3vDFza80C0cR1DJcP0u0sNQaPW0EO2oKiMnhwezxWo0ZM1cnk6qVkjytMSYZSUp4fkhSMhELaQlSn0QGSHpXXg2gGJem09V5R1JJgzZzTsW12yWBdLZW+AkHnAxvqOUFY6/TumAL3y5s4+vzDPBUi38kLWVfPwsiJq2jRLRLRCHF6YSnc2OaGF3qgxdRVvReD1fOrGUWR1MoLKdWuGM6H6t0TcyyGOsHxgGmpP03BQmnIPjA+t36tQvqEC34Z389lhn38UPplvZeVW6Yw65PhuPMq9b8OqusTuudXVbHcOuUd82JI/D2mu9UCGUDBkGcnEUIxX9CUAoFSahtC1Hiq1QecdI3lVMjUH8WgQfvcay4aNKv/HFQvEGIyHj+6MB1ETL1+6W1/NaZ9gG6X3C3zC5iF9uAFopvN0j40Ty02Vk8EVKsAwDzz/kqdOSvp47QERkzmQQb2sggTGTnrzzrLBcdc/45x7wphmoyTKPXi8G/m1DlHRMPFdUdGISTNukfZpzGugvxnQy/trlKyb X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd03f03c-c9aa-4dfc-de1e-08dd456e3f17 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:49:56.5673 (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: VS1qmIoHlXtxLLh9+M+Ubredh+Ag/uFnby230g7tmcEpVte8ptaOZKmOZaWU+RAGHDTxKyfk6MdHwPidCuUMxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9027 X-Stat-Signature: 5rbtppuzwndpsif4rg5gxnijek3kyojh X-Rspam-User: X-Rspamd-Queue-Id: 328E720003 X-Rspamd-Server: rspam03 X-HE-Tag: 1738709644-206927 X-HE-Meta: U2FsdGVkX1/7IGrMDi1whBwYTrU1h31oAI6uhqiSLP63sbr3qz1BzT7eng/U5FPDDM80TQ5UDbpC7fpIILeP76ePTzc1p0ieCsbJ8TNk7zK/CP2sabnf8CQXCDIvl0gy7M22YacWb2+ITRvE//ooO6hRsnvFYvD9plLbxkeyibzUnndpkaX6qrkooUPrEHQ8EqUlyjEzN0rSSj9i/9Lf2O7jwrL2WZjTz2MzMls4p8ttgDbiB9ylEQcP+o0wnCcdavN2jqp+kTVCqzK9fYRAgh7VDEwQWhIkorWlONKrujVBpOdK8qYwnAPSyJ4mCSnzP92yKMRPjmhiU0rCCZy08oNH1DgKvyJbPg9mJae0G/fySmmRyfjgPmg4wIPzXG/rLycX6JnyRdgWJfxiP+YrbhtzsVY7q2AV0UU42rXArJS+2CDcP6ujhS17VE1TgTvML31XNwhQj7yjTZYSfW6OtZSyiAnFzSTHkcpAcgNZLelHdyvMbM3r1ULJNxkkkZFCYMizvu+YO8Vdv/6inHm/9o3SXGMEPglwx+W4A0CsVzSEEZkT6wvuq5jhQWEaPJRcW8TE5RznUPk52/2auYSoH8DfR4YRC1S7u2Ql8RpMFRVzH13DpX/67lFC6rDCPoBH6j6I1r+fPmnNYdbJbh93KWqVeY5xjBDaWkb3iEnJbdfg4YJLtdPnVeuHdwxb4wiqulkTH+AUeuXBGpjPD5qal7Z4Vg33tduCn4FzjaTy95kk7obPSkxJqYwkHQjrNCzGKZv53xo9TeQwoZO1jjddjU03eSWbYYC+pijOOO7rGZDqU99GK6vqQByX1Qrl/ipBSMOEGPTiRDvEnB/PAYXnPVtKGMiM1mbWsrF3hr4v0hXZLRuHswVpyOdT43pXPiX7I96M/vIfMmqbOHmrxKxIln0mG7M5uoWNVxyessF0XknPJ0Yia2nZPfW4cGkSeyACibvZL0Co2wOjtLu2+Lj wSo20GEA F0giV4tCeO9I+XhTNrWgmhDZCV0ZZpK8YZs4T47wt2cS7kOLllaWvJxszhJB0h2A1PvE9m4sdMLx/dzuikUF+JQVIFavw8zKVgmdD5zBxka6ftAdP5QneX568mieiWuIyR+Mp/cF4vb8waHgW6phiVnLrxKDzqt5o3hCQUdPrlzMAKjtrJXribBarwaRUgYZnsUuC+nzjKbXsBEAAaHZHzVx41d4Wgz0C/WCxfXdEyQpTDw7czsNItP/Biir4+BkyEliXWtzQmEDZpQxmTFoJ7LVEG4TwToE4jiHL9xBkfxgWk9KsqndiZKP4o5Ksxo33xdFyZMu107wDiww9PbNbRvQpx9HsH67FCflN3RFZZRkTw+b2oA044JgDJ0aJYHFJNEHRHGBM3BLFg3kaEz2Rgs7xZbbOFkQqqWcGrMIq2sCMI2jeXnfUqohvdwJGSm+pNS6Hu1BriBmLJVZO7739Y81PrqAb+jWIf65gNZlApWOza4HzJelTW+cmKtv2KMp6XpdN 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: Longterm pinning of FS DAX pages should already be disallowed by various pXX_devmap checks. However a future change will cause these checks to be invalid for FS DAX pages so make folio_is_longterm_pinnable() return false for FS DAX pages. Signed-off-by: Alistair Popple Reviewed-by: John Hubbard Reviewed-by: Dan Williams Acked-by: David Hildenbrand --- include/linux/memremap.h | 11 +++++++++++ include/linux/mm.h | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 0256a42..4aa1519 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -187,6 +187,17 @@ static inline bool folio_is_device_coherent(const struct folio *folio) return is_device_coherent_page(&folio->page); } +static inline bool is_fsdax_page(const struct page *page) +{ + return is_zone_device_page(page) && + page_pgmap(page)->type == MEMORY_DEVICE_FS_DAX; +} + +static inline bool folio_is_fsdax(const struct folio *folio) +{ + return is_fsdax_page(&folio->page); +} + #ifdef CONFIG_ZONE_DEVICE void zone_device_page_init(struct page *page); void *memremap_pages(struct dev_pagemap *pgmap, int nid); diff --git a/include/linux/mm.h b/include/linux/mm.h index 6567ece..05a44ae 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2015,6 +2015,13 @@ static inline bool folio_is_longterm_pinnable(struct folio *folio) if (folio_is_device_coherent(folio)) return false; + /* + * Filesystems can only tolerate transient delays to truncate and + * hole-punch operations + */ + if (folio_is_fsdax(folio)) + return false; + /* Otherwise, non-movable zone folios can be pinned. */ return !folio_is_zone_movable(folio); From patchwork Tue Feb 4 22:48:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960104 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11357C02193 for ; Tue, 4 Feb 2025 22:52:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D38928000A; Tue, 4 Feb 2025 17:52:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 95B46280001; Tue, 4 Feb 2025 17:52:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7607F28000A; Tue, 4 Feb 2025 17:52:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4FA0E280001 for ; Tue, 4 Feb 2025 17:52:53 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 165F5B04D6 for ; Tue, 4 Feb 2025 22:52:53 +0000 (UTC) X-FDA: 83083763826.10.B95FFEE Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2040.outbound.protection.outlook.com [40.107.243.40]) by imf25.hostedemail.com (Postfix) with ESMTP id 57EB9A0006 for ; Tue, 4 Feb 2025 22:52:50 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=UZbNZ4E7; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.40 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709570; a=rsa-sha256; cv=pass; b=crzvPQDBwNX9jGbzWLjzqUoHXvDIYCEnuQ67tktysCxfqu1VVqnku6hDYexRz5TI/jjVAC kU1WJKQgslIvWhZpS3OFOjcfM0BTrHdLnnKz1q50ivSJk3uDwNx04R0uZkilGth9A8Fa7Y SvdtDLKlOyFELPWF4Qpuu1OW67mR80k= ARC-Authentication-Results: i=2; imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=UZbNZ4E7; dmarc=pass (policy=reject) header.from=nvidia.com; spf=pass (imf25.hostedemail.com: domain of apopple@nvidia.com designates 40.107.243.40 as permitted sender) smtp.mailfrom=apopple@nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709570; 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=RtBaqYvfVYWwhkk0mbirzaJ8NN/nkFZeQ7cueszAH5c=; b=yXkq+VRsjFGVyXHjXeg0UxRWRB8xuQDaKrRvxEILRz8c/QiJXImo35bzffomxUHmcEqyxS /s8O5WDPul3CmGaBTq0P7CXN+ePK+Iu8pwmpH49oijwoMHp1TqPN4UebPNlRhlk0wlAB0C iNhWf3pDILj2026X/pDBCCW//v4a3/k= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=acdbjI+JlmyZHeF02C4EgbEEWvQzHeSFnFsI/UgF36voQprAum6tyqfaFqzCx3mze+XVQ9JcZYQk14NIFKTSwuOLXpMwCPbi9llZCgZyl16JcKEVRUQ4odpfe7KmPLGpXbh5hB9hPaW8met24muPQJgXmxTuRbolwKijcE3INXcMt56rG1V4ySWtoRylvs/JKoyVzsw6sqrR7jH+K19NztXnGdcA3Bn9vugDtv3MOaXBkCahnpIUVYS/v0RyD3aSpDr9Sa5KyjBTXxqTu0f5OZ4dyJi6hKAyn+VO2j18WK2NLZjdTaOJdYEslor+566SdelSNd5HwfV7jFKo85RJEQ== 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=RtBaqYvfVYWwhkk0mbirzaJ8NN/nkFZeQ7cueszAH5c=; b=E6/cmO1JniINZsmkCTgY9PSGvXMj/40PnY2HYP5M4g6LeTBDrMDopfkF1yc9w07csWd6vXHK3t4KQHHrFtAZUk9GQLuOb5kKZww05aTEbt8yPRO3fjXZ1ZmQChNoMjnZ84/aRdgbbEFHrX/QltvSDlQjNDYLN+Gn/L7nfhQS+ll+E0mONcDlXDQphZ7OIRDzv1FjV39p6quRecV/YsHk+DA4YSiTeYLARoQbj/YmDJD9MBMWTYQXxelx1r8CHwRk1yC5mhXNMX/gE2it9PDHCEYR9kztslvzsm6DQH+15nHoF7JZQZIDkMq/+E2la+MKNOUk71veRB17NZhMDkD8/w== 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=RtBaqYvfVYWwhkk0mbirzaJ8NN/nkFZeQ7cueszAH5c=; b=UZbNZ4E7KqfTxOmJlWnjvwU9jcNFD+MIHg5Fz1xQfwW7Pntoc+GbX+RFUw5vg4sZaKaz6VzxU8HcEXDAbhKgs3fU2DeSoDhWVS1feVWS7MI8qDATK3ycEaj7xE7FvPbTKCHrOCn1FSZqYU6jR5xjPSekvVmw5darkDZCgDbxhPMhm22ssp4Qc97XL6UloGUsTf+QFmvJTWYgagRneNTB24Bm6Ae0GQVYS74TsdNtFOaVCU4AAaJQc5C1X+FHz4o+c1JF7kxZvsNfnsz9hnMABUkVPY7YhN/vpIY14Cpwp0EDAA+8PJuEzaHU4diBpbi/QZtb8FWaGpmUSI/gruZleg== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB9027.namprd12.prod.outlook.com (2603:10b6:610:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:50:09 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:50:09 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev, Alexander Gordeev , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle Subject: [PATCH v7 18/20] dcssblk: Mark DAX broken, remove FS_DAX_LIMITED support Date: Wed, 5 Feb 2025 09:48:15 +1100 Message-ID: <229397bf27e565ed8dfc3832c4e57551fac86c90.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SYBPR01CA0014.ausprd01.prod.outlook.com (2603:10c6:10::26) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB9027:EE_ X-MS-Office365-Filtering-Correlation-Id: feca1f5b-63c2-4bb0-0e55-08dd456e468d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: gMOCCAj4fuTvXAmjSw8M3ggfwP/ubVnvhux/CvpKyojBBc3mNEMzgEyapyNeX/zrA++YUR6TweXr5YYFuuGkM1u7kpw1Z+v9YiZ18KWMbcJSsON7Qy0+L+DX2GRDfbrGz+salkk1wRRw4outIeccLkDV3X5H4/XOakiv2vb9l0U1K/JDC8TNtjmy8wgO4MFVTncEe97AgBOlfnQWW9lNqH9qdnqD4YzaEFnIv1+W6ZcJQ+JV0kV0zbYm7S8+VNwcUql1NNbNMweCJeIKtv1MHSQjL5ArCRCY/iRbfe4jFAmQ1qErUo8mw7/uoMjmPcwzbyMnqA9GVHyI6NDAIHUVbaIPr+Nk0NtgCm1ZhkXjxpvYWQjxkk9w29MJKLm91c/CZZ+J4SRW+0OCig3MyVfjxohCGKLBjPJ9OGO0hNP5cQiY8vowEVDvxNxD6pXsBUA81VcQJrforCKQZMtScJxGAMNYMwbOa2sLi6tKNYvTnJInUPxR2qy+Vr03s/Jg8zIjXOGInY6bqN8aKz7qGd5rw1y8D5upS5bykQSUMZcvxs99oq7Q5tKRzivkpLZF0z3y2a0VvP6glgZPXHrwCsnHgniMlJ8j9RIilA0ZdLF9CYffePabuFOsw72BD+QsuNIVfsgA0GpXmcPHVIQq/EE6lQ4vZvjAZt5422pFxw9EN0wBw66Cn3MMFm+Snln3Ujk6VAmBFoPMOuFhVk7Kiryof2Q63QgPfR2VDlWnfTf+zpTVS7VudEygNiFM7EnTP2GrMy20rAcTwYMeCv0aJAEXPbFYbItaof5cwzs+chJSVNxWExPG+gCfnfLhOKbjTV2EFAjnVTdvWWEQkdennR4r3XJpErnu3sanCJdqzOo1ATcZ+/tTYrTN413BpBIgex4I+AUcjvrGqSS8ly+zxtqQTPzBgYwEsEufn//8alFjnqn1bHFbJahrX4vYX2CaGxZDWE/ECCF+FErw1OHssVXYt8KCGyGtsUmK0uwXUtwFTFLX6+eUovwnXOcJv4tH8TmlqneEkrO/o/nfFvPb4HUyJksm7qTo8Q2ySiAg6j2SgKcQzRmDWXy79xfh6bVQviprCyWTJzzGHi8SYr5B6BL0gWvRVws9IGqUYkp0rKoy4mNrNM1Ry/IXqJwlnIAWFcoXKnRrG5EoEOFBwlQLmGgn2JLQIr/gVOEVITfHRn8xMOyDBYHHBCn/Rs2eWDFwZozXzesepyCMlz67Sy2pS25IlEOvAvpSPU+zBAwszghPaLuLK+3e75Q32i8EONhcTrTqM8t6moIp2Dg1Ki19Vsod9quQwt5oRW+5u3VXg2PrGScvIM7fYcpWD4DqWPHC1GNdjjuCv44pyDKPFOGUNiE70doeFG+uTenlWnAYAv3RZxXSMOyJH6FHwi2lIpOe2qMS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LMEnuwCrmGiliI4hsbYJHDwe92wbcNkdxuCOUD6gDQDd79wfdRACqHZat+zF4wgocSg0ozhDGdcNDZq/nFRIjya8hlZwCK/VAuv5RVDtRzX+ib0gUJK0w+1vKXS0yVeaCEs/9e2QF+CxNhqouKxUts0QIM5qLsRXFoX+QHqgg7tye1ox6E7QdLWHj7R39HL/FbgoIzpLqJ5t+Ule8MR6dewqNYHlnJYXF2fSHT6K+OflIG2VdDW/ShOcowIO+Gxji3hTXevh1AV90QAjH6JnSTDU6NTGDEKhMU9l7LCZrQLRy/WLnL0Ts3mJzNLd8votHzseF0XK3zIjTkzfdLCKW1/J6W3dNfeJWGrnxxodE+Fi7+0N8rFNDnDAsjImko3wzJuA6FFBXUBrzZq2hUJ8cipcSSuYhjUL5h9dhm9vb/HOcLeXhow5iurVmWYHOj0QV6672XVYpIgDcdLUwQvZeYS528ceAmSvaecqwZBeW/8ltD1v7WW1UgPYSqgOIue+4N0wgl6HbapeKHaEiWiCFoa20xG6qkDE1a2eGPM2SoBk23bahd1OU8SX6HXU/VioJ1jEYbRE8IT+RFssMCw95WUpLN5tGnib8XFc8ftOdYSAr1QgKsPuhkmAx2z0PTINf3V1avWThu1B+zqq3XY0RcvnuYGtjlpb13KlwqIbVWhXyHuHvkVq/6ZR8PM6ORspfWEmTNemJHSO9k7HUs36AhVGhhAoFPrCfwIJ5x71g42xckt3rGRYt3TPvLUg9lIIIXejVkz8dIlIQf8sHhYRnnI7/leApfotaD2wgI6PvLhlI2PgVXzAOvGugQZUFfVuWFHbgW0Ggw2j75rqNHF7MrGhV7xtZhj9GKxK2FDLHykkNpkHhjnu/PZm3kszhu8nDKL4MGCIhXXK6/yuZJBVbRpKGss60M93pSnPVixJoD7ow54Wz27eqf83yFtHIhEXcqdLJ4/AbUxm0EGEBLX5+MsqEeeR2C46twVWkvJgF2ZNSD33n0LLxjqRGDmkAC8oUEyvzGmU/z8gnal/wjNcyME6GoNoXxeNYmlO7WNyWN7NIJnqJh99FZVIpKqbZ0m6CNTfYyaKeEp+w04TJug9aXiNsAdBhhmqTv7cdEGdNtsUhTcNG/0/0q9tfVflKxyIvFwMnm6vG796G4SZdfWFN3XhSc1nKyRNLkbpXm5nyHiPhR/co0zP9FJmUq2XQ5rN5NkxzS4n0SIfRJ3ziNze4+PSWKOYK7+07lLA4jk5ClBMMSNjifPzyJnKgDv/OHWzrmS6gUE9p07Krz3goyxBsUerCemQFM71QN5APoV7NluiT6llYd2rY2Fag5kv6r3q1//eIhqrdEuJsNL+FYoXeV+7KZjf26P9buA60QjkhKQAUM41GjhRme9LBsQy7quxSBEzdNgoNHphJ9Ctl7nQ/kU1cis7n1ZmI1LYIOjWcpLHO7VqSMNqIRY+kwM+qv1GGwOzlcrDWYu2VBEkxynU87ay9nzTMJ8LGCpjEF794HQ6iLrxUyZHnaTh5KFkDPsp/+HaefAcc48nFDu8Gdd0cflr/2JP65BwpzV3u70yMByi0fplFe/WCs1pmfdCAuOE X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: feca1f5b-63c2-4bb0-0e55-08dd456e468d X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:50:09.2273 (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: B9L9wyMf0dUYlAXPWr5LM0Gh//MwCpX2TA4rV4lxjmh+d+j0VOMFgVh/YhsipKLNZza+KEpcx5g5cRxn9ctXHw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9027 X-Rspam-User: X-Rspamd-Queue-Id: 57EB9A0006 X-Rspamd-Server: rspam10 X-Stat-Signature: yotkab9in6xhszyg9re5kop9ekxsmthp X-HE-Tag: 1738709570-28910 X-HE-Meta: U2FsdGVkX1+jXvAOkYX6trj9WroaPPMgPOvnrVexk522Oc5t4L8PpK+5eqo7Db0OggYegq5DNdHeISGcZTxjWvE/+OQOgIrLXxqYTtdXMwZdlNn7a5zOEs6PZvNPCvRNtV9G58Jssldh8hyhjon1Kr7r6DDUA7v5Gs4LkhWLfZpTOs3z1IQdA/RY3esHMEd7CCTtdtPF+z8FXWcodWND39dqqFpjQKtHmn3iuNI5sMhc2Pi9uumhCzbbSj4QZnrHiG59vcnteuUrVTaUEFm2Sb9GBfApzc1gw0bu/1djnRO/ZB2+bxNV/OmbAh3IBL5qQltL50a+3wH/LF/5Jxf8yg4FKbF34FcMD3CbXJRdgo6hhUE8HY1ZPqUB/PH5pXq8sKjpEb/e1MaTsYOduybPaBxPQg1my3gKO6ZOsHJUA3Hd1tMtS/MEav0Sdcv2cswcUJtdM0T3W1KVxTt1IXpx+d1TDIyo9r9dKshad1YBy49KV/f/6RvgQPx4xiwkh2ONUPm0Gg6kRE0vN58zxfzcLqK/LBP8hcGaP9f+IiaQo6npZn9hQwAn35jzvXUscID0fIPvvi/kBvVHw70O1zji6tujiyonGy97E7Inviwxwkv5o272nnP24v5YBjsULP6dygRrcgdBVjzX5cO/Xzbxon2CmJfRTd4/J7l039hIu+u3HnU9f7dBFCW4oMKQNuQy4IUyoDErX+VnpjqETSoTXbDBKBCALx8LZ40vbirR6iVl3vDSLVZApwxMNrMS4WrlE3v6MZ3oD3WkQbww8bD90oWZORXzNMIss603TQKWLWoK0Yn2xaN4GmN+Xfnfls3nmtOKmFAYThXER16iOto7yTCRUP6i9v+4IyzGGwycbL8SutNmeFDEy2u76IhZkIFnNz2mB/PkEouocLHJGmxxWsJHb+n8R6mGms4+Zn0tzT6fJhOkdrdWtn9zra8MLsUk8Z3R7zfsi0v+xG++jNv Apv/GMpr NfHFaQJ9fL1f/D/eaBTMrEn0zL+hSqmsA2Eu6dnEiyRUVynKrSxYOEJh72U4HlUwfkQGL2fv8vVN3ws63Ga19+M+LqqW7wn/o7NnSaRCVNaCT1jxEnce1Rb9RijrQ+DC5p48pBXndtR6QdAhs7GfHM6OSqwHUoetOuiL5xi4tcVufBs/HdRXyqo10wxQZsMb5eJysQcTklwcFLbRhEWAX1xJIDwJrXzAwt04+iQeeVaHXDRaOWYRGMQc0xwR8g43qhtcI1THx/xtM7bjFw1h6JaGusQjBKn7mf9OHXTA4PLSpd2bt5Lhy2xb+Zg5xp2PqKRUw3k3wOt5wqRDDLd1+CEz+GfXYtBfJ23DQXcW+PZXgwK97IxQvck9SAwzhGBo3XOcsbofF91tBQIO2SxO7awe+7n4UXJmnhI/JQqXfEtMa4djRpuWae7/MOtT3fdDSxqTxkYM0qGm5RFEM+DIHCB7pqRcljjkX+pBEg5oq2COMgvvpWPS03EpPEwHa5LUE3hFTM5HPfuH0wsJxrNcXQzFvXMnx5Oe1ROaBxnqgqTv1NsuQKA9geX8LFHfqiQXZDE3LvSBqGHjFEHIapVu7xTsIwdhO/bo9B7xHN0cK1thaBFY= 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: From: Dan Williams The dcssblk driver has long needed special case supoprt to enable limited dax operation, so called CONFIG_FS_DAX_LIMITED. This mode works around the incomplete support for ZONE_DEVICE on s390 by forgoing the ability of dax-mapped pages to support GUP. Now, pending cleanups to fsdax that fix its reference counting [1] depend on the ability of all dax drivers to supply ZONE_DEVICE pages. To allow that work to move forward, dax support needs to be paused for dcssblk until ZONE_DEVICE support arrives. That work has been known for a few years [2], and the removal of "pte_devmap" requirements [3] makes the conversion easier. For now, place the support behind CONFIG_BROKEN, and remove PFN_SPECIAL (dcssblk was the only user). Link: http://lore.kernel.org/cover.9f0e45d52f5cff58807831b6b867084d0b14b61c.1725941415.git-series.apopple@nvidia.com [1] Link: http://lore.kernel.org/20210820210318.187742e8@thinkpad/ [2] Link: http://lore.kernel.org/4511465a4f8429f45e2ac70d2e65dc5e1df1eb47.1725941415.git-series.apopple@nvidia.com [3] Reviewed-by: Gerald Schaefer Tested-by: Alexander Gordeev Acked-by: David Hildenbrand Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Cc: Sven Schnelle Cc: Jan Kara Cc: Matthew Wilcox Cc: Christoph Hellwig Cc: Alistair Popple Signed-off-by: Dan Williams --- Documentation/filesystems/dax.rst | 1 - drivers/s390/block/Kconfig | 12 ++++++++++-- drivers/s390/block/dcssblk.c | 27 +++++++++++++++++---------- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/Documentation/filesystems/dax.rst b/Documentation/filesystems/dax.rst index 719e90f..08dd5e2 100644 --- a/Documentation/filesystems/dax.rst +++ b/Documentation/filesystems/dax.rst @@ -207,7 +207,6 @@ implement direct_access. These block devices may be used for inspiration: - brd: RAM backed block device driver -- dcssblk: s390 dcss block device driver - pmem: NVDIMM persistent memory driver diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig index e3710a7..4bfe469 100644 --- a/drivers/s390/block/Kconfig +++ b/drivers/s390/block/Kconfig @@ -4,13 +4,21 @@ comment "S/390 block device drivers" config DCSSBLK def_tristate m - select FS_DAX_LIMITED - select DAX prompt "DCSSBLK support" depends on S390 && BLOCK help Support for dcss block device +config DCSSBLK_DAX + def_bool y + depends on DCSSBLK + # requires S390 ZONE_DEVICE support + depends on BROKEN + select DAX + prompt "DCSSBLK DAX support" + help + Enable DAX operation for the dcss block device + config DASD def_tristate y prompt "Support for DASD devices" diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 0f14d27..7248e54 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -534,6 +534,21 @@ static const struct attribute_group *dcssblk_dev_attr_groups[] = { NULL, }; +static int dcssblk_setup_dax(struct dcssblk_dev_info *dev_info) +{ + struct dax_device *dax_dev; + + if (!IS_ENABLED(CONFIG_DCSSBLK_DAX)) + return 0; + + dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops); + if (IS_ERR(dax_dev)) + return PTR_ERR(dax_dev); + set_dax_synchronous(dax_dev); + dev_info->dax_dev = dax_dev; + return dax_add_host(dev_info->dax_dev, dev_info->gd); +} + /* * device attribute for adding devices */ @@ -547,7 +562,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char int rc, i, j, num_of_segments; struct dcssblk_dev_info *dev_info; struct segment_info *seg_info, *temp; - struct dax_device *dax_dev; char *local_buf; unsigned long seg_byte_size; @@ -674,14 +688,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char if (rc) goto put_dev; - dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops); - if (IS_ERR(dax_dev)) { - rc = PTR_ERR(dax_dev); - goto put_dev; - } - set_dax_synchronous(dax_dev); - dev_info->dax_dev = dax_dev; - rc = dax_add_host(dev_info->dax_dev, dev_info->gd); + rc = dcssblk_setup_dax(dev_info); if (rc) goto out_dax; @@ -917,7 +924,7 @@ __dcssblk_direct_access(struct dcssblk_dev_info *dev_info, pgoff_t pgoff, *kaddr = __va(dev_info->start + offset); if (pfn) *pfn = __pfn_to_pfn_t(PFN_DOWN(dev_info->start + offset), - PFN_DEV|PFN_SPECIAL); + PFN_DEV); return (dev_sz - offset) / PAGE_SIZE; } From patchwork Tue Feb 4 22:48:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960103 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3F91C02196 for ; Tue, 4 Feb 2025 22:52:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 516D0280009; Tue, 4 Feb 2025 17:52:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A05C280001; Tue, 4 Feb 2025 17:52:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22FD1280009; Tue, 4 Feb 2025 17:52:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E9F96280001 for ; Tue, 4 Feb 2025 17:52:39 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id ABEC6A02A1 for ; Tue, 4 Feb 2025 22:52:39 +0000 (UTC) X-FDA: 83083763238.03.AB15E2B Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2057.outbound.protection.outlook.com [40.107.237.57]) by imf02.hostedemail.com (Postfix) with ESMTP id C403580015 for ; Tue, 4 Feb 2025 22:52:36 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=fX89E0Ih; spf=pass (imf02.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.57 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709556; 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=yjxNZyoCS6wM4tRnS9oD1pOzf9Wm0aTgkwxj3M/8q5s=; b=BM5TtKueSGL4Ff8Blfv7NQ3RnWMazjrnAVEx5K3czMqEXhDQtB4zzcGH3yUqkDFKNyaH/r u1R6YFfU5uvRxhxB5Ajhn4Ekav/tV5o0yB4/v9dwBO1FUFxPjXtK2+X7dfIGBGiOkiqEmP x0Wd01aYhkmQssnnSUaEJ2rAHmH+CJ4= ARC-Authentication-Results: i=2; imf02.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=fX89E0Ih; spf=pass (imf02.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.57 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709556; a=rsa-sha256; cv=pass; b=DhqR6gsUCGXNXGRVOzhU3fE/7CsIEUhQeEaK0TW4oD6rP4v1bAagnT8DwXPXBt8mutg7NJ b7Z9I5iC1vT2PDOjH+lc+FeJUiB94nq5V6c4s8wkSPRs1rYXbOmHETrjcqr4DocqNDibfS OElC6I5KkLbW4zb5rJRL325E0Jerpns= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Dpsqgdv4rFfKNR+IJXMJccBsqZJvc/0N0gBUSYymczDIATxf5vyM5LaME83WcT9FVcIuwya3GHqgD7SYY3xsD8vQs2sOhCHWVfUDoPtSJseePuJu1dyeP8BTWvi1KDfEI5EQRlJsuwyTdEwO3HH8MDt/H789b2K3tvNOHadB8UI2hD35vDx2VSVkkZx8P3kyCku1F6ATlG6GqgnkiUBCKb2URM17tT6+s1L9qw7DTx6KOAKRL8DnchfjHKacAxpU59klASPx2P72+59TcuQT3cI9mNuVaGqupwO10itqH9HpswuNaVBjRfDXnn9YFUf5e49JqMmOmGOvKzin+FLmgA== 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=yjxNZyoCS6wM4tRnS9oD1pOzf9Wm0aTgkwxj3M/8q5s=; b=q+UJTJl9vumjwwgpw0oL7FZYzdSqeNWyHLN/DX9c4zCOOiX3loOJZIUrcwX1oq+yTOfuexfLMNFVqQYapl5T8I98L9Aklj4X97lBWssdhKwG59PbOdFFll5lLmP7r7MWE/W+7MDacQRn3zILNL8BmGXfwxIzluQbUVIj1HJZRpBiNClfGm3Y32jrPkSh0CHUj+K7jwvgbpC8qdq7dWPOWa2Z2UgcBmq1Uz+eDRi8VHXv7/CJUyGJQSbYx9mszAyk0QxgDLSAnujcjl6txybXS+JuW34agh8Ap714TWr9QluMmiLaraIAd87y5C/qUlcBwVj/cuKxBuJd3Aa6bYSryg== 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=yjxNZyoCS6wM4tRnS9oD1pOzf9Wm0aTgkwxj3M/8q5s=; b=fX89E0Ih6yfvqVdszDTvJulZzPg2WnVAollc/vKdQGaG7wOAl1xWLi7zEjJjy7bDPQmPdI1AXIhi7rhsBj0HTNLBE9BXD7bpq1g3TfWyEhnVKPSn7rpFRQNmCJ0EqOe6C9W1SLQNI71BXnV5o3a8MbLqjfmiooHMSFUV6D9zc/PefSu4E3K9srU0md7+TJ4nzEVUWY+G4vwN8EYFP/q9Jl2Yae+Ks45BnlRYyJtLPfiFgma4DdFhis9mk795jN2+F726QM4+pSQR6sP4HRYM2nfH+wBDYZzIFnuYzE2ZblBphf9Ngb4tq4R5zYyloc2Orny6ycbOnRsRIfEN7R4iXQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by CH3PR12MB9027.namprd12.prod.outlook.com (2603:10b6:610:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:50:14 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:50:14 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 19/20] fs/dax: Properly refcount fs dax pages Date: Wed, 5 Feb 2025 09:48:16 +1100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY2PR01CA0048.ausprd01.prod.outlook.com (2603:10c6:1:15::36) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|CH3PR12MB9027:EE_ X-MS-Office365-Filtering-Correlation-Id: 18592cb4-b899-4a52-28e7-08dd456e4966 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: orFh/WQuc0yZKXt7MhAf++hGAnw/oxhnKhSLKpNIazSx7BVudIXoBScnBXWi1NuKCl3sauCv6jTQDcwQPTgNX7vA/CoMJA6+G/P2XWEp6VJSglPQoJmPZYleinbPH9SDfgt/QngiCKKFJgm2IfKW+cFNoekUvbx3Ymi+WJU7Wm0edbxsO4NIGwDg42dsy761jLfEZL3v/8/mYrxsqGm2QS1Ekd9F6D37DuisNZhFzLFHoCW0f/VASA0s/T9NkRhMLbSJcwCCYJlvGFkEAIQbjASxOF94bTFbWAKzQxWdNnRtgq1aLLYlvmuTguaOPXmOCBFwcqE1Xmgy4xI9ZGZMv+0Nv4p5ZcMPgFGs064YfgpFElFssFiVDmTgP92wTvT9jJio1eIBCD28rO/vmM2GqfeAjHppnYNWH4NyCZ5j72ho73OTADo7Pwh6pt9U+65ZV7EA61sxPdffIqNzv2JWXBVQuS/jT3iI7ugEJnuMXcb7h6VyVq/XR4VeOEM1MQzbqt42s3zIu7q04UYzi8Hfkru9PSfHUCzX69/8TSA9+AEmO78ehVKK4objKsCRLJUCSO/waBoHXn7yVqjBZI74O1MOYy77ZcMk2okMQoUhSvOQv7Rh7hsqD74rbQWIXn/CmmtZz1yIHCY5N2rZTtSP+WeEIFLBEMQR+FicjsbaWUJZU8ao5t4QyKy5SShmSdXkuGvopgp551PwpF6DfKWy3Lk5esz5oEARI8Lx4IiGtvcL776gyWeYvGlQmpYOEkvFPc6h11abEyjEG6XdiPyv8iSPebBwbkYSJG6Jw0HtdrJn14ZoTlA6FJEB/KGDEksok/xbcvXY79bw3hvRi5uxSqLmP02eOglpRDwxpz6xFd2yeysZufq33bOG+bPSfnA7cIm3nZANBr+euCC04J2jX1phjz5LYXpMLBh/OIZdnKIs3F+r9SbJwqfWw4TE4LI71TnbxzuqJh+td3ca7G2EqP4CRn8bnTN39tcIQ4HURmoIVzRyOVHiV02v8DYc6SAQ3CFj/DfZN/4/VWwjTzzD25CQjzVAcoapo0IrDlikUB7GFLS2jUUCEfH3iW0dTa41Djeyqr87bJbGbuCPDodjtUe1YsqvqQOPaWmPcPMKt5Mx6zkjtpVLavWuvg06zaV6Ix+hoFrV4Cj8Ha9cRH5HdrQMO2UHIHDdE/6nRe+7h4E6x4eHYmMR7iW7JrkRtMu3PWOMrxbdibPOqtEkg3oQiJJZs6aqvnTU4FXtrVE6PB5v4tBvwJymmZ0gZLutr8VHB0fKZSD+dRdp9DrJsmJbEa4hPFbOocrI65JrRwmHIIWJAOzmlmezY7F33vNO+p45w/jykGahaf4fNnEl606YuLvqlnp69Dx3VfxSP0lClsnN8lmMjigCkMv7YE7A4Bss X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: daaRKvABRgiDpreghow6CI/pC9sNZ6AvFSDV2aMtpUpPkM3enJ2u9dDUCsiF6C9xCvZhvw2nTEFHqFV9PgWFYfn36z9cjF0WD3O+YUcjVMSyiiIgyqEQiRaGTQr0WV4L1ltVNs8188CH8vOnfE9L3l1Cw6W9XrzAps5KRylEKA7w0Pc4MF6m2ErkYI/nGiq9SGyxWfG2vGyK9upUyc/TF/Bff/ni35dSW7mwy0d6nsuutlhsjBhdayW4zvYcN/rkLgEMbUpTPGhx3Al3cMyi4fwMRl2n4FaHi6GbJckd0oJuoigO9KMJEXuXL7poimq3XEUZFZ/mnF1dOk2nIQFOuCGknemdgHgHmbogyTFMH3lLN1rbPgBOeS5K1dJiK+QrAe3pX8YBlUkjReT2BdfyREf5Hu2AJ3kIl6UryoppgOiS8nPV2fhdkXOWDqOFxAySbiRnbPa7igtTy+sKtvJX7cdg6ZHoFbvxqmvNnU0Gej2RW65oEMCq2I1UavUxOiHU2W/NBzBQtAE0R6umKbbTsFK/U18g0NzSG2TtlCMl8f7DIqbcAmkPbV92HvxOfdV5FsQYxrbSucEgb+FJulwSmDjvQQ/gyJqsq+2WDSX911jvqtCNQ5mCJk5OksNhz9O6t9jlviijSS4IqYCsb3/dBfp24HAQ9Nib3vb66zOuRRCyKmHkPZou7Iv03BUu/PVLab5Ue/lev+Un8y3C2cEpE4JqMFw0D3oc2LQtcoQALw3LF4B5/z/9GuAiAh/rqBt7BwqozuPPWMeQpuUEzY25rmcTM++blBhlG/sIJqwpWPHHv+XPFNagEEvWaMAyl3IUzGqgQBoTOwwSUlwTuleUBoWy7iW2T5TyD1EEBqWswIS1U9Aaf1ndNQlz2fukU403vK09fZBP8Sh+CKjnM/JQyeYJa1g+mVQi5WhTZdicYaPSBDMZ0SavclQG0Li8VhcfPsz1Z3g3bv28L2JX96LSZ9b4xNz3ELjqejcRfbuzREF/6soaYoZoYyKTcjsrjknvFaD01Ugnr1mBGMYuSNnTrFKJLwH5fmC//cxFTGHSH2QooRu1bRTGW1LTfdd0rCDhds6Bro+ixeOh8unrTsPXA1VU0WBOUu8pIqgzzA7+YKJK1mh8rtYqP33+06Nl7+l/6dyquBKaljqJyYyrBH37YdZ0ZZTwohPmi7DsgddOr4qPoQFTyFllptViWPvu0KHEy8OIbn0ybCgxAogVf3TGhrDzSRHnAOKteVY4LFS9GfsqXIdcl+mSnpt5TdoyYah47X/0gEp7WkC3O+xKPu2TWmIqTqd7kePeL6/bCal4hPQseHNH49O3/cvAp2suaxi+3jVgXX+1A+QZRLk7dxTLWyozvEhmTAWsP+NMbLxPjOHR5OyvM3T6lHJDdoP80kk9BOgXd/dPGhFXosnTHWvwRetBLBe9l22k32YZtpGMT7gOV/namdHuV9i6/uAiy42GRcZLM3bOoW4bCMYh/agAfYwxnCmYDDVCS80LzQt8c35yyxCt3gbbIJu0vPCG+wm92dqv4xoFdUHn0XtZIaQ97P1hKGtFFEAqppqsx51H6YnfuvO2Msx2WSK0y0xVIzGA X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18592cb4-b899-4a52-28e7-08dd456e4966 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:50:14.0543 (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: YSaNZ+iT5aie6258EBxFWmZ0cVfbW/2Dqs5ALm1mJYyaCrAlu0Lbd5salI9gGsGpJKSsme2Gm2tdOHJ8ZqP5WQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9027 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: C403580015 X-Stat-Signature: 5rry73st17c3oogtrid9fhwgwii5zjht X-HE-Tag: 1738709556-796696 X-HE-Meta: U2FsdGVkX1+RY6Swr6dulEjmkZ1mfKQK+VFh7tTU2q91bNRoqUIO2EoOhHCFMsv2rmMfreMEkx0xgiM5M8ZnuEEuNUz4EV3ZU/6Ut/IkheAvYDUHnkP1LWSva1bjHnRMjoOiTmBkG7lncpaFTA0nw9FaPlt89nTN11bj12pgOnD9JiriusLmqTAEYaEnAo15tlHYSxGum9D9/rEYDaDqq6MsENeLzRDhjvtk3+6GVQQKErWHkR/vYz/fG4HNmLxj94aLb8bCLDkfLD2hJbIOcz5xdDa0iatz60Kiw+fKXE07h1ZYWXO4vnci63ERGBZZJ9a4a5oHiimpyF/ODD0sHZQs4yfmMw8I1ODYzJlrS+lihUsO+5/XNsXXRboIXDchFM+b7sjoROm0h4tfqIbXWuEDadpOx24kdSp9Tw2VewFjXEH5ccyJlUtKpcECqSn+31fNUNJh/Fj5ZUb3O2sLFbw5u/8BSyzpi53vKMtCOClMZvSvm5EU1Da6DLdUAjw9W/ejBwuIFHPmDJ19VXop2Az5TzA9ZLZoGH/AMdb/w4Oiiu4PMCNlLsllP+aaZH/agMJVKTQXfqJcfmCWL20BWycJ1zRfwsqgSCJziJIDcAbYDO03nPWccN6eX1QpoPc6mtzsxgfeu/ZFIUEPXjxd/tEX1/UOX0aTIoH20cC507qzQRIprlVQSAo7+2JK/haJ0fkAk2okEiD/i/yVIm7Xr1Gk8Fun6nRIse78strDIIYiQUl0HUOyzk5rPVRscE6CbdBImyJcWoUthS3LRNJrTYihbIZraXbKXyZj5d9vMwxlA/gtF7fyte8CghmCAzoKNWqf9CE7Z2ryOQHepltfcTn+AEs2x7Ily2/gRU6LhlVI5LtXmIo0f2hCyWJql3yEbwZIF9f8KvwuJtZLnviR01c+GrnjmIh2saz0TItMvv/dellgfQlEwonhQ/XLhps2SoDOIdS/5mseZ57vB9a WSO0LSCJ ZhmDkD9NRNDflioVV1n4zmPdf2DAzKKerk/AwnS+7RUaO2xKCOG7HzCxeZTooCWvX6T/mV+aG67xh9G+r3eYw9+xgL3pMAof5j6H1XZtBAVJi4y13CZlsR+cDzGd9FSt6g87cpnXcCe26+IG5olLwemsnbLVx36MuUbwC5z3BMz41Tmbc8m4evCyTnEJJ3aD6TBR1k8JmAypZpEG3lQyPK4eJfgr3KdVnLSmmpc7siWD8oTSyZcDP8DTPdV5Wx+7bXBjEmYEFzp/Dt77unvzwMWnBldDU/qj4J5tdelrUy5hPizh1+3iGfU48bd1jFB0+tF0HoqdiPs9pUMnYFkyl+vmf9kDRkXUsv3P9Qz8ILlSMa/g05lpbKtxGjVXNhVjIMaBwDov3SZGel9+nDvxdoZ6YCp35TWLidqbMPdWxwfa9HFlAnuEBEq/i6A== 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: Currently fs dax pages are considered free when the refcount drops to one and their refcounts are not increased when mapped via PTEs or decreased when unmapped. This requires special logic in mm paths to detect that these pages should not be properly refcounted, and to detect when the refcount drops to one instead of zero. On the other hand get_user_pages(), etc. will properly refcount fs dax pages by taking a reference and dropping it when the page is unpinned. Tracking this special behaviour requires extra PTE bits (eg. pte_devmap) and introduces rules that are potentially confusing and specific to FS DAX pages. To fix this, and to possibly allow removal of the special PTE bits in future, convert the fs dax page refcounts to be zero based and instead take a reference on the page each time it is mapped as is currently the case for normal pages. This may also allow a future clean-up to remove the pgmap refcounting that is currently done in mm/gup.c. Signed-off-by: Alistair Popple Reviewed-by: Dan Williams --- Changes for v7: - s/dax_device_folio_init/dax_folio_init/ as suggested by Dan - s/dax_folio_share_put/dax_folio_put/ Changes since v2: Based on some questions from Dan I attempted to have the FS DAX page cache (ie. address space) hold a reference to the folio whilst it was mapped. However I came to the strong conclusion that this was not the right thing to do. If the page refcount == 0 it means the page is: 1. not mapped into user-space 2. not subject to other access via DMA/GUP/etc. Ie. From the core MM perspective the page is not in use. The fact a page may or may not be present in one or more address space mappings is irrelevant for core MM. It just means the page is still in use or valid from the file system perspective, and it's a responsiblity of the file system to remove these mappings if the pfn mapping becomes invalid (along with first making sure the MM state, ie. page->refcount, is idle). So we shouldn't be trying to track that lifetime with MM refcounts. Doing so just makes DMA-idle tracking more complex because there is now another thing (one or more address spaces) which can hold references on a page. And FS DAX can't even keep track of all the address spaces which might contain a reference to the page in the XFS/reflink case anyway. We could do this if we made file systems invalidate all address space mappings prior to calling dax_break_layouts(), but that isn't currently neccessary and would lead to increased faults just so we could do some superfluous refcounting which the file system already does. I have however put the page sharing checks and WARN_ON's back which also turned out to be useful for figuring out when to re-initialising a folio. --- drivers/nvdimm/pmem.c | 4 +- fs/dax.c | 198 ++++++++++++++++++++++++---------------- fs/fuse/virtio_fs.c | 3 +- include/linux/dax.h | 2 +- include/linux/mm.h | 27 +----- include/linux/mm_types.h | 7 +- mm/gup.c | 9 +-- mm/huge_memory.c | 6 +- mm/internal.h | 2 +- mm/memory-failure.c | 6 +- mm/memory.c | 6 +- mm/memremap.c | 47 ++++----- mm/mm_init.c | 9 +-- mm/swap.c | 2 +- 14 files changed, 170 insertions(+), 158 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index d81faa9..785b2d2 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -513,7 +513,7 @@ static int pmem_attach_disk(struct device *dev, pmem->disk = disk; pmem->pgmap.owner = pmem; - pmem->pfn_flags = PFN_DEV; + pmem->pfn_flags = 0; if (is_nd_pfn(dev)) { pmem->pgmap.type = MEMORY_DEVICE_FS_DAX; pmem->pgmap.ops = &fsdax_pagemap_ops; @@ -522,7 +522,6 @@ static int pmem_attach_disk(struct device *dev, pmem->data_offset = le64_to_cpu(pfn_sb->dataoff); pmem->pfn_pad = resource_size(res) - range_len(&pmem->pgmap.range); - pmem->pfn_flags |= PFN_MAP; bb_range = pmem->pgmap.range; bb_range.start += pmem->data_offset; } else if (pmem_should_map_pages(dev)) { @@ -532,7 +531,6 @@ static int pmem_attach_disk(struct device *dev, pmem->pgmap.type = MEMORY_DEVICE_FS_DAX; pmem->pgmap.ops = &fsdax_pagemap_ops; addr = devm_memremap_pages(dev, &pmem->pgmap); - pmem->pfn_flags |= PFN_MAP; bb_range = pmem->pgmap.range; } else { addr = devm_memremap(dev, pmem->phys_addr, diff --git a/fs/dax.c b/fs/dax.c index 1128a0d..9e4940a 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -71,6 +71,11 @@ static unsigned long dax_to_pfn(void *entry) return xa_to_value(entry) >> DAX_SHIFT; } +static struct folio *dax_to_folio(void *entry) +{ + return page_folio(pfn_to_page(dax_to_pfn(entry))); +} + static void *dax_make_entry(pfn_t pfn, unsigned long flags) { return xa_mk_value(flags | (pfn_t_to_pfn(pfn) << DAX_SHIFT)); @@ -338,28 +343,15 @@ static unsigned long dax_entry_size(void *entry) return PAGE_SIZE; } -static unsigned long dax_end_pfn(void *entry) -{ - return dax_to_pfn(entry) + dax_entry_size(entry) / PAGE_SIZE; -} - -/* - * Iterate through all mapped pfns represented by an entry, i.e. skip - * 'empty' and 'zero' entries. - */ -#define for_each_mapped_pfn(entry, pfn) \ - for (pfn = dax_to_pfn(entry); \ - pfn < dax_end_pfn(entry); pfn++) - /* * A DAX page is considered shared if it has no mapping set and ->share (which * shares the ->index field) is non-zero. Note this may return false even if the * page is shared between multiple files but has not yet actually been mapped * into multiple address spaces. */ -static inline bool dax_page_is_shared(struct page *page) +static inline bool dax_folio_is_shared(struct folio *folio) { - return !page->mapping && page->share; + return !folio->mapping && folio->share; } /* @@ -372,88 +364,129 @@ static inline bool dax_page_is_shared(struct page *page) * recover ->mapping and ->index information. For example by implementing * dax_holder_operations. */ -static void dax_page_make_shared(struct page *page) +static void dax_folio_make_shared(struct folio *folio) { /* - * page is not currently shared so mark it as shared by clearing - * page->mapping. + * folio is not currently shared so mark it as shared by clearing + * folio->mapping. */ - page->mapping = NULL; + folio->mapping = NULL; /* - * page has previously been mapped into one address space so set the + * folio has previously been mapped into one address space so set the * share count. */ - page->share = 1; + folio->share = 1; } -static inline unsigned long dax_page_share_put(struct page *page) +static inline unsigned long dax_folio_put(struct folio *folio) { - WARN_ON_ONCE(!page->share); - return --page->share; + unsigned long ref; + + if (!dax_folio_is_shared(folio)) + ref = 0; + else + ref = --folio->share; + + WARN_ON_ONCE(ref < 0); + if (!ref) { + folio->mapping = NULL; + if (folio_order(folio)) { + struct dev_pagemap *pgmap = page_pgmap(&folio->page); + unsigned int order = folio_order(folio); + unsigned int i; + + for (i = 0; i < (1UL << order); i++) { + struct page *page = folio_page(folio, i); + + ClearPageHead(page); + clear_compound_head(page); + + /* + * Reset pgmap which was over-written by + * prep_compound_page(). + */ + page_folio(page)->pgmap = pgmap; + + /* Make sure this isn't set to TAIL_MAPPING */ + page->mapping = NULL; + page->share = 0; + WARN_ON_ONCE(page_ref_count(page)); + } + } + } + + return ref; +} + +static void dax_folio_init(void *entry) +{ + struct folio *folio = dax_to_folio(entry); + int order = dax_entry_order(entry); + + /* + * Folio should have been split back to order-0 pages in + * dax_folio_put() when they were removed from their + * final mapping. + */ + WARN_ON_ONCE(folio_order(folio)); + + if (order > 0) { + prep_compound_page(&folio->page, order); + if (order > 1) + INIT_LIST_HEAD(&folio->_deferred_list); + WARN_ON_ONCE(folio_ref_count(folio)); + } } static void dax_associate_entry(void *entry, struct address_space *mapping, - struct vm_area_struct *vma, unsigned long address, bool shared) + struct vm_area_struct *vma, unsigned long address, bool shared) { - unsigned long size = dax_entry_size(entry), pfn, index; - int i = 0; + unsigned long size = dax_entry_size(entry), index; + struct folio *folio = dax_to_folio(entry); if (IS_ENABLED(CONFIG_FS_DAX_LIMITED)) return; index = linear_page_index(vma, address & ~(size - 1)); - for_each_mapped_pfn(entry, pfn) { - struct page *page = pfn_to_page(pfn); - - if (shared && (page->mapping || page->share)) { - if (page->mapping) - dax_page_make_shared(page); + if (shared && (folio->mapping || dax_folio_is_shared(folio))) { + if (folio->mapping) + dax_folio_make_shared(folio); - WARN_ON_ONCE(!page->share); - page->share++; - } else { - WARN_ON_ONCE(page->mapping); - page->mapping = mapping; - page->index = index + i++; - } + WARN_ON_ONCE(!folio->share); + WARN_ON_ONCE(dax_entry_order(entry) != folio_order(folio)); + folio->share++; + } else { + WARN_ON_ONCE(folio->mapping); + dax_folio_init(entry); + folio = dax_to_folio(entry); + folio->mapping = mapping; + folio->index = index; } } static void dax_disassociate_entry(void *entry, struct address_space *mapping, - bool trunc) + bool trunc) { - unsigned long pfn; + struct folio *folio = dax_to_folio(entry); if (IS_ENABLED(CONFIG_FS_DAX_LIMITED)) return; - for_each_mapped_pfn(entry, pfn) { - struct page *page = pfn_to_page(pfn); - - WARN_ON_ONCE(trunc && page_ref_count(page) > 1); - if (dax_page_is_shared(page)) { - /* keep the shared flag if this page is still shared */ - if (dax_page_share_put(page) > 0) - continue; - } else - WARN_ON_ONCE(page->mapping && page->mapping != mapping); - page->mapping = NULL; - page->index = 0; - } + dax_folio_put(folio); } static struct page *dax_busy_page(void *entry) { - unsigned long pfn; + struct folio *folio = dax_to_folio(entry); - for_each_mapped_pfn(entry, pfn) { - struct page *page = pfn_to_page(pfn); + if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry)) + return NULL; - if (page_ref_count(page) > 1) - return page; - } - return NULL; + if (folio_ref_count(folio) - folio_mapcount(folio)) + return &folio->page; + else + return NULL; } /** @@ -786,7 +819,7 @@ struct page *dax_layout_busy_page(struct address_space *mapping) EXPORT_SYMBOL_GPL(dax_layout_busy_page); static int __dax_invalidate_entry(struct address_space *mapping, - pgoff_t index, bool trunc) + pgoff_t index, bool trunc) { XA_STATE(xas, &mapping->i_pages, index); int ret = 0; @@ -954,7 +987,8 @@ void dax_break_layout_final(struct inode *inode) wait_page_idle_uninterruptible(page, inode); } while (true); - dax_delete_mapping_range(inode->i_mapping, 0, LLONG_MAX); + if (!page) + dax_delete_mapping_range(inode->i_mapping, 0, LLONG_MAX); } EXPORT_SYMBOL_GPL(dax_break_layout_final); @@ -1040,8 +1074,10 @@ static void *dax_insert_entry(struct xa_state *xas, struct vm_fault *vmf, void *old; dax_disassociate_entry(entry, mapping, false); - dax_associate_entry(new_entry, mapping, vmf->vma, vmf->address, - shared); + if (!(flags & DAX_ZERO_PAGE)) + dax_associate_entry(new_entry, mapping, vmf->vma, vmf->address, + shared); + /* * Only swap our new entry into the page cache if the current * entry is a zero page or an empty entry. If a normal PTE or @@ -1229,9 +1265,7 @@ static int dax_iomap_direct_access(const struct iomap *iomap, loff_t pos, goto out; if (pfn_t_to_pfn(*pfnp) & (PHYS_PFN(size)-1)) goto out; - /* For larger pages we need devmap */ - if (length > 1 && !pfn_t_devmap(*pfnp)) - goto out; + rc = 0; out_check_addr: @@ -1338,7 +1372,7 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, struct vm_fault *vmf, *entry = dax_insert_entry(xas, vmf, iter, *entry, pfn, DAX_ZERO_PAGE); - ret = vmf_insert_mixed(vmf->vma, vaddr, pfn); + ret = vmf_insert_page_mkwrite(vmf, pfn_t_to_page(pfn), false); trace_dax_load_hole(inode, vmf, ret); return ret; } @@ -1809,7 +1843,8 @@ static vm_fault_t dax_fault_iter(struct vm_fault *vmf, loff_t pos = (loff_t)xas->xa_index << PAGE_SHIFT; bool write = iter->flags & IOMAP_WRITE; unsigned long entry_flags = pmd ? DAX_PMD : 0; - int err = 0; + struct folio *folio; + int ret, err = 0; pfn_t pfn; void *kaddr; @@ -1841,17 +1876,18 @@ static vm_fault_t dax_fault_iter(struct vm_fault *vmf, return dax_fault_return(err); } + folio = dax_to_folio(*entry); if (dax_fault_is_synchronous(iter, vmf->vma)) return dax_fault_synchronous_pfnp(pfnp, pfn); - /* insert PMD pfn */ + folio_ref_inc(folio); if (pmd) - return vmf_insert_pfn_pmd(vmf, pfn, write); + ret = vmf_insert_folio_pmd(vmf, pfn_folio(pfn_t_to_pfn(pfn)), write); + else + ret = vmf_insert_page_mkwrite(vmf, pfn_t_to_page(pfn), write); + folio_put(folio); - /* insert PTE pfn */ - if (write) - return vmf_insert_mixed_mkwrite(vmf->vma, vmf->address, pfn); - return vmf_insert_mixed(vmf->vma, vmf->address, pfn); + return ret; } static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, @@ -2090,6 +2126,7 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order) { struct address_space *mapping = vmf->vma->vm_file->f_mapping; XA_STATE_ORDER(xas, &mapping->i_pages, vmf->pgoff, order); + struct folio *folio; void *entry; vm_fault_t ret; @@ -2107,14 +2144,17 @@ dax_insert_pfn_mkwrite(struct vm_fault *vmf, pfn_t pfn, unsigned int order) xas_set_mark(&xas, PAGECACHE_TAG_DIRTY); dax_lock_entry(&xas, entry); xas_unlock_irq(&xas); + folio = pfn_folio(pfn_t_to_pfn(pfn)); + folio_ref_inc(folio); if (order == 0) - ret = vmf_insert_mixed_mkwrite(vmf->vma, vmf->address, pfn); + ret = vmf_insert_page_mkwrite(vmf, &folio->page, true); #ifdef CONFIG_FS_DAX_PMD else if (order == PMD_ORDER) - ret = vmf_insert_pfn_pmd(vmf, pfn, FAULT_FLAG_WRITE); + ret = vmf_insert_folio_pmd(vmf, folio, FAULT_FLAG_WRITE); #endif else ret = VM_FAULT_FALLBACK; + folio_put(folio); dax_unlock_entry(&xas, entry); trace_dax_insert_pfn_mkwrite(mapping->host, vmf, ret); return ret; diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index 82afe78..2c7b24c 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -1017,8 +1017,7 @@ static long virtio_fs_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, if (kaddr) *kaddr = fs->window_kaddr + offset; if (pfn) - *pfn = phys_to_pfn_t(fs->window_phys_addr + offset, - PFN_DEV | PFN_MAP); + *pfn = phys_to_pfn_t(fs->window_phys_addr + offset, 0); return nr_pages > max_nr_pages ? max_nr_pages : nr_pages; } diff --git a/include/linux/dax.h b/include/linux/dax.h index 2333c30..dcc9fcd 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -209,7 +209,7 @@ int dax_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, static inline bool dax_page_is_idle(struct page *page) { - return page && page_ref_count(page) == 1; + return page && page_ref_count(page) == 0; } #if IS_ENABLED(CONFIG_DAX) diff --git a/include/linux/mm.h b/include/linux/mm.h index 05a44ae..8380975 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1098,6 +1098,8 @@ int vma_is_stack_for_current(struct vm_area_struct *vma); struct mmu_gather; struct inode; +extern void prep_compound_page(struct page *page, unsigned int order); + /* * compound_order() can be called without holding a reference, which means * that niceties like page_folio() don't work. These callers should be @@ -1419,25 +1421,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf); * back into memory. */ -#if defined(CONFIG_ZONE_DEVICE) && defined(CONFIG_FS_DAX) -DECLARE_STATIC_KEY_FALSE(devmap_managed_key); - -bool __put_devmap_managed_folio_refs(struct folio *folio, int refs); -static inline bool put_devmap_managed_folio_refs(struct folio *folio, int refs) -{ - if (!static_branch_unlikely(&devmap_managed_key)) - return false; - if (!folio_is_zone_device(folio)) - return false; - return __put_devmap_managed_folio_refs(folio, refs); -} -#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ -static inline bool put_devmap_managed_folio_refs(struct folio *folio, int refs) -{ - return false; -} -#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ - /* 127: arbitrary random number, small enough to assemble well */ #define folio_ref_zero_or_close_to_overflow(folio) \ ((unsigned int) folio_ref_count(folio) + 127u <= 127u) @@ -1552,12 +1535,6 @@ static inline void put_page(struct page *page) { struct folio *folio = page_folio(page); - /* - * For some devmap managed pages we need to catch refcount transition - * from 2 to 1: - */ - if (put_devmap_managed_folio_refs(folio, 1)) - return; folio_put(folio); } diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 5e14da6..8efafef 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -295,6 +295,8 @@ typedef struct { * anonymous memory. * @index: Offset within the file, in units of pages. For anonymous memory, * this is the index from the beginning of the mmap. + * @share: number of DAX mappings that reference this folio. See + * dax_associate_entry. * @private: Filesystem per-folio data (see folio_attach_private()). * @swap: Used for swp_entry_t if folio_test_swapcache(). * @_mapcount: Do not access this member directly. Use folio_mapcount() to @@ -344,7 +346,10 @@ struct folio { struct dev_pagemap *pgmap; }; struct address_space *mapping; - pgoff_t index; + union { + pgoff_t index; + unsigned long share; + }; union { void *private; swp_entry_t swap; diff --git a/mm/gup.c b/mm/gup.c index 10f1ddd..acd6154 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -96,8 +96,7 @@ static inline struct folio *try_get_folio(struct page *page, int refs) * belongs to this folio. */ if (unlikely(page_folio(page) != folio)) { - if (!put_devmap_managed_folio_refs(folio, refs)) - folio_put_refs(folio, refs); + folio_put_refs(folio, refs); goto retry; } @@ -116,8 +115,7 @@ static void gup_put_folio(struct folio *folio, int refs, unsigned int flags) refs *= GUP_PIN_COUNTING_BIAS; } - if (!put_devmap_managed_folio_refs(folio, refs)) - folio_put_refs(folio, refs); + folio_put_refs(folio, refs); } /** @@ -565,8 +563,7 @@ static struct folio *try_grab_folio_fast(struct page *page, int refs, */ if (unlikely((flags & FOLL_LONGTERM) && !folio_is_longterm_pinnable(folio))) { - if (!put_devmap_managed_folio_refs(folio, refs)) - folio_put_refs(folio, refs); + folio_put_refs(folio, refs); return NULL; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c27048d..a830715 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2221,7 +2221,7 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, tlb->fullmm); arch_check_zapped_pmd(vma, orig_pmd); tlb_remove_pmd_tlb_entry(tlb, pmd, addr); - if (vma_is_special_huge(vma)) { + if (!vma_is_dax(vma) && vma_is_special_huge(vma)) { if (arch_needs_pgtable_deposit()) zap_deposited_table(tlb->mm, pmd); spin_unlock(ptl); @@ -2877,13 +2877,15 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, */ if (arch_needs_pgtable_deposit()) zap_deposited_table(mm, pmd); - if (vma_is_special_huge(vma)) + if (!vma_is_dax(vma) && vma_is_special_huge(vma)) return; if (unlikely(is_pmd_migration_entry(old_pmd))) { swp_entry_t entry; entry = pmd_to_swp_entry(old_pmd); folio = pfn_swap_entry_folio(entry); + } else if (is_huge_zero_pmd(old_pmd)) { + return; } else { page = pmd_page(old_pmd); folio = page_folio(page); diff --git a/mm/internal.h b/mm/internal.h index 109ef30..db5974b 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -735,8 +735,6 @@ static inline void prep_compound_tail(struct page *head, int tail_idx) set_page_private(p, 0); } -extern void prep_compound_page(struct page *page, unsigned int order); - void post_alloc_hook(struct page *page, unsigned int order, gfp_t gfp_flags); extern bool free_pages_prepare(struct page *page, unsigned int order); diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 995a15e..8ba3d1d 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -419,18 +419,18 @@ static unsigned long dev_pagemap_mapping_shift(struct vm_area_struct *vma, pud = pud_offset(p4d, address); if (!pud_present(*pud)) return 0; - if (pud_devmap(*pud)) + if (pud_trans_huge(*pud)) return PUD_SHIFT; pmd = pmd_offset(pud, address); if (!pmd_present(*pmd)) return 0; - if (pmd_devmap(*pmd)) + if (pmd_trans_huge(*pmd)) return PMD_SHIFT; pte = pte_offset_map(pmd, address); if (!pte) return 0; ptent = ptep_get(pte); - if (pte_present(ptent) && pte_devmap(ptent)) + if (pte_present(ptent)) ret = PAGE_SHIFT; pte_unmap(pte); return ret; diff --git a/mm/memory.c b/mm/memory.c index b88b488..e6520c4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3826,13 +3826,15 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) if (vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) { /* * VM_MIXEDMAP !pfn_valid() case, or VM_SOFTDIRTY clear on a - * VM_PFNMAP VMA. + * VM_PFNMAP VMA. FS DAX also wants ops->pfn_mkwrite called. * * We should not cow pages in a shared writeable mapping. * Just mark the pages writable and/or call ops->pfn_mkwrite. */ - if (!vmf->page) + if (!vmf->page || is_fsdax_page(vmf->page)) { + vmf->page = NULL; return wp_pfn_shared(vmf); + } return wp_page_shared(vmf, folio); } diff --git a/mm/memremap.c b/mm/memremap.c index 68099af..9a8879b 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -458,8 +458,13 @@ EXPORT_SYMBOL_GPL(get_dev_pagemap); void free_zone_device_folio(struct folio *folio) { - if (WARN_ON_ONCE(!folio->pgmap->ops || - !folio->pgmap->ops->page_free)) + struct dev_pagemap *pgmap = folio->pgmap; + + if (WARN_ON_ONCE(!pgmap->ops)) + return; + + if (WARN_ON_ONCE(pgmap->type != MEMORY_DEVICE_FS_DAX && + !pgmap->ops->page_free)) return; mem_cgroup_uncharge(folio); @@ -484,26 +489,36 @@ void free_zone_device_folio(struct folio *folio) * For other types of ZONE_DEVICE pages, migration is either * handled differently or not done at all, so there is no need * to clear folio->mapping. + * + * FS DAX pages clear the mapping when the folio->share count hits + * zero which indicating the page has been removed from the file + * system mapping. */ - folio->mapping = NULL; - folio->pgmap->ops->page_free(folio_page(folio, 0)); + if (pgmap->type != MEMORY_DEVICE_FS_DAX) + folio->mapping = NULL; - switch (folio->pgmap->type) { + switch (pgmap->type) { case MEMORY_DEVICE_PRIVATE: case MEMORY_DEVICE_COHERENT: - put_dev_pagemap(folio->pgmap); + pgmap->ops->page_free(folio_page(folio, 0)); + put_dev_pagemap(pgmap); break; - case MEMORY_DEVICE_FS_DAX: case MEMORY_DEVICE_GENERIC: /* * Reset the refcount to 1 to prepare for handing out the page * again. */ + pgmap->ops->page_free(folio_page(folio, 0)); folio_set_count(folio, 1); break; + case MEMORY_DEVICE_FS_DAX: + wake_up_var(&folio->page); + break; + case MEMORY_DEVICE_PCI_P2PDMA: + pgmap->ops->page_free(folio_page(folio, 0)); break; } } @@ -519,21 +534,3 @@ void zone_device_page_init(struct page *page) lock_page(page); } EXPORT_SYMBOL_GPL(zone_device_page_init); - -#ifdef CONFIG_FS_DAX -bool __put_devmap_managed_folio_refs(struct folio *folio, int refs) -{ - if (folio->pgmap->type != MEMORY_DEVICE_FS_DAX) - return false; - - /* - * fsdax page refcounts are 1-based, rather than 0-based: if - * refcount is 1, then the page is free and the refcount is - * stable because nobody holds a reference on the page. - */ - if (folio_ref_sub_return(folio, refs) == 1) - wake_up_var(&folio->_refcount); - return true; -} -EXPORT_SYMBOL(__put_devmap_managed_folio_refs); -#endif /* CONFIG_FS_DAX */ diff --git a/mm/mm_init.c b/mm/mm_init.c index 8719e84..f4caa70 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1017,23 +1017,22 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, } /* - * ZONE_DEVICE pages other than MEMORY_TYPE_GENERIC and - * MEMORY_TYPE_FS_DAX pages are released directly to the driver page - * allocator which will set the page count to 1 when allocating the - * page. + * ZONE_DEVICE pages other than MEMORY_TYPE_GENERIC are released + * directly to the driver page allocator which will set the page count + * to 1 when allocating the page. * * MEMORY_TYPE_GENERIC and MEMORY_TYPE_FS_DAX pages automatically have * their refcount reset to one whenever they are freed (ie. after * their refcount drops to 0). */ switch (pgmap->type) { + case MEMORY_DEVICE_FS_DAX: case MEMORY_DEVICE_PRIVATE: case MEMORY_DEVICE_COHERENT: case MEMORY_DEVICE_PCI_P2PDMA: set_page_count(page, 0); break; - case MEMORY_DEVICE_FS_DAX: case MEMORY_DEVICE_GENERIC: break; } diff --git a/mm/swap.c b/mm/swap.c index fc8281e..7523b65 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -956,8 +956,6 @@ void folios_put_refs(struct folio_batch *folios, unsigned int *refs) unlock_page_lruvec_irqrestore(lruvec, flags); lruvec = NULL; } - if (put_devmap_managed_folio_refs(folio, nr_refs)) - continue; if (folio_ref_sub_and_test(folio, nr_refs)) free_zone_device_folio(folio); continue; From patchwork Tue Feb 4 22:48:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13960095 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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21A29C02196 for ; Tue, 4 Feb 2025 22:50:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58B0F280003; Tue, 4 Feb 2025 17:50:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 539E0280001; Tue, 4 Feb 2025 17:50:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 365C9280003; Tue, 4 Feb 2025 17:50:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1778C280001 for ; Tue, 4 Feb 2025 17:50:30 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D641CC044C for ; Tue, 4 Feb 2025 22:50:29 +0000 (UTC) X-FDA: 83083757778.07.B9BC056 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2047.outbound.protection.outlook.com [40.107.96.47]) by imf12.hostedemail.com (Postfix) with ESMTP id 094AC40006 for ; Tue, 4 Feb 2025 22:50:26 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="LvMTO5G/"; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf12.hostedemail.com: domain of apopple@nvidia.com designates 40.107.96.47 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738709427; 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=+RK8HcctKWrWGjHAxyN8k6xlAbP24zFsv0TFbZlW19A=; b=7YEqLRCXZA5O4njYMRtKkbNWLITZjRPM6cxVD15orlReVZ3ADkV2RwNHPrzFZbGAR+mckL tF4sllo6DwMlxgvpIGGCc1vpp+S0gfNXy86EBZkUtl0Hwv3Xr6hXcIAsQxyrWcBqDHzLi2 mj5ldmV3yu5Qc2JsV057okHN8RP3DGM= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1738709427; a=rsa-sha256; cv=pass; b=mb22eg4CfK05vzlECBY+oULVCFvcwDT7mvoucATlbtBSWNnyTRo+8/VhuWH7cEBusHwmcC rTEsSqT/lVRpF47sBXSORNe+4KqEs+p2BabDBIHB+Z2FQjV8wlXm8UTsFkfjEdyudggaRR AlCMoxw2Xl70eNv8v8CnFe20/Y10JgI= ARC-Authentication-Results: i=2; imf12.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="LvMTO5G/"; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf12.hostedemail.com: domain of apopple@nvidia.com designates 40.107.96.47 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LWThh/AYziDVFX6FIPwZIDhCooJlt7qmuXaGQUYqeOCt8sKs+n/adKVcjXbYqB54LdRxX6WYr+0Di8d44qZAOoNdJdbVlrNr3WdEtjEOwfhXVPKU3SsIOz6KfChAno+9NlWrDkNO/V9pxoZH9YKOXPl6V5peNE94BfCY4CXiHowLidI/fFWTZ1DxDuJ1aOoII045vc5nZrjlpti2bvi233Twedbj/pvqM3nnL1lhf8tKT7zJsSIzmMIK0P/ceGHnAYc3YM3uvlGOzfPZhY0td6LhkbvDXvBYwTR//sHYl+8k615uh7xbKF6vj0paD2n8APruxGdg6pLyNzejaN/vNg== 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=+RK8HcctKWrWGjHAxyN8k6xlAbP24zFsv0TFbZlW19A=; b=cOtdm7AVIEAWwOgO4gb+K2i4B9td78Q0xBN6yIVqyplKZFXgS0SzhL2m0nMPo4L9wA3kSrQblMxKWhsvEJkLLrAYotshODg49g5HgcSXhaiANGdKubwYOqX6xRBaRpgwcUcpOcnzUGPU1yUjiUUMPpGnadY7T/2VfX1INOEFNa3Dk1Ts3BHHjdpKpKdXfak2PumVyUf9SWEeU6GBVSAmcTjtNyrPHhAB/wXEBKjd8gp/nBwsqoJ4LJqHaajiedsJ70TGELH95Hj73z/4nWKeg12+B7eRS2B7KFPPxvsPAhXHVCj68LS05fQ3DZvvsoMjLEYEsSSqq0a5UH/efNIl2g== 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=+RK8HcctKWrWGjHAxyN8k6xlAbP24zFsv0TFbZlW19A=; b=LvMTO5G/vq+G84KunIOt9dhCWlvhCf3GUs0jcFx7uCgP3sf4F6oTFl5y+jtQBtCXcgNT8XoYLkMt0eoj0+TscIUxYgevX6TnJ7wj18E8h+SAIXntI41wO3LEkny6Dx84XYBzhUxoVyvYzlvdPN9hgLJg5ouOlmy5ZrNfi+eqsAbTOVsPOylwGRJ4njs99ZtCC3Dk6lhgmhG9rkor4j31vcR69WsfTd/tSB9fMslQggts6GAXwUHxSN4BKPV/SLApKs9FlPgtWBn7odo7NXN7GktX9Ib48YOgQSx4jKiIdLdP3llSABBQuY2ZBflczDzc0yvso+oNyiPlho0Y03AJ3w== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by MN0PR12MB5978.namprd12.prod.outlook.com (2603:10b6:208:37d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 22:50:19 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 22:50:18 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: Alistair Popple , Alison Schofield , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v7 20/20] device/dax: Properly refcount device dax pages when mapping Date: Wed, 5 Feb 2025 09:48:17 +1100 Message-ID: <7d65e855fcdc5cee12b4500a557b2ad961bdc8f2.1738709036.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P282CA0170.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:24a::25) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|MN0PR12MB5978:EE_ X-MS-Office365-Filtering-Correlation-Id: e8e5be72-8531-4596-0876-08dd456e4c34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: lStfnsiSb+G8Iw91EnBGAJ0j2af9WK1uA3v+7TtIJTVBcQZ/D2NVAcMbCv++ugeJX9KsrS7c5EhW2xHw26vrO3TVthtXSratgnjzkanfCNqVUK025wzgiQz3A3V84KAoMHk+xNfj/LqvaDKS2r4mAAhu//ob16TlHHg60k0eEaUt1a9gxIrrosNqqkT4qG3GVTBrXCFB5c7K/eJqYuJImcHhmXVa8cNYZxkKWoBpvJ72y7shHbcNuHwgJ0fObSyEDqwae++HpHQA4TGAlr9hiOPkDwH+mEqJfOYuhV9YSxky2r0iw00w458ACvLnFDagvcrMUpmD3UbPxRVpGQXbSQcHScKyd3CY/e1XkuIPeCDHxecCtQ/ks9I6tQtvswvEV3s2elVV9qHwNMex4zo9QuOeUuz7IKKFsm6w4GJ6F7/5zpy8UzBgDxtNNWT1bkDIhCZzmsZ4FyaQCfLKpZR7mUWs0Ue6RxSZ74SwSaY9VTrRvS3hgcmAr/1uUmKkXwfzvt2wf2rxq+t1pl0OjpIRxHqWU9bZTpSbU86nnm/jJnEl5GmuN1/9MA+j5EUaJMwVm3VhH8tooo4LcqKmb+ey6C9ne3BHLTREkxw2Qgu9uWV30E/xva7btJpTk2sfTWswUqGEsbrXtsbNoxBrVdCA3BSglWCkupdZjiC9X7NDJz6Yf4yKIErO1VkPeITEaZAHBQChjvh9yEX3mb1LQuSfd9SLe41Fwp7aU4A54Wm62CNY9WJET1EtrVG71tmK7wH7JvR4HvQ8dOVWSXLhdBdEn9FzsqWSGLL9ONLhlLQ7YT+nfZdKF9ABeZdfQAFu2IzLCBuDZiuoFJq8C/r0n2JNlaDU+KZQGK6RRiZDY1tZDTG+2ZTWkcvsE03uRbOhQvnY7u+WdbF4Abme7kbk99iurukxlV08Rc7qBBBXcASSiaWQ6D7JVpefkGFQvfuQ+013p9iz4zxyo9zL2wmYObwPIujOD49Ivlr1ol94hc9bIRr0trxXJeiIP/PvN7bLp0FvmxGZuMl9RBVF/cCvTnQOKXJptu/jIhLBqbyyxVgonuQk/DA97aELxGGIHqkWNy6ic5OH9vhlxemWGumAdNtRX8jLg3TTJkqexhdfvmLa6L2qmKoxqxEnYar+uXRoynC6dn2s23oqxf30eA2ir4yhlRU2n80L9iaSsMufH43XEOdy53RPLe8v3VPfsCAST1CmT+Od/XbPZjbfIg2NuCaTNdUG9JoyhrPdlO7XJB91U3uk3Aqls7NPjyEU/ymtWT6peR41vd6ElLAKdlnbgh4EmsXpnUu7DnwHBhVJkuda18QQkaq3R3Nas4Nf6B5ohAerWCM07SybHsPB0C4p3XMoel8ZSBju0GewOMknt/j0MRBDeal0qdqeKbouPVIDXkHV X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dqlNYgNXTk57smO1jyS5MHtYJGZx4MWUa+uIY098ykSR6WSxpGrbM/QEBT6WzAcMoOmE1msxN7b5YV5FDSDW6fipOjyeXQsuxCXB/197UBv+SZHXrBabfe7GgbSAJ2uu02Vp54FX5j2AD5ckOWBRYCBJMhfGtoqyqJ8zM7HwwZf3TfCf4N8V+CH8dOw2Mqeo1OAforoKisS5PD9lOF+duGRvVpfnb7aV+Q5RriNG2W1wwh2Gaba3mjL100GvAFQF+moAfWQBM8x8IH9gKAmU/h5qG/Da8XZA4eENKV2t3/X/muYfvbHcC9lpVeQIjk8Ba52Oawg6o50Cp0CTYMdQdhw9JWWMOSvVjn6EXUUqpSX4O6jLVOBrzIgk4ve+YUq1R2DwxmLYooS8gUnpOUbLHjn60UgxYOB80wJmgxWqge1PEce6GCQnzjcpFPgPZ5xtGuBh4uaaHJ4NusvmJIPTd2fWAfbNnPVPdGpjeyqYUdOB9SVU+zzXDu4XPBgBaPXYMOIBAM/gMza+buEZ7lxyXd/tsgnJfg/YtemhjiyFiLI6GJAkdi83pAFX5mHuGmpmxM5Aofb8PXDrGmcBMTuhwsm3I1/DWcQ/WCbVV41WjehADyxa+vbQFD+iOse0tCYZ2Dz87dMXbg67vlueMjJZ4mplP17Ku6BA48Q5Pec9fh+lR7WSemDwMsYNeOzb9ycjjPZzwcHHUWJBjbwWt+b03BYPahqJobWJgOoBjF0EtCeTrnsguq4mJBjO7ZMX/y23qCxdN7D9MzmbD0YiNOonh9myo7Fu3//FqNMCfF4D4PPwAF7Gj6f8ap/pcNfovtAVaf+p4Cpp6P+8wpJxlpokxWPJOR1u691yAtiEUWZJk3NsP/2XF/lOPn/hyADvcOja7miO5cExyphdIIPqRB07n1dkMkA4ImvEv1KWYV752ncRXIQBSwckpLpcSejXmC+7/tAO2yAwZcgEHBAQWNBQL8Djiyv/0/RUsXC4Abh48wmvJlmDufVmjTFuctsk61sXaeEKsZ5NkkGd+4o5B6naMVOJovffi6SGfagA58Bb4bHpINSgsEWhg/fnvERpyJEDiYSQUjvGe/YduUUDDi7g9X+jsS1vdWNJSJZ/lDpQGMA16/FqcdhvL9X+qCmByCMzxgp4snyXv6ob15RChy8QeJvfMmR9g8z5tosDAgKqFNHUdVcO19BFO2Fyh0GlfO7qFcmAccGWHPbDYWtCzS/IrBxQGOXI3GxVgZc54YaL8VgRFR3Yc1fEylRquqnvOiH7HDBo2f43ZeR8cYPj4YIYpyzmfUBLKxrtorvS5anAcRAa3nwUFPtJron59PR5xe0ysxireBcN5nlUXWNHTrsCH2CW/oOho/WXbOpByvvi5ojZUlAUEBuxwCfx8bvNThviWbDkkSQ7tbWM/vvSWPy5Rwlxm1NTXaRYQxI4kwu+DoogCX0GQj0Tn6OAWEL3gZTMEGmw7gHxUIHVOTSb3E+UMTJipaeKiD9ZOH1kKU+KROYCMZNhapfSTgN3+Yv6FQj2TkpJjYITEPcdEdgDmA1/P1SNH1XAE7QqLRglOWPBCoH/J50efrKNIydiMTLoJRpE X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8e5be72-8531-4596-0876-08dd456e4c34 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 22:50:18.7040 (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: fSYMUkxbdq+ITdx/qthVTTj0IyujhXGyQAhbbbOtPDbjrjJZccO92ORw58EUaiF+1yq6tGysIw4gp/XEzM3MAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5978 X-Stat-Signature: odpi74ji8i1oohposcad9d1u13m9g3b7 X-Rspamd-Queue-Id: 094AC40006 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738709426-574762 X-HE-Meta: U2FsdGVkX1/EFNGJRjkBpgSOtMZ4UanfqJVvYJSLpbAbK4ds7ctu7ldl6XCsTpDANlbhGPbYfuGhWurpQ1VmHh6uPmakvlgH4Qi54VN0Bbdq5hJnmIYdeQ2GV3Rhxd465pB/XpemY12VEk9HqmyTsxuUDqxiRW58bAG4zQh/SI+YdWS8v/GQp3yc+Gzlodjqirmb59N4Un/sUQMXPetoJvUJTbi7uEQySLpixR3kFQO8s/nU0cJiM34yvHv62ZZr/axddZn7AclSx4Rf2JqVyDsASGQe3XU3k8IPC/V0LJqyfANThiaw0orCaPEQOlQswQIo0XwMAmnYz0ZmD/IpseQIxQxThH06ogMHXO7I6jc8Y0e1wj6Mxx0yPf9rw4KwLP4chaNbyng23yqhFNQx4E1yO7WyqBXkHIEOutsydkMaWLvWRjPlTiZYjvR/kCRjreEcn3kmLCfA3BvEVDxPU5WGcnNNjZMHLgqDlxgbrbsUCtJgygXMViIvKrpD73MQSq8wQlJtRjOWIftFA2gwaG3pImGLypnGXz9JIUPWLc6KcEDwjG4NtkBN0ArzYJzH5pX6DM2p9rbhCjGRBgCZ2tzgSYbbwjrL2s9jY50jnuBxD1UtOJpWp28TuU4rINfheFbUz//KKHtHgs7VdgwJul24f51EMiYC4on3Pd8aw6/ymprMlFPBbGelwjkIVF+WC+4BBYDWf7PEhslLxftJj984ez6i/F0txn7kUzm+ZetWF9aS0sztKSO9ugoRJIruhjgM11952JfCej2IlW6I/X/BIpP53d3c/xqqHU8a3zf71z3w6LyDF541mI+IKAKrjGoMRG/YrjlH7eI+fPfJyp+Wx6tK7rW39gKR4NNeVRwsYo5d9hM479fSrgBcVzzbmbRjyaNVwUmKV3c1YxcTO1AqrmaeuorjzzCrUaqETJ1scuXDuG4GaWlr/mLSgWaRrqQmGyXggfO2QYrfcyp qIZXeGQk iLLfDrMFaRxSb1+jVZkpn0oJqveuSSQcQWAcq+v3SbcK8z+aVpLas1ZDR0+H35WnoqCA0urEIunqPJkQvt5rRMXjcgn5/DfommqSN3p+12Rvu2+toHJcNY+8SbiMMCoGv6eC5CRbEOoxdqtRy2ruDHK8uJo31kOMfXk8xamsMKj9oamfFnyCqeNBl49zlUetyVvN7/hot76jLnMRT3Cnwz8QzLxMRccId6Fkx6HQYsCYtj/lRzUFdKvt299RXt/WBidSSp889oWPqmQP2ijmDjyHhLiuDa7U32TSkdW/Bhl3lzolbSzc2pVvRtoUSWcd3Le9zjeM0klPdX7wlRmJxTg+kmLH82dnfth8Dof/DsuId9mj/wOhu6YJ7nDR3a1JspqBqPzrKNWAw15ji7JE2HlNJgzlTa18066e6 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: Device DAX pages are currently not reference counted when mapped, instead relying on the devmap PTE bit to ensure mapping code will not get/put references. This requires special handling in various page table walkers, particularly GUP, to manage references on the underlying pgmap to ensure the pages remain valid. However there is no reason these pages can't be refcounted properly at map time. Doning so eliminates the need for the devmap PTE bit, freeing up a precious PTE bit. It also simplifies GUP as it no longer needs to manage the special pgmap references and can instead just treat the pages normally as defined by vm_normal_page(). Signed-off-by: Alistair Popple --- drivers/dax/device.c | 15 +++++++++------ mm/memremap.c | 13 ++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 6d74e62..fd22dbf 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -126,11 +126,12 @@ static vm_fault_t __dev_dax_pte_fault(struct dev_dax *dev_dax, return VM_FAULT_SIGBUS; } - pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP); + pfn = phys_to_pfn_t(phys, 0); dax_set_mapping(vmf, pfn, fault_size); - return vmf_insert_mixed(vmf->vma, vmf->address, pfn); + return vmf_insert_page_mkwrite(vmf, pfn_t_to_page(pfn), + vmf->flags & FAULT_FLAG_WRITE); } static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax, @@ -169,11 +170,12 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax, return VM_FAULT_SIGBUS; } - pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP); + pfn = phys_to_pfn_t(phys, 0); dax_set_mapping(vmf, pfn, fault_size); - return vmf_insert_pfn_pmd(vmf, pfn, vmf->flags & FAULT_FLAG_WRITE); + return vmf_insert_folio_pmd(vmf, page_folio(pfn_t_to_page(pfn)), + vmf->flags & FAULT_FLAG_WRITE); } #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD @@ -214,11 +216,12 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax, return VM_FAULT_SIGBUS; } - pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP); + pfn = phys_to_pfn_t(phys, 0); dax_set_mapping(vmf, pfn, fault_size); - return vmf_insert_pfn_pud(vmf, pfn, vmf->flags & FAULT_FLAG_WRITE); + return vmf_insert_folio_pud(vmf, page_folio(pfn_t_to_page(pfn)), + vmf->flags & FAULT_FLAG_WRITE); } #else static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax, diff --git a/mm/memremap.c b/mm/memremap.c index 9a8879b..532a52a 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -460,11 +460,10 @@ void free_zone_device_folio(struct folio *folio) { struct dev_pagemap *pgmap = folio->pgmap; - if (WARN_ON_ONCE(!pgmap->ops)) - return; - - if (WARN_ON_ONCE(pgmap->type != MEMORY_DEVICE_FS_DAX && - !pgmap->ops->page_free)) + if (WARN_ON_ONCE((!pgmap->ops && + pgmap->type != MEMORY_DEVICE_GENERIC) || + (pgmap->ops && !pgmap->ops->page_free && + pgmap->type != MEMORY_DEVICE_FS_DAX))) return; mem_cgroup_uncharge(folio); @@ -494,7 +493,8 @@ void free_zone_device_folio(struct folio *folio) * zero which indicating the page has been removed from the file * system mapping. */ - if (pgmap->type != MEMORY_DEVICE_FS_DAX) + if (pgmap->type != MEMORY_DEVICE_FS_DAX && + pgmap->type != MEMORY_DEVICE_GENERIC) folio->mapping = NULL; switch (pgmap->type) { @@ -509,7 +509,6 @@ void free_zone_device_folio(struct folio *folio) * Reset the refcount to 1 to prepare for handing out the page * again. */ - pgmap->ops->page_free(folio_page(folio, 0)); folio_set_count(folio, 1); break;