From patchwork Tue Feb 18 03:55:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13978898 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 B078CC021A9 for ; Tue, 18 Feb 2025 03:56:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47C272800A4; Mon, 17 Feb 2025 22:56:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 404DD280064; Mon, 17 Feb 2025 22:56:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E1222800A4; Mon, 17 Feb 2025 22:56:27 -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 0087D280064 for ; Mon, 17 Feb 2025 22:56:26 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A7D3A81793 for ; Tue, 18 Feb 2025 03:56:26 +0000 (UTC) X-FDA: 83131703172.24.A245A81 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2040.outbound.protection.outlook.com [40.107.237.40]) by imf22.hostedemail.com (Postfix) with ESMTP id AA247C0002 for ; Tue, 18 Feb 2025 03:56:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="uSt9xC/2"; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf22.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.40 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1739850983; a=rsa-sha256; cv=pass; b=8iF7pQ7Y2JGSNyNsd3Y1EOTvBHXldIMtDnPgMTxJ1W5TB0mYaatEwrdVyu2zwvaqQjGa6I PxYuwNnrKij5NoUlP92DLAFMaAokDL0gAmYfe37Y6tj/2GSqEVpMff1O2H0RvXzCXpdiCv a1zAvjoesi4kL5ogX4FOgYlyjnvDMVo= ARC-Authentication-Results: i=2; imf22.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b="uSt9xC/2"; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf22.hostedemail.com: domain of apopple@nvidia.com designates 40.107.237.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=1739850983; 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=w7VcP7ZEvUthj5PzZYbtWmdjUZ5HeQZyLdoZRveFFxw=; b=sbgPzx+ICDPqX+0osId3LKdJBcM2Lka7Eba3R175DdqItfJE2dVf1aDm9t2U2Vj3cnSky+ J4e/vyONyEAgDvcZjwCeKwccmBJnfTbX5IYCtZGovuYxRDCXP7gk1IxbEdWmela7mNxYDD RH2zV0Jro8EYunjjJSB4jLV8eWQb9eI= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Wzy0NbSx0zrou61QMtC6nTBzSle0ZENdX0ECe7607sB61OP79Vq/JY56vTTdeg8N+qLs31fZkKx6hnNJzXe2cjkD0Ie4+O5FbT1FpNTXiDBrQ8a83jDQEhnwyDcEgql/E+/f0krdNokUdn1YxQKng0XOwPJCXwitiv0K1zLaVIfKcxxkDEySAQo9Ql3GFI+HrRe2ZfQXd20kWUYPIo0VWG36NscXdkDIARPtgdnoOk+GSLWovIUNhDAySRSaxvmk+wcVoMDVy6u/PBzuCr+YWMh+0LCwaQkiNZG1h0LdJ1qrDpodQsbiDIQyZrXZPYXwuq10q+7qyJw61OtXjPr1jQ== 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=w7VcP7ZEvUthj5PzZYbtWmdjUZ5HeQZyLdoZRveFFxw=; b=tAjDNY85KuzC597VdzEJdLkAIr0ywSQDtMAMEFYOU5324Hjw32ptwKLO8/wlQqeJ3bWn3AyoOQ4w+aLWZXQAoDHNLXLK4SvmSkRbydr8MsYjYs9+BbI6mW2vbQoVjHCNDf2aoZS5FxcbOf+7kEwoAbQ7sYOu8DFwLqkgL3pij38YkB/eDKhwFmiA1sm2awnRzXncw+ze8eVKyrg0JoPK0XbneG151injWIMFguF00XIWgIyOl1blLv8SCpQiN39eJXxxJN4+LlzbKfO4UOJTE+7X6eojls7XSAj4Cd9p5AaXtjPpCQhfz7Y1dyOiubi/A2L7EPIylMCbmFjF21Qu4A== 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=w7VcP7ZEvUthj5PzZYbtWmdjUZ5HeQZyLdoZRveFFxw=; b=uSt9xC/2fYa9YNjkDDaobSAdMvCcKnSimK7rQh0OC0J/ymyLRu5A3EGS87mFaGYxUB4sYIXKjCL6lbPH8ZMPJY+MpHTQDl2Bis/hwdRZiWHurwB6mVkJb+1f4KRfaX7cj+ckcx3wLRspsfz7cVr9o6XpGCbXDicDCqmTl0px52oLW7mx2+sSzfr9IBQNIjI2b1htgF5EqXwW1iMaIsPD9P0FCt4h6qPC0tsD4nacnG72jSLHW5IzahwczA+BV5xjNKsJk+XPqolXeoE/+u5icYRdQtQ6geaC43MWWU9hl4cnwzuhbPAc5wCAPrsLoo4e1DZEztCptEzjPHKZ7+GSiw== 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:21 +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:21 +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 06/20] fs/dax: Always remove DAX page-cache entries when breaking layouts Date: Tue, 18 Feb 2025 14:55:22 +1100 Message-ID: <3be6115eaaa8d28fee37fcba3287be4f226a7d24.1739850794.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5P300CA0015.AUSP300.PROD.OUTLOOK.COM (2603:10c6:10:1fb::7) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|SN7PR12MB6789:EE_ X-MS-Office365-Filtering-Correlation-Id: bd48a5c9-fddd-4032-6da5-08dd4fd03460 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: Zn5utKrhRIbfUAnJ0WOh8IrXyO/ZBkC2ojdrsKAhaLpPXPIVh5gQ8X/bNTxlaWkwxoh00G0ZgX5QjKQ9gT8t90pzPHmxjl/eYDqzGgGeqVK/zTxFcLzsoPaZ3Ty6eB3BEKZphR99IaRZbNU2VMIGN/jGtLesKYkbDmH9XpOZEBodeFaV5baG5q992s7xplocmkmBwBDYfxtUFXeEgzGgjRARUNQEF5PELuBLI2gZFRI/wjmZHdhNtVYrTY8F8iNWJ8o7ruvwuJkPnOFQ9wY/uvh/Pu40ilvVDL4kIMkx2CFRVq9AJivq5EpIAeYUVxv7FlyDXtDEuZmS8xeRVTMiXdDiFUZzaQqS4sYlaJ77tyxxMOdh9i+F3ia+DpyqNzBV1DnnXiAr965IX4z30qWe6as6F2GNfsVpo6Kmx8KT+/cCkdlW+zIF1i01+hNCKk0lHLQisEyIR+BrnuzVk3FO2jiWG5dlwdu9Z93vWhdMEUxie+MzlW0hHSZisVOMH/ICI7iBSxdS5WpV7ChelKF9hk7rluXaVjeZrmIABiC6BS3CLW3NF031+hZFnWf9hKgqqNG/+XgDs8yDQhZRPv3YRc9UBHUwKcifquPyMgjeLZ7WAW/c5G9zLeqplP3z5xI5W+FCFphPBihT03cRJV6Fib0wrwF2/lvTWoFMFlXzmxe8NfAFQTjLPLjTIqwj5oLJKODhXcO3csD2LtM/3sLA9Cf4U+3VXLE5teTgGgBG8aQgcZv5QTX5Jeh13B+PMuhtwQLuxzet8WfdlT17fv/CuDtE9NmauSpHMHO1uQpdW6v8bMJ7UhjrRfMG4DtQQAyr9RrIT7B7cqLSg4W4xpqVuSqz1WgAztNfrQs9owGljVnfV5kpy0TFCeXJSR8l9wwKMJlAfdDQXFVpsR1crQMxxdjGYF8NK+0MoNal+oEa2LhtDtC16hqWTZ4PQ4IeXhAt+W/ZiwgkPzRcq1ZjjF01RkbrgWLnPBu/KCNUhZzOR5lwu0SNWI/0EpEDW8ATqwU4Ye6kBwe5cbYJgmvpimyIBZRIYoVpDoC7yLNbhX4N8InHHIygN/xlFoEtQ2ZfJRb0bimhk/DoPD1F35y1FAN9dyjZEN1/A9U2X8CqLL50SkJyW9hdp5J9oNMv8wwBoWJrXt4ZiEbGazNwIgWVhfvKjYsjUCWIDsIrqg5HiC+NWyb8arVzPHg+MfOypMWloOIB1O/5ld3sFuaWKZswys5cmRjLKyPk6q8q2AWYJAzglcX6ifb+Cvc9SO/bfDWI9JHJ6KYQVPHWACLAobwllB9EDybfN7D78LEz/M78fXzL3MWV07KIrOy950ipPzxU9kVwhEFtn3CvUrFBIIxDCV5iFYmfDPSXqEpPxvTbr0aGpHf/GOxtTsnaaRFmhVMm8/VB 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: B0GoW6AX/U601I+sS70aN6Tkm669QIndGzF9Cc1uks/ljUTUqHfpkLdcjoYQ549U5rUq62jZ4BdEJlSMhcJmIWyTnXoL8u1H536LBJUd0K3bEzyyz4W0lpGjQtcgJ2UVWB4kt+CGxiOvkvDPCEOI0YxIc26a0zMYWV1v5/ThZScQp8JW3PeYBdIhgJazbBOyz5cibBlz2wTKFmCbGHe0QeLNAAjzp8onmfJ6nAndz0GCJIA07mZ1sDWklyej8D7BtSDSQQtgJPFg0Be9OsHVl4f/ht1eBtOpcTM97wIK+7fIVuuOvbd6UD7vzqTXDD2ZyIkIzSCUqGgRtuLta+U7vwgBppn33KDZOlD72XLrEOBqzNnLRtisLoCHAGiyWAuScnKCuxkUym0c4n+MJ1ZdY0Kg+H1hIUOUhIyXVHZQAa4y6bXvrlRYQA4i/2lcAFLchGl2yZr7LN6QPCinIkRFYRU2HDG6YdQgceq+UxFStbgv0zuMYs3hJ8ffjERyK2HSOsw4VbMqhKGxcqUtlcXZS+qhkkSZ/karIdqPuNQiik0r2AOeg2RnY64YqjvmYifAYyugwAzqWwCASn/j5vvDipe/cf2t8WpPR/01/ebXvu2pqcK2awtE8vRM6iBicw5/Ph77P/9OILAP4GzgBfldx5sAddUxFaxOHtdLFflZKwW8UGc7zyjwAgkQ7YklPlmebMgXoUUTRvUeslSGCcF1dmGMoADjSnAAPVS6Gcuk+lNyfsD4k0OtaCLT0ILZiniTtL53QLC/JlydtTfOAR5HrzzFegYwAm+BkXhn4QZqN55SbS1OpCnwXsRXl7lCaWwwon68gRC4YvxDKdTAy+sqpKmrqkTmaAJIslSlPnocZaQp3RqgAn6U6cgHtrRcclbBbNmQodaoVS+MV+AJhzh+kJ1MMtkppVC0V0lop72y1D/ljdEFISWPhYD7bh479mf51s6Y7sYEs356BshDJ5HbgdX2uK2YgFjoMTD+g4npZ5npe4ILk7VY24Hf9BGGqT89SVfBy8QbLtR8+UKq6D0w/vMzz6CbxkwidPpifdqbcRK/JVfRAPwIbXZJ+Hg2wqzThxYb+RAd3WhPL/xHeu+3gh3T2rLghVvptYElM2chqYD4llKvUQWWMZe/ahEUQi5Gu2PUm0JjkkZ6YlQ10SBLWloKa2Vk6JIYLCWA718rMZNBJ3yVK0RtJbqa2RDNJwdocFfLgmpJwph10WQsQIhQov8VcdUmSUYMRN/+e/dQxSiJrWLvvF1DeGUhpeak9hW6C56OAXG1iMQbuDmXDpNvdpwnWIN4ISZqBwFHUCrBmLouuivYA4fmCe5ovf2wo7W8ChMK6sRJa3P73j98Z7v10KVqajPiZ7xICjexKsNUdpFvkeW3oyVztQRaTKxVQfoxnpUK9qHXxMMMRIcAJF23qp/V+BBQ1/WwrPNt7EL8kXlXlYOg9TDuv4Oz0Fpo/H9hulvFwDcZouN9ZXsEvcEVwSLd1zd17hwTH6a2K8fKPXPel6Otey7/cNC1v+vMrX2e5tE2MSQ1eBu3KVhEpAWd+/32cUCeaxawZdOyizg2cqUHfNO8DWlH3NrUkzePyUyL X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd48a5c9-fddd-4032-6da5-08dd4fd03460 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:20.9979 (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: YZAR4vlAoCuWXsUoAOgcYP+tDTvnuY7bpacFW1NQkQmEBfVkBJbEx67mEH6RQV15HaKhRXxm5XgJl84nEx1JjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6789 X-Rspamd-Queue-Id: AA247C0002 X-Stat-Signature: paz5iaz89xiq4jorjtsm34urmcppz6pi X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739850983-608545 X-HE-Meta: U2FsdGVkX1/89PIP6JXLPDdyIVdM9EaGoYe54+0oenyfLhhebDXmp1ai+2p0Gfp2Kn9oy/tiyb82WzcTgdLBFMYWAAl5SkkYoPwRdqb6ivnRssbw2JNUc9mztRInmE8eAdByyt/QsdA4+tpVnrkV1OqIo31czcr9fC9of1j+tK29FLsxeoGA/5rXAKPXeRwKnHlP9TOnZSdPI/9aX/DBIHZyzu33xqbmMV97jiumH2aV3mhkhBouw0dfEqNha0zxAGLX/XVfO6/f1fMWbr8FhMJtodIl2rU9nSnP5wr7gcjfCKcye4MDqzD6dCREWLxZRAxDWZ6WOj7uBTQ0npb061I2V5QqY8qYrACoYnm5j3bpyi5dZmEeonbiCNsu6MEhnSBXaVk+xvDCqYSoLzQPQBKbgCAoxR775KFR6Na14bxMUwtdr9kg6kiao2xuhhPmM5oHKbgfH6H6kvyJFbj2wKO2CBxs/oCaQfu049NbkYC8WSRxfqcFtOJp/Peeio52AxOi2alsV0lfw1A2CDWJhtwfbYIc7QY83tw1KLmR3IRbPAVi29/r2g9wD9AFFEALR0Iev53fRLTaqpbCE8fcy/eMuTJJvgBbyagfILjNxTBYQ/LzsSsFdMzwqmEg5qGhauZCidENOZ7t/SBCx7fuMaFJCesXoyVtyvP0dtiHHo3CtPc6uNbX0cJlSgj4+0H8QsSScbmWIcjW+ZZgEN6DSUuSuFRPNiT25mCy4NlN8NSIxnEcgA8eayvLuoDbWo9F3agZf7ehYnAabZjQTT1eaxk/rvb/SlKEtTyLIburR0336rfEfOB6dwqtCYS6D40fwZLcUB/i9Te4GfpG9D0RaQrtlrBEi1OMWtrg/sbCHnutwhbnxdm1+AoLgIbCb5rtt2NrbRN3LtSvYTudWzFyu90eOEHvGCwfJPQWt+p2W7h7qTT7U8McJjhl5OhrvJKRBTDJzkBNqRGlHpxvv31 KLZBHZ3s +9i+SUzhSUKXHqTObXzYhgjxfW+UXDXSw1caoViNff6X5zMuUL5d5BqzQuzst1DnMEzCo+7inkmQNtpkx2/PNjzaJWD4C6LABADYva6cpmfASShu8IkHDNri6CHIT6K1qENQg3ok+eQlQlQ/Y8d0JsbGOe5iQ7d6blZirUCPsoh9sEp9+JtOUjS9WnOzjHWrqZm/ffqrLS7WzrwkaRFfA+FZX6aReD3BEUnKxHnXVBkxUqu8Bi3R81T8JOJQxyJ4ppI3cWvWsbSCKAVSGkvAXPVrN2uXQudhmu0XalslGQ12iHzUtQmvVLy4ulNZ7nO7fhGOxt4H7bkGfE7ctdHd0tgbIyqg80SoGH36dO4TTK/0DBP3JxxSZfVAKWqnx/l5EbppebKBdaByVV1PR+bsGzEV5jy6W8aQJgiXUkRTs8bO7/ZQ02727ipZqVA== 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 f1945aa..14fbe51 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -846,6 +846,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) @@ -857,6 +887,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 *)) @@ -871,10 +904,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 d4f07e0..8008337 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2735,7 +2735,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); @@ -2759,8 +2758,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 0994817..031d0be 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; }