From patchwork Fri Feb 28 03:30: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: 13995532 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 19595C282C1 for ; Fri, 28 Feb 2025 03:31:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B14B6B0099; Thu, 27 Feb 2025 22:31:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9123D6B009A; Thu, 27 Feb 2025 22:31:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 71733280004; Thu, 27 Feb 2025 22:31:48 -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 4DCB16B0099 for ; Thu, 27 Feb 2025 22:31:48 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0EBF3120618 for ; Fri, 28 Feb 2025 03:31:48 +0000 (UTC) X-FDA: 83167929096.20.BFE6A68 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2068.outbound.protection.outlook.com [40.107.94.68]) by imf16.hostedemail.com (Postfix) with ESMTP id 4BFB218000D for ; Fri, 28 Feb 2025 03:31:45 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Yk+duUal; spf=pass (imf16.hostedemail.com: domain of apopple@nvidia.com designates 40.107.94.68 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=1740713505; 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=8uq3O8kXTMfzu33bTQkJE6cujPJmeDvSmwlQjmGtbl0=; b=IXvGdklF1h68bZ3IllpPnSdmTi+merozaw24rYYcuyaW+st9HfAotRwq9JDoDI/Q0hSxjx 1JAFB8naokXWZcrG63DnStkv83ShQJHJzdxnxbYdFBIuoFGTZKnmQt/s9WgyEWBft1jBej PhX6GHUk6N0f9ttpd44s0ZMiBm/Uyj4= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1740713505; a=rsa-sha256; cv=pass; b=OZm1X7Uf9TAripNsa9GberkgPSKdzeBpfuamwRaYlYTjCO5AInphyPTNXpDNDGTcJD/h3w 2Ey/B+96sDTBncbsVX3UoLbPPXWj6V320U7T3DvFWFs+tR65eU/wdfQ7MA6EV0BZC9I8rV PtOAW1EhR0aJmaytxqeRJvVzX7Q9HW4= ARC-Authentication-Results: i=2; imf16.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=Yk+duUal; spf=pass (imf16.hostedemail.com: domain of apopple@nvidia.com designates 40.107.94.68 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=ri4RFeS6YGrkOEqZ175F/ZnHVeoSgpOVyJf60Vs1eQCM5vIUWbt9w4GC25GvWdUD0OGLRyWeWlm8/CQ7wQzTdfN0aPpNuCweuvRaeO8aOFTORMuanVozQInoN6edpn7GH9aI+LQ/xWwo/Z3g9wdDittd/jXlGLulyq17aI6eHTd9qJiEDO3TOk3O5Bgnls/Nz/+iaEGZschP8CyIVnxhWxggt6KbbTCd38VcHkHLE2AO5UrpNxQL7iqiM79igjejeO1Vc7XaRly+xTrQJBT9K6gSLvGgVJyArJU2sdqbUPyg7fQyj8d8CO3wCTNhhVaY29ZF+zNTlluHFxb1X0CFwg== 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=8uq3O8kXTMfzu33bTQkJE6cujPJmeDvSmwlQjmGtbl0=; b=wV51G1VCZN6gmj9do3+M0WQokj1i0a/QOx+WKZ2lrdg+bMPkuME/pB7uJVtudMzlYGhhoMrUWMruBAhKD9Q/FB4GGoD3Uos6YVkYu5SUIxzC6kRDfAJwftqYQPPLWiduHY9qUnn4RXv+mm4Fqx+HxacPiTucISRWPtrSqxlQ+zR8/cyMcLsSDPB+e9n4wBmOXG9rciN7JO3W/fY2ot4Vl5/1grgmr2tg9pWMYm0OAAEi2ZBZnESu4eqUWaUQAKdEeecfkpWTsS6yDB8U+vWfcNWKP3K+X0k82761uXNzyzrztqD5+UkZqFxzaA4B9vcxAlXd+qMvrQzFuvCPHuWJlw== 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=8uq3O8kXTMfzu33bTQkJE6cujPJmeDvSmwlQjmGtbl0=; b=Yk+duUalhvc//f2HV7QpbUR0hPa2RbU0oNOGKVD+OEuywv1esNpK1dglkGxU4dHkVAkSettk/tXl3SU2r/KMHhXnqHQnsls4ghSykwsBeg/1kA2eXIwv+Kvge5hh0T6het5809/NTo/V5FwSXUwnNkW+UzfHUyxjyhknoLDX8EYIb79bKfr7DIVkMBX1yJnZNibz2bixqBNWQbVNjst3r+qGds/HCGEyoYy/ICCTiQMU/+anWAW6+6mC7olPXx6Fsim+I11AemTHCZekwDMMphnB3ZaPkdW4px7bN5A3gPjRaUtkRZpdExHKxN8F1FvRNL83mYuix1fCZwMragN9BQ== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by SJ2PR12MB7991.namprd12.prod.outlook.com (2603:10b6:a03:4d1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.22; Fri, 28 Feb 2025 03:31: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.8489.018; Fri, 28 Feb 2025 03:31: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 v9 04/20] fs/dax: Refactor wait for dax idle page Date: Fri, 28 Feb 2025 14:30:59 +1100 Message-ID: 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_|SJ2PR12MB7991:EE_ X-MS-Office365-Filtering-Correlation-Id: 97a860d7-7e48-42f8-4808-08dd57a86aec 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: vLorP4ItNgA3291zW5oI5epydjJIy+IaHaPo42jTQNaCZ+1iKRBN5m47KKnt+yXUBGOy3awTkV4CU+h7GXLZKiCIK1PJDbkdZAkJMqg8hPhsS3eG7cGqEMmfJCtPk9wUMU755ND4lcl9siG2qbcuK93cNGr8r/Adj8sCr1cVNV8c4Gfkx1ujjIK4F3QmqO5y7k3MMeBZT30Jo2WjDXPEt/Tw8/2Gurw38zXqXOqEnGSk2l5EFVKKke641cp10BMi26Ayt/cHR1xD12Jwue496kzT2u9vDTvPZHu8NixeHCngtqsOupw7dov5eD/dJ6VCBTY0fTSfpywmmas3E2ea2NOzyHvz12JwMKN+xYrTOQOVn6zmZ8wRKRKwDsW11Y1YgGO27UnuCdB1vYqk9JSAZzFZc5l/6yESWPZ8KdmvAojI6g49A6N568kSpXsOGN0KVHHCXsNDNLK1fbMPpNkBWXGBux5CupV7jgrxDZh4kQ2RszWUYvIpPkFfuXS/z4YFHGDRfBCbVlrZgGTYiT5H/3a2NPAn2ZJ6hKvy3zIociHxKAvYjBOzwkoeOsbL/rDahdwHWsDDJVXOWDkrY/w/EBgmsRC/7JCjqoeFWbHKs+iC5J6TBbGZmoV6Z3AV9u+kLSEqfH3lPNROGAxDvIAjDROgOVXe+2/g2ctRe73XZuYoCws74XXR64DxYTKiCLt84+olB/+uP7NzLH/CBYJqNHvXfrj0rHX+7HjcaMkfOFmduGoqYBupB7UJJ+8I3jji3yZncv5HIu2UAfzHwGUrStoQYmuYuaEQU1rT1OUqNi7gkV4K1ztrg9eAmk/x08eXj7GIW9Y49DaW99SsmQIFVzMGy1F5ZkpCGJ9hH6Mnax+2+WbOUUyUetTn1yR2og64jJCOyNLi2Y9vVKCLcaKBzBPSWwweY0qnpPH4QFlMPCECoGtsEtbMxVvwQIA3UhXyn5sZWLnb+/fKLHE2P0Bi7t6AXu+Yi4X9iORFiGFEMxYdIVjWrmOqxRl7/bHMP3ISMSdd68LDug3BQ6sqYvxkwYa1Y0IKdu0Tu+g+I4u/9oayjj3ZtjuqPq5u/5HKBgrxqm4Lv5kUs4RtCJvBvICbSiFcr604otxJmUkVIlY5TM1E+k49v85gMSALGnTAKIBcNMEl9seYZfeiL+Pdy8XsCkPxHJA6JiWfFmk2zOAt7m7ZLEjR+oLy8RCQkS9ZzY8OQ32WANSW3ZzRpqnWzlVjpVM0QQf1KY4/2CZzA9+4cPgecQI6eU34N0UrRr1K1SAPPWTKz7UkM3fzxfKlG2ga0+RPSqP8v1KBrCYolo4mIsEEt2TSNdOp/6l8RgCsnZeHrFadkekelFkx8YY7WAEgJxjLuvcg6D3CByVbcjujvdPhNeRElSS8aULkiNKkPqQL 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: 2vY8fFn24+bffGt6hCujBVLwAjdwboesZAKmydlk7AQ7xa6T8leOXdu2xBMPtpGJOzk/lbFohNNhtlvk8qeedBkxokkHrNw5jdX0QbOMjpOb78IIt7RjRl6NvBcJDMorS4JpoO/79ktV9uXblVBV3QJ9vhogSS9lJIETuIhOREDq3ysMIsfcdy2DHYgbEFrZkBpUVs7G1eqcblgcriGexB4hnGSUqgc/TDXxbdLaMuEbPnrSQez4AjOLMe6ML6L95mAXFNHS/8KEj06Ru4WJ2urGtq34sGJCdtWyFKMFx9Dz+FEY6T6/ju8i4Xj8lVg6RyVJg6v2aBhG/nfZXidtmySN/l1n48m4iddH1W5/9djr8DZyo5GS1qz94WtnzXAq1YU9cXcFBYWPKQOOFa4gpTxKXo5YQP4EYabPZDs4IsSKYIGQT7gG4N54emt9+4bdNgszJqZDK1M+z1VcRyYNn+Fa+TvFPIM7ExbV5o3xFH08QpEt3R3RnsJcKheIB3sOnZLQvcjSxXNywBeTE4cQCq+EEZk3f6f0KjJvC8rLsm44r/CLayl1kti7PhUOYCpk8rScTz4505ZAXT3Z/eGnPvm3SkxDYadtr4/kIleQmc8CiUeeHIe3W5bDOuDWIgbZcdr1RggidES334HC6aYrTThbN/DUZnHZJtVcZOC5yoAFBm+ris4uOJ/tfR43eCKDAHBvhSaay/KKiR2tPWl9oYR6Pvffp36ltSQWUs7Xi0SykuFL1V4DvyagK9VDrTqD3+5uQVcoSzz6HL7IAR19Eqss/SRpzffU0XhdbhvtwWJwEHb4v91e9KHQmQsrrYaHBzQ1/hmrbbVMsGqQdNUcZ+8Wx3DE0RetagW1DgS6qXa5Hm0NSn0QrZ0we9rmdX68YdSw0NlUBM2lhTmNoJe+Ie4l/XExiBDYwMA3o6XAypKdEZAEj7bNk+S7WLp2XftoolOFHJIMEF3PrqS3nK0FYlKDWaPwu6uknCaw+wogKzZkmo84xy8LhriQhcaOhAqNKS9XDDxJWyju8Hy7Erpph609r3mfKl1agCDGUJvPClRgDRARhytObaWWZaXQMuC2ZzAcOFu/66zJrCBo03F4eA0xBE0n2T0x9rZnlY2QL2632KOexqRoaCAOzRigiqNQv24P4WyPKxLse76HB4x+ZY0OaCoWrW+wzgUO/1v4J+hBd4dlSPgN55FM9RN5poUrrXeNpGXAhOx8HCcb0RzIulsFkcXClEz/KrAjFYXDCNBYlsZT+F08X6qmV+HLHzjn2ggEgYeu8rGQKuWy8ePZjf88nWbayz1ZDhb2iVz7DWuciDn/b9SJ0CApJ4cdkSBBww7DR8S67rnIVLjse2YhLhxwqFtnQqxtv1cacPOAETLJD1sMGpWuTnswRaINL/5ka5UM1og5dnn86MveSnye7y1Bg6yNhRpQ6a7OoJjK+CUbbFiViQJSteJT/OJBIAnXFNq4mFFIxLi8hq2GzH05eWNGFhzxlTof8ZkLb9/EHMnrQ75lw0yW0cm7AVfi9So3DdRiIRuYBpz396gmNsgqxt70Av+7JWCKCZEdPOJ6v6FZjGbXvuiMi2URdSaWGVxN X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97a860d7-7e48-42f8-4808-08dd57a86aec X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2025 03:31:42.0361 (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: pM+G6CnOGDCEo9dW+4G+4/iYi59urSlaE+FY9Zg5KN2kNvBPR6aFKggjarxrH2T15x+vczGE5PzypnxGwMbkew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7991 X-Stat-Signature: xfcfnmqyt3ma4y7kj5qbriztgc34cqrw X-Rspamd-Queue-Id: 4BFB218000D X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1740713505-488309 X-HE-Meta: U2FsdGVkX18AxyeMJZnKC8bCO0PmH7S7UBNU1EK2mhkqHa3wZVw60KwfAJKFQpMBwIIBar1G/MO4xkLxq1Nd2BxMgSjKLeb37+x76j8I/XmxIqwizyXmLy2IPXVTVSFCz8vCvVTB+xEnGHO32/JKWmOpQJX3zWt/qDC3SRhOS78stGWJ+OGkUCXS88Dtotim4MK22PfLBmdvFTLQLWspSo5WItLx+NrcECgmm9/GWdmKc/nkdFraelX6S49VuNCjpE22jFzviP3XvqXsJeIo8ksYA73wtX2RLjy0sGjwVlrkpB6lqaE3smhzL29vumlsZdk9Qi9QuuuJ22NzH0sG/UhvzclY5XjbvlK4AIxAfhcTBqt2TagNieQDMiE077FLKy0XX4y2A62H23OJrjzi3TF8EC5MB3d0hoXy8U4i8BLUzEaqsFRo3VKGwzWw/FMeN195XQpJ8s1Nk5ezmqbjWxBZqwvRXZngZYQdsE0GxO8OJqypXGYxKEF83KKLmd5HMro+pJRVDUNP6QUmOkDuvwtkFWvue9wX2nYzUjqD7bLbQxl9C/ivmwGznAbodh3DFbHV3ZMoO0kuNWPT11lflQ+aGE6CG8+Q5JEIChTD7N15wjbFtGQwi2u3OnW78TppuQaLfPFtxxLsQEzphG9FTpAEbA699BUBic2uwAxyylxf3Ev80hJvQBArMlkfeIWhg1cuCQdhmlHW6IW324VssZgjhuxYKUNNCvhJid2CLuefTwDjQcSoZErOAu2IE1juauDxcyY3c7OFYGtGKwESw3VzJhU2VCwP5cwy7cdVAcnTDk2FPST/UtMBx1777EZiiznDgn1VS7q12tf664cMUifiEY8IEFX5li+R12Y18l8yXKbtpeYgMOdhpiTDBk6Ncedi0cUvNLW2x2oAMV13n9UlBkJefHw4XzywOdbjKywGZLCEL9cTNjLb+uL1HnoecZwGMvqwhZV8noF0qXi mtt4ss6t TI2wtigC1XkOPFBr2eum+KvL7ZQ7tYnPNLkpEM93mAT7SxLiHb4ZZ8GjpwDcB1voDWts83Qi1r9/L7UxfKD/TO3vr4HBs7vdKrxasJ39cZDhksYU3hGh/DvTabwmIOZVGwf7uT8zO1nuBwD2jRUkrBOnhCYUSmFPZanmGpNmE+MBYKgStWPHtnvXtOsh4LLw9LjqnlKaQq4yWd2GoBLlpANElwdbOfy4Bz8e3KWWTQmMG04v5E9YBOYMPKXWEbuEz6D8CVqkzV3eSCBgkkGjXLfV3UE1ppvCm9qbTe9HLwqIee270Qno0ZaO9BZZlIdJ5A0pT5wOAzteaWtH4YlDE3eszqYcJhZbs101LNQwh+HfT141u8zaB/OXR/ieSscb/wTTihQ7ZgNRTXCT2SPuHIpVH3BQjyC9IhNNTTW3vbXTOIDjbpF+O8WPd/g== 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 b1f9f15..1b5613d 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3020,9 +3020,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);