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);