From patchwork Tue Feb 18 03:55:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13978959 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2073.outbound.protection.outlook.com [40.107.212.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19CF11B3920; Tue, 18 Feb 2025 03:56:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739850974; cv=fail; b=HxVlvoQqBsmgPavIMLMsdD8V8eHfQ8fM342+nsHZTlGIOI4I2imDfCGiE4EsrQDcLlQSCXHg7XC9ctA8jkMcUyK5J1zSM/jHDTPgqBk4fTRoPC7qsqn8TznaE7Iv+00mkVgV4SOUfOF/o9989YM7C3euMWjRGt3As3cMSREU1QY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739850974; c=relaxed/simple; bh=7dw6ttt/ZkMVvnYazta3TRYvaxxYzkW7WyADgK36ZlM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=JICgIDn73/mMvKkpHMqOK2qZNuHK4+zwZud8CzTy0ulhPJYkd70NEKt6oNfuEgSlJi8ICv2Z1cLcsn5i/82nd2hcdA2vclv2SlIYifONv1nubdmwOe6JXQp05sAn4U8UJeJIpQpr8GIEOOLPQNoRxBjVeeSHw6hinoqBnSr8WdY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=EKzlzhLX; arc=fail smtp.client-ip=40.107.212.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="EKzlzhLX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YUL3pk5qPYe/aFSGYpXBmqk5E29E05qYZprty50ZnqGeNJNaC2cj+oxflZARHq51DdlW4xMLDWYtkSBHo6nVPTS45ab4ldRpFikUTPqO9bZiy7HlW/Z4814XEurysz2Q6fUmr5IEX/MR9+CN2WdKPTB81zLvznu+aJME4yWfBkni/N3JBR2wAs3nOXpusr6TjoYG9dKboIL6MVPTuREDyV/hB0gOrWJe50rwesEC5Wf8xrMgCtzJj5+jU669lgxr93sSwOLFhQKyYXGnaV19IzHkOXuoIYEvPfD+SgVTTung/tiHv4mzCbvgXagwFH97hc7xW+xExJhcaKoJJZxDPw== 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=TS8KZxBArRxg9Z4ntzU558AXkOa2ooRRRiCWHRNNEmuti2mlOkEE2zRei9Sx6a0S6LGfz1Y1h0pos7v0+3Lq31IAY3AlLXtoaoBU841L8r5Wq2mktR30Cat/i+fYkRj0QW8kl3vCCQNDcKBEB2EYmBAhazlOAr1PXSHJFXm4o0XqZtepW8cWDKWAfiLYC6U37//OT48MNSrcGOm8pb6K3ifGc26ELECJEqVl7sHWweAYPPxt5IIcZcPGuvXRU5IdF1/6fn/8gBENTlYhtWgn9/VVR9KfHho7GZ0jCsEfZyH5Xwk1Rf5JMy+X+4HsEaDS+nmKO9kKWO7VKP8VdCsyDQ== 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=EKzlzhLXBuCjA2fAha8EgDleXh7TAf4VZkziPZfE3lzLXS3QvCqdEvTSz2c5QmA7PkANu3sHqpQBeZAnGntVP4Ugz1vcFrqLWXjgPE3pQrLDKYbS6b568FNQ86ZSSuvXiWk9+vc6lPh1xsYnaPal4Xrr9NLh2pSqZkXZ9ss1cqjZHarDzCpONfUgLYFVBDR5rhcQrTMyfvQaYuo5VGzDuYwAmLNtBEsfS/rKvPIE5eul1JknHjDmd6U4dfrfdSMFZH62eDGNewejan4x3dtByRb5wKhjln25eZkmLMWDO5H7FeerqDAtfG2HLKgU8OB3FPPQeIyDhxVO91n/rfAgVA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by SN7PR12MB6789.namprd12.prod.outlook.com (2603:10b6:806:26b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Tue, 18 Feb 2025 03:56: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.8445.017; Tue, 18 Feb 2025 03:56: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 v8 04/20] fs/dax: Refactor wait for dax idle page Date: Tue, 18 Feb 2025 14:55:20 +1100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5PR01CA0127.ausprd01.prod.outlook.com (2603:10c6:10:246::14) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|SN7PR12MB6789:EE_ X-MS-Office365-Filtering-Correlation-Id: 056a616a-5ed3-464c-9160-08dd4fd02ddf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|7416014|366016; X-Microsoft-Antispam-Message-Info: EF0xGFj1Bg59VMmz3gq6CCmNoEH4v57VwO94j3FEkRoPQ25QgPCrt7V1PDm7aE9bqy8wO/0F/TI/EIOUmOAfbkPo8vivKGKOlAeXPNNs81lWPy/yvOcEInpRZxe+CjlQ/+snOO6sJQprfbqOnOlIPEPljM3gJEVRFi3TIdyguA9ho9dwRSwiY7rbn69pZwSJfjyihp8VWLk0K5hm2L7pkLt+xeMKGwTQBw2lDKWDTvGuTkfkfjNl9SCqilPIIdiwIUatuwB5jRogA45XDKTRDlirYbFmJqH95ChoCeBH/kSXO791v3U+ofNUgZLvvxySxTXzjA9B42egWpsYjrg9XgHfVgAnnphAsnHot4gLWNHTxp28VV0CilXsnGi6Nl3RBK8dDtHPEBPHU5nUtGjcGPw4R0/f8GKOe4nj7rAq/rZh1iqfHHiadw+tTf0JQteYbDgQdQR1bi7WzEV/tVxQTsoUaiSs+JBV0rRnTa30BT8OxeCEGhjLZ+MvT/1OV28ZbnmOlEgZ2cxCGEZowyL3zoEeS+CppBBdJs0dVCcTCFcpTj2wIE/oOXOZhbEQteEpsMLDdRKUfftYuye+xSHFdnmLpiWslnlhysLNCa0/HtaSF2rL4mVvHi3ihTzJfE8f/OGy3fjKbvs8uUY3fAgvGwdssez2AF0K/MhjWya6gfE3+l9+CPrDtmVkcZcCcY6O0dfx8iHy8uLehujWJAVJTEC1O9mjJc2q6R8eyPMfOKFFc7b7kFKR0fgbAVAP+bIBb9OouNhFk0AsS3AWYRd/ci2Njes/WuHMe8aiLVYhswVwfhdKdBEPKGYK+Axz+f+0EtuxNSXmedl0RD8qN0gtScxV2jZlQSfHvI7PAVHxh4AU2AVLfLOysIxCJvzwqHcLaECAVdlpoRV5YyeTnNh0GAi+piSnSQ3MYLwfQZbEKUAwVLmM6THtcFcbxKLF6Vi1iGTRG6GO+HR1m37eLuRsAefzA+riihD4IiHF+DajiJSY1PqbYaJjGl1HBUrJNrl6U3M7177h4dGoxHEcuJv6XB5zU2OCFs8rF8jzPqZNnsCJJIuQER1KpCitzEZPxO2DYOv6tOwpWoUcENPhn8sgNKmwDkd8kLjpLFLbKdu05nYTQZbvGhP7vqlTKfiCtfwcnUxrH9IzutVijCyxjiz107ivlfFAhWVzrX3z4v7o4MrWjixPwS63QetlVKw9p6drvsHIUSepTNNhfaUcUxhctNouYJtqTWPR4H81rxI15Wg930BC58VR/uIhoyCzbzKZpO1caNCwZyJaWancxIhq76od/WMobxo+F4FchsRWxNhWO6mryJUZiydQYwh6nXvBJ8medBHNy5fdBqzXvLq/SgMpFc9tsspLxgk+SSqbFh16+Mlu91Y5Dtkn9a3ZimMq 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)(376014)(1800799024)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: InT46NM35aDYBqIXNVc43Udj3znPOG++/0SzqJeOTZaiEfqypa9kURdbXJQgCYiQsZIQi/wHDFYsTO9fwjIGuH8xF2REVy/V6RxcS/ZD3oBnFf6yGGrFgDdF6CglsZxOkGu30s9w2PkjfdxBvPUH1yAukrHtvGDQaM8wE5BJXvNzCUJRUpacVchBbZ7NbTAiqiXPl4Uc4sJfsYGuMJ12cvP5UbFoexz+jlKu5RhbC4t5gNUmzvXPIDF2QdagxdHtuLqttXEX7tX7FJf1Db9jHBhtaq9AxIkJLD0oAEbkN6CSSLat+6PUqSjPmWfodhQrSFDTOM61Zp29inRFbW+/obcJFyZOGnnvZwyWBcXQF/kpGeamzmY0NI7C3uRrCsGL/BbQ/3SfGdmpjWgBiGdoy2ISsHrBBvWrbIYu7yOhT6xW4Bq0yXkL0pPP5UhPAW6lGtIt2ptQyqzpCEZl9cvVUT0k3nU8u2NGq4S/VMVlW9q5gVIExrXApRZ4bzwBpSKVT8orE9UQfgBlblOsipJo8vQH9fPS5gyrJgMTfHfmtBD4dIm2kP8jkK3mkRIidipbY8wPHywVgjE5WVnzAXHO1Ll2FVKbu1Qv1bSucr5wA/MVbCpQdyE+hk+lg2QQu0rleWu1ycVi1Plos2T4Sli1iEhXWdvmMXbMRpuETNVWkTHGkYHUs8DgG3os9UMiu6Y8ErhQi/KgEanQYPyRMF7N4yCiMLg5DcIs7EWAlv7Ct7W6Sxt5k8G3Q4nwpH7tYJXpS7FGV/N/ZRbKcBxXmATdRX6+/sJxj+hQheho5iOd25uOO8Rcv61mMhpP9QM3j/EViLi6UhS9E3dACm9xm8IMs9FN7HakOoOd94Opo02mYeBX8kjPR6ye29sDNfIMz0tvgZkdFk+zt9eqt3pAkoeDSaK1QAOeEs2CddrbUDDzIdZd5k8rUPkPL2YowUGIX8p7DmadjGTXbcsFhsz9++OqGVqxFE6OJJWZaUwqtyrAmwwOFodphOhgL+M3tBldy+eZ3JmC7ESQFZlDx0omgNupm55zoNj80nzBTEybSzfz2hY2y6d2TjqUNOLi9J/OawH5GlCVV6tbKMy2v47ZtRgRbrs8hJhmWWMqHQoF42iOimc4/K6wfaVS2WUg9lQCnw+00/mb2IJ4yQCN48gW2ZIaOTF95ecLmZvSEQ6J2NJTw/74KQDozNUhN+TNDs3HjuoFHseRa9MiTITTNaSW96EjC8IYv24Cesq0zMKbitjZfVVumY/n+X+fAfd6q2CvwQSirC/5EiBXTmR0ecK1jkLk/ZbJfCsMgb14Wqyhk/h+UIEZ6WdgsE4SETpEBsvG1znW+2kMm3EmpeVmuy5Jxl+dSKkEBERx1YimCwADhzKW5lksottwqa2eTVOELD02c/0haQC2lkPtJivg5SJwRxSpS6H4Wm/AzlsBVw+bp+MsvBzhI6EJkIl8auIuJDsw2yHknDJuxTs3m3uzkULB5MWLVqqVRbkxACc7WdxFaJr/kqyAx7MsImRIIWAt597jqOwKAmV2eHA0kz8I6BSjdKW3dLinEZQgvHWfPZZIuP1OSxt5NA6jKqVbgSvQ1W4/OQU4 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 056a616a-5ed3-464c-9160-08dd4fd02ddf X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 03:56:10.0925 (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: WocCNFssk5aYz3/9uhbs703XrUEa2eqf8jjgWYhmYN+M5ciVPh6Mztpz2pEjIIzaH6IWOOmhf7mypxXQwK5ArQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6789 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);