From patchwork Thu Feb 27 18:08:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994984 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 690F123AE7B; Thu, 27 Feb 2025 18:08:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679729; cv=fail; b=E3VOBLY91o5zBHK+5wc5bfMF0rld+DXAX/vR+ojGt7tdGi8ELlTB5AflgXlS05g2IRIV5GGJ5DFqekKjOEDcgsERkJQnlCnoa+J2rethVHKRTf3RiXryzLtDAZO+s1U1ugyzRCAI8LLqzFEbCXow1RKRC3ZFZIkRQd+1iGCRHLk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679729; c=relaxed/simple; bh=yaTaHRSgLv1shpVmDsFeSP7iJPtsT60AxcXhBj0FnHk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=jfs6i0JT9gQdNbRcqnPF/qiRvEYeD5z6nD/9w6yVaQfJiQ3bN7WSwg1858z4FpGNwRxpGNAoOBGa1JQTZLEt7uHcCXY5gdRCRAS0brMdZVbrIJNtfwEG+E7Ai3SUmiGVFddlNQiL9EBUCAKWUIox7jWiUtKENkJQ+w/c+2ao6Gs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=nZobl8tv; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=VAGAUxcN; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="nZobl8tv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="VAGAUxcN" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfhRa018365; Thu, 27 Feb 2025 18:08:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=AxXUCgQPyn8ioomHuv5B4wgWNMqj/UJg8B5mx82ssm4=; b= nZobl8tvNnDZP/YoTy5hykrU3MlDkfDZWlXCkD6yLCKcSUwuc42Jb5AEB84Ol8w3 5RBCdHU568P4tCxCYz0oMpkN56J+cSTEazpVl/7+Im5jbJESnm56nBVDaZ3oY+ix 9KsLJAuuYy2QQJa/6+LtZOzRtdHTSkH3wpqh5OsSdsr7JH3Siro4QJ4ca1Z5QCc7 bvwLcVBCGp8IB2X4Vp4MXwpWjXTBSh/ElyDG94G/WAxhILjUnIh+moj5R4Qmrvlj 0LSf8XpduHoucWgl01ZtYdDYQTp5KEsUyeq6cr+RnGPf19HsXf65MPUEq8RcJqa4 KbGoSSOq8lNe6MtrR1rRCg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451pse40kp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:33 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RH1aEX012660; Thu, 27 Feb 2025 18:08:32 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2175.outbound.protection.outlook.com [104.47.58.175]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51dqkar-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=t5CRp0UgUhTMMMc8N88ekK7vqi/4ChRu0aiYCKt30Onog8LqNIkQYJE3DH5aw85kp3BNPqmMmSWeefoFErah5vSyL6Nm1acXRuvGl6SwB0tXwMGdyqAugZ00NQX7xd2cIS4sRm9pF0oYSjvcC7s1+VwYq8VBYnQvHkALhoS13ChG2UrXUbLVsdpgV/+gb+o3Ul1tRpEWTni9k8WOLB7vW3Uz167c7d9Crzl6p97dioAcwWKMlltRlGbaS/scLzWcHxDXeFHRy2SXWOSkJQOsBgbOGPtL7F2gh3nRRID7FAxwBoQjO5216pTSz2Ag9wdBbf8ZUCsDs7A/pPTbVE9ZWw== 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=AxXUCgQPyn8ioomHuv5B4wgWNMqj/UJg8B5mx82ssm4=; b=RoQGRv1rOgEblJza21DdLuPytgvO5UPXoYK92Kk/Z0eHpkKpCNWkoUIKAfpoYhArllFAGvLagejE8fe8/qf8PslkXl+N0Nh8N2u+MPeSg9JkAWebiVmxWmG4H3NFkXNIz5dt4cPxcTXhmx+dGk30RYBdGfwZEFRgT9xMK/zi0oxyENrFSnLpRn3JYtQaWd0kXSK0PUE/gRwUh0CUVE44Ky72T/7ewBvomZDNCjHik8HstJr/LGaVshbbRHxLOTEVkwwy8bZotJrjxL4gNyM+42GHE5GTtVDPAaeKBVvLBCeu9YGz+nCR6hHoghwXIqs44jQ4f+aMwqj6E88i2EqLag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AxXUCgQPyn8ioomHuv5B4wgWNMqj/UJg8B5mx82ssm4=; b=VAGAUxcNse4elycVgg3RSl5+ilq9B2QxhieMw13F6PMlAMmfW6fjnCabQhcG563bHnUBfpc38SLVy0lydBo9zleEPCWlOuh9X/TWSY9cHIm1q9Hfmhx3NNBNew+Ew+e+qq1waiLD8P5C8vj/wIRkEIVgUbfIOZupWK/lyYPX2Aw= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:30 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:30 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 01/12] xfs: Pass flags to xfs_reflink_allocate_cow() Date: Thu, 27 Feb 2025 18:08:02 +0000 Message-Id: <20250227180813.1553404-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BL0PR02CA0123.namprd02.prod.outlook.com (2603:10b6:208:35::28) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: 412ffee3-e8c1-4c32-f89b-08dd5759bdc7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: fwNfNCTjpsLpmfnmce5hIhtEkJuf11A2L6AbNSnT86r9ZKjGAasoG0A8zksMxQcAJsWILZYOSGqJ241ubjggK9vccpDDJD/CWor+OvL7suHWNbLKgURlIAiJidVdgXuaHBkMoc8FZ8UyOB5Tw3L50wMBfxynsNGz2StiovljscqVQvRVhTMzHrDGVSWOHMZfE7A1W+jPm56iIs1BeRNZ7m1ARrLFya6FEWE32Mp1Q4wJgnNGfvVVAobywht5T5EqysAyNWB2gwgtCS4SpaU28nJOQsYiRxoet0hZrJFH4WsLOFX1z+Rkg3jRKlVi3O2c2+XwT4FphPBWxDBG+91l8yUeRZRPhvHzCNHlTaHHv353eOC6Ci7kirYb9i8mS/8+HiwigxKKOosr4iUQBJzV+J7GrG8zD1366Jt1sxu7oR0XyXNJuMEo11NzrTnPdw/JUiRKAfvthPZCw9wBNS9Uv4L++vceqOxDnwa+9P5i67kroFlP9od2SHmBOOrdNe5IIT4Hgx28Ljhd5oMHElcVsNnNt1+GGJtRqI+065S8s9JY4cRHOe1RJ0R6M6bQQlrJxYYUecDXmJOJdDpBrgDAdmDq+IMua6Defsf1jsHphwvL4NvenThLBS7vINhBijOzNk1wbHXmqSRfKreXuczGOdVhBexTzfHVSYIx2if8IqLkDuTDbUwdhQ0tyVpyAOHO+WzpwpYXVAEIEL/KLbDQTQsq+kkY+EONNMn2Cjuk+n/SAZ4p6hky8bzV7FgoPPHMrfBll+kRACp+ewyt+h+WGumAjyW0kHj7QGYgJQz0JZi9lKRWZcIK0L4r4CdEDl7dQ3ddMPjhJf50yi8kpXKCs2ZkkHFdpg4S+SP2bHqAUlJrWtcCJbTi2gJMJL96V9iQw6bLuc+8qlhqncUQz5/vkKBBQmuanw2EIrCUim52UvrumZ52msUyOVg5MNmTj5rvGmdKAf4aFgdeJzuFnSWaLAUGVYx53pdnQeOjTp5pdBzELoFQm8+JDH+vkwnc63ITUVZEMk6BydMrVEauQyvHSGIHcn3FTYfx58QdB2/FB0J2p4vjGq1wLkRAa7zc/IppIm7nG1gH+Hc/7Z3Ans+wrjrbGHzLKZIz9ySR0yG5TmwY+pvpqQ+YKU9ebmhxZ91dlxS2X9g+j6U+z3oqDs5ymLE2Fctxx5Djno4qtLRjLLD68VcuSXdbZRDSqP7BfwQlTPmTHDjDHLQybBMo7fMO9T/X4XhmFRk3Y1LKx3QvzWl6onTFP2R7+3kNp9braI4RUEuZtfMD96VUJLoUvOoarvVybzG9thVipgx8779FwLWfdteE4hPuIYRUOGFbAarLXZ7BoGrjVvKItEig2upXTBUoV87UdBJIEojw8fW5VXNMDZarYsxGcrzOfNZVDIie X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: R0JGaAfecgDGAikMMmLVeAIJtw1ygvKIxZVNNS02phyoEEWOrOtCrfMFVr6pgzf7RqfbWTjs+0zy916TaDzyg9/CdSye5QdNfHd4lNPCXvfG65tMr/DnfP/xjmoLpkdLUro2hphP3qvlr+GGfystdWyJyUC1ufXDNtF0juheAicNt2s1J81fPs1cHYjKpe/eLg8bysUzucDXnURB1Fz/JYSJSru40Nks12dspLlXeB6c8oQ2DKkCTQbSFgN0puFDFFKerB8aOmGQRSgs8qReD72errPEhnPGWPQBnUebHKQAcNWp7Gn9NJGivWHI7OgjLvtvlflaDo1qm4rTj0IR6+q2otGDm43nu7sEah8kh9Ri5j+MYu/Hi/wz7h8Egqy9x0VlSjy7ME4IAWeAxRi1RDkjZQwoaYDVLSsZdqpkadPpZglWFf6DL11p91Uaf0AmRir8eYnMvWsvYlrWT4T9EK1fpYDvQKIe0ihP8TgyWExH90IdqMM8vnSGJ4MoEzypIb46pCStznGlxtG/ropbCO0cw16kXa1h8so64sC3zAgeDX/rq+fkO+OoCaIbDm4EmzTZNMY+vry+C7h4LbezYkJA97CmjZHAlE0hf8iBr61yk7sfZZ1cGo6d+l1MRA+bWVltLnCfePoq1I3uo7YWjae9wMKmu74QVbpmbApYo0A+RfzYmkoVJl2nwShXn8SdULUjD7vkG8SMnl6aHcn4kYoy8opwe7/Yi3AavKoSMIXWeH73ccU9lmdiFyyECC38eEvuBGAo0LUn2E/UYU4FhNDeBGbsT5xMDEBTr0KYM9punS4Ko4bjoy06hdY6jBHEHXH5T6wXr581OB+BkUNUds0MwRiMpKs08JGVkBEn7ipjAYnrNE6NOZ5sR803D2js/S/nUpGoQkBj2E2l6ywYvQxpnwe3DDUvisfKwcBFsUNRrskKz84sG8j1fhOlMzLKrJLv8k/MlDatpRxwRJ7940AYLO6yCVH9S0lhyke1xAcTMmkMDY+c5iE/yHvPEKbYRQ/05XnOzKanOvj7v+SjTrxu8NDCdsC1YohwJYUavXpp59lBI37FKdMNG7Pffi/5o/GGFem5Sdpey84MqN+JNPREtoiI6dHgEWNq3dFwXHGTcnoa4bDgmMruqZshPTPoMyoDk/eFYOsEbCSNz6E7stHZyuzU9GxbBYalyOTE89oHXuWLHVdH/QAulF5J2JeoQ7hwqG0ooDHDvJ+VttXqXc/lqtlanGfWe5beieSFOY3A2EH+1On12wl5Rl060RIzl2i3JD+yLVpTY3LKIiZC6CjBerdgSSboW0po5vA3t7FiGyvs0Ic3QImnNn8ZyzQrMCjlxYZ8Ps/iXpJkj8XywGaP+jxqhkywqz10s/j7VPtEFMgXiS8KqSnq/zYqeZKjV+pF7O0Q6vBpIdFsimOTSWFbOO8eeMDaNpSc7iH9SnJh0G6D5etxcHZt1ftQTTM8MPOuBS50XxySlcBr1GgJkSjsVMsuWSSTMVWsjJUL54ILvCpkoqquOs4DycLginvqiSBTRaWMgYtcpP0Hc6++f1KDssWmIbuHCROijTayF2NXknT5buz2qQHWMXGU62eOr7a9/19zkX5DHthiDJUV4A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: NiTNk5P000pFirqdXdqV0zrndgusAf2YGxi7ywM1aH5+n1hJiVYiFD0qKcQt8z9o7MZIKs2eg+buyWqQIqAWHm2OMp5UwOMdDabjTQMtmbjsjhvtjWHaqXQucjELz98bJuT7rdbxHWCnsr7tcQH8kQPo55PgWkEcyAtk+OGaE5UxOglusfh/KCMo7XNrhzljDrbSrO40UEo4Cdh6GA6vO2G+xs5SlL4I2aoV9gxgCxZt60Z4eWWjmKbnEQ7ZlHIJk+XRXJ43kwxn3vFawIhcaD8VS3Hut8d4TVzKm0UkKIshXkDmgdT3l7ylcFWUin/oaHVE456q6jl1oq73oPt03diayy6dn74YzyLOB+8BRiHADhop35PwACN4erg4DytqqpWoIX+6/5SwmZC8s2osmQR4NVeRLneqqXAybJwpA0gOr6uUVsglwF+xT+c0m0Fi7ztLlXkz/3YA7GiTItiecuDOCjsHmilAxa1EA1nzDS7sbJgjDL6juR2SocfFt0UrsARIqTmDYI/f5E7zOzPkLTXJFvhPrjHLB4kfjJU9uM6lraAPJVCSCqhMrhTV836TVjiFZOVUZJm5zJU98CTt+ZbIP4Kjrcbi3ZqAOz4NemU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 412ffee3-e8c1-4c32-f89b-08dd5759bdc7 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:30.6237 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: d3vRS1g6FS26MVgknDzCp+VFDTkCVoRVpuF1cN7V4Mx5vhMH0tIhHFNSUl/vUQSt36stAXq17eedkUYeZGUtuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: PMr0Uo8-VW18iaxoRXSd8ygC90r5n9Wx X-Proofpoint-GUID: PMr0Uo8-VW18iaxoRXSd8ygC90r5n9Wx In future we will want more boolean options for xfs_reflink_allocate_cow(), so just prepare for this by passing a flags arg for @convert_now. Suggested-by: Darrick J. Wong Signed-off-by: John Garry Reviewed-by: "Darrick J. Wong" --- fs/xfs/xfs_iomap.c | 7 +++++-- fs/xfs/xfs_reflink.c | 10 ++++++---- fs/xfs/xfs_reflink.h | 7 ++++++- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index d61460309a78..edfc038bf728 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -810,6 +810,7 @@ xfs_direct_write_iomap_begin( xfs_fileoff_t offset_fsb = XFS_B_TO_FSBT(mp, offset); xfs_fileoff_t end_fsb = xfs_iomap_end_fsb(mp, offset, length); int nimaps = 1, error = 0; + unsigned int reflink_flags = 0; bool shared = false; u16 iomap_flags = 0; unsigned int lockmode; @@ -820,6 +821,9 @@ xfs_direct_write_iomap_begin( if (xfs_is_shutdown(mp)) return -EIO; + if (flags & IOMAP_DIRECT || IS_DAX(inode)) + reflink_flags |= XFS_REFLINK_CONVERT; + /* * Writes that span EOF might trigger an IO size update on completion, * so consider them to be dirty for the purposes of O_DSYNC even if @@ -864,8 +868,7 @@ xfs_direct_write_iomap_begin( /* may drop and re-acquire the ilock */ error = xfs_reflink_allocate_cow(ip, &imap, &cmap, &shared, - &lockmode, - (flags & IOMAP_DIRECT) || IS_DAX(inode)); + &lockmode, reflink_flags); if (error) goto out_unlock; if (shared) diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 59f7fc16eb80..0eb2670fc6fb 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -435,7 +435,7 @@ xfs_reflink_fill_cow_hole( struct xfs_bmbt_irec *cmap, bool *shared, uint *lockmode, - bool convert_now) + unsigned int flags) { struct xfs_mount *mp = ip->i_mount; struct xfs_trans *tp; @@ -488,7 +488,8 @@ xfs_reflink_fill_cow_hole( return error; convert: - return xfs_reflink_convert_unwritten(ip, imap, cmap, convert_now); + return xfs_reflink_convert_unwritten(ip, imap, cmap, + flags & XFS_REFLINK_CONVERT); out_trans_cancel: xfs_trans_cancel(tp); @@ -566,10 +567,11 @@ xfs_reflink_allocate_cow( struct xfs_bmbt_irec *cmap, bool *shared, uint *lockmode, - bool convert_now) + unsigned int flags) { int error; bool found; + bool convert_now = flags & XFS_REFLINK_CONVERT; xfs_assert_ilocked(ip, XFS_ILOCK_EXCL); if (!ip->i_cowfp) { @@ -592,7 +594,7 @@ xfs_reflink_allocate_cow( */ if (cmap->br_startoff > imap->br_startoff) return xfs_reflink_fill_cow_hole(ip, imap, cmap, shared, - lockmode, convert_now); + lockmode, flags); /* * CoW fork has a delalloc reservation. Replace it with a real extent. diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h index cc4e92278279..cdbd73d58822 100644 --- a/fs/xfs/xfs_reflink.h +++ b/fs/xfs/xfs_reflink.h @@ -6,6 +6,11 @@ #ifndef __XFS_REFLINK_H #define __XFS_REFLINK_H 1 +/* + * Flags for xfs_reflink_allocate_cow() + */ +#define XFS_REFLINK_CONVERT (1u << 0) /* convert unwritten extents now */ + /* * Check whether it is safe to free COW fork blocks from an inode. It is unsafe * to do so when an inode has dirty cache or I/O in-flight, even if no shared @@ -32,7 +37,7 @@ int xfs_bmap_trim_cow(struct xfs_inode *ip, struct xfs_bmbt_irec *imap, int xfs_reflink_allocate_cow(struct xfs_inode *ip, struct xfs_bmbt_irec *imap, struct xfs_bmbt_irec *cmap, bool *shared, uint *lockmode, - bool convert_now); + unsigned int flags); extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset, xfs_off_t count); From patchwork Thu Feb 27 18:08:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994996 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 A2E6927003F; Thu, 27 Feb 2025 18:16:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740680185; cv=fail; b=bWmAWs7iO6/uCkJN9LXt9/s7b5posLcoKgi5VzYDuFBv1v8IPawYQB29MY9GScraiytc3d8ZmTJzDdKfdYCzqMm1UrBvgZOraBg4k0mbVe1FI7CTOXhd9+FkSOjax0p0YO2V2iitkQ54yr+DuYM+kHJ9OxrbBajX2eg65nqRRbo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740680185; c=relaxed/simple; bh=5h1WiVfMh5AdK2pVVXYb0nIlZ1jtFy5NbDsTruZUbPU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=olkP+psBSrrAUn9LSzci1clBEr8H63k/bTp5eDoh7PVx9Lsa+PMzOgsAUhuvpgiGuTiS+FTRD/H36K31wlFPjBdKnTnCXlIvdSBTmmoN+lymcPx4hDuiw81NlZV4/VggNuAVuD295CJLgJaVeJdjYOg6gzInGk9+sDjGQ0tZW7o= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=V0bJ9lnc; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=ZZOKo9Hx; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="V0bJ9lnc"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="ZZOKo9Hx" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfkx7005600; Thu, 27 Feb 2025 18:16:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=PMXRJdkS/Eozw4wIWvBmh+viAGrueKqy2FAqqUmxLoE=; b= V0bJ9lnc+07xYl0+rTH1mhShIIWoWCjqHs8SLh8UjDI7wXQkJx91FzvAbnyiGpld o0toe3m/pRUp2AjQC7zd9AUvGC0p0c/V6QXXCkUWxjDl8/G+aV4Ai2f3dIJWP/rt ht+pdXk+A4XLZ0yDgCdqC1Qi/SsdhBXJSeal24d0HiQaiv1f8rDmFJEZaRkBZQBy h02tSJvs0L93M3cve2xanb7tlpopgx0aPc9QKvU8entvDfpomirqWR3Sos9bhL/s cAFydoGRlIXsI5jKoaloanyFczhfzFDjYlx9aGOt87mPymrZj1VG4d6R5rbEFj82 2VFftsG2se611fDVU8jhHQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psf3yaj-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:16:13 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RHJ5Uc010036; Thu, 27 Feb 2025 18:08:34 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2174.outbound.protection.outlook.com [104.47.58.174]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51c6sm6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uL31lFjH9swEq6Wdg8JzzKiDLFiZeXDdPhIyAqru+tr6odyTDXQzn81xluG5+c/QM9ljlr8OaBBeN442i4m4u0WX4FJNTZP3Uln5JGM5UTP6NB59sOpkb07laws2rIT20yIowmBJwiwJ7+6+xSF+5StvkJ7nu3biR2SUFwJFALJ/8JofYklwTNWnE9zvIdHjvvvbeipT7nnTHl9jnNlq3OszLwcTJF5wyobfqeLZof+38z21P/6bs9/8eYjdDk51kVHoGeDc+7wtzNhyHSbb/c2Oz8mqJ0hGHpbaX+7efXeJv1lHk6mVDZo7W879z1kOUoDEWzto19lpSrkjQ39feA== 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=PMXRJdkS/Eozw4wIWvBmh+viAGrueKqy2FAqqUmxLoE=; b=u3+lLHiUiTQMJXLPDqV5Q2s/EmmO14ccub7+TBQFeuf+gVEIv7eRXPxTKQxQTRkZ6x7mSQoJKYXonYUSEr+G12JdWuKAWLpWGCJL27sP/6n/0TdyxbK+nhJLDqQmZsfhWl1++mAZQWe0XUDXoAM7m5uILWHZNSGxq+5hBJ4Ec+PEYYiDFvE9a6TeLKctQw4yVRK71qevHwTYbI41nQoDtJKq0l0QbjzGspWnS6FUd1hDec6hwpf1C+gNZGh5BkPgOjoXeZ6Hl4y3uerpgVQFLbWoFXgCU2riaeSlYm9LwVLZcvlHH/ZA5DNf1HQM+MZcokrWcMSCNltCrz01AJt35g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PMXRJdkS/Eozw4wIWvBmh+viAGrueKqy2FAqqUmxLoE=; b=ZZOKo9HxDPrtYsKgq9cQEhV6LGU36DaIYrq6s/54uXHDJUuwR9lAlU0y97feuWrudWeiLbg1enhN+wvXl2QZFCVp81tksoGC5FFX6cqiZp3yeYnx5BOFpI8amv3v5v8voGf7eeUapEwGvyDdJs7MFS2gGUWfRow+Qu8w1ct5nXE= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:32 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:32 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 02/12] iomap: Rename IOMAP_ATOMIC -> IOMAP_ATOMIC_HW Date: Thu, 27 Feb 2025 18:08:03 +0000 Message-Id: <20250227180813.1553404-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAP220CA0025.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:32c::30) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: bdb06601-916e-4d80-205c-08dd5759beb1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: FYEd+q+0K1QCX1lLfbIgoH3xKqElZkZAC/aBfH/UJfg2t6YQPeSh9MuG3hJCr8+ClRyk0VwGD0n4PmhNXWud2qO5VaMlj2lJ6l/7dwmDQ1zLV1nmCDXNpmzN4V2VoKBxhpoStpZ8G1r0ymkAUx/z5u61dhNhMrnuxSpfrziaEeJpTTiY+7wWO8iqeHs2JLB/bYnzEH32fupLgW/fJQZ8GqLNd7ozb7xG6rHCitk8vjzjy3xQNnhsfqzq3nKyoJ4zWr0HWdNT4UGDscPOq1/WbeDJZ5RtQy/hGIxYKYXLDFCilxtavOVvoJt/CUxXLdZVC2jDks90avCQFbIZHUgF1fXMCdak6kpXwfjWDG8Dj6vFFbt9fkaRtQyJWHuiTzfu1WI/kUF2a3zmWB2RaX0hmIitWR1iewFTgCc8M/Ls7uvN5YdxlyLVF0Q1gkSa23c213yskoHR6V3YR2E5Pmo/qO3nI4rKS9Gh+zSZV+2fBTGSKnWiabVc71Gz9F49Y+mUHrHed9j0WxOFSwU3N098S1sIPuJkw/oEFXI6WV88PZoknZRTZgfH1bacntomCn47lrYFjvHm1Kk3ZCjZIvCu82O3WkGVa7V+74omETQ/BI8J6SqlAQms+MkfihusCmeREFq9D0sIQhU12W5N6fsZap1W2mvhvfEVEV5CSpAY5Y4jEfXLmHjK1JEmPMWjM9KEP+MEMfrGauUWSr67t4VdXJ2FNBKTcC8k4Nb4u66nRSJmmSA1T7CxiuCRymJql17DXaiJFlcBzPYKyKM/Gjm1vZcLicSZr2zt+zQdomAkrH3eZB/IIUmjvBiqanRYZMLMi0Mnck4UTC01D3y2ozGhxN3HaRGa9sz8c2fdrKsnq9E2tjDtSsyKtyvW1YyLJpaZfNLew0kvVyMbMzc7U4Mqy2IPUFb3y/EMr7JyuBLq5v0MtO5H1GStdVHNjzqQyxzQxyVzfr28oxSfBBWg7qcWbq8jlSd55FK390+K0Tr5FDZYzB2n0pRw4g5pINXXuvBK2fRzZbCyQDxL3W3MUKhxkOg8f16JlHgvZ16T8hGF8Eg6DvufoF/wIqu7kdh3x3LO/QRvZL0rFMLVqPvs+QWzVWHXxvQ8L7tqrOJw7hLT3DkRl6WbPJEir5Y7NG8x4+BTBB5W1mZm6bJFHD2JFZpROb4dzyggTP6JI0Ofu90GxxIKZUMmU470vSeQjvBb2BBmbBVMX6Owi5AlTathfIIAAPivmWDclgLw9mfSvVU5FodDPlEJjn4qU0ieaGylOFm7tUI7b3h/cy6N6cV/AOm6aDUCOcdKnpdKMXMkNYkyEozxPlqMDIqcUrdR+N1gL3Q2hngGAm1GvLMzVXeM7QZw/J1L7p+k8169lu69Mc06irSnvAutZp+ahQXk/Itt4rC5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 01A7F1xxX8N7vO02IVALc1zf3BYprJxw/Ez5m4MWodPO6RBkL1a9QpDie0f/1Um4OpKlqtg/QYVLOJD0UbkLZZqCYDRSxxFFzL3j0+44/LO4rZXIAQYkeQuF213wxUPspGgTK/yk4mody1PGoL2/fVTN961d/KrogORF0eGnbCosts+Yc1BCrUA1AuG+bE/QAM34Z4OvRsXY0Ubsrh+U0lKa7allyCkPHyDAI5A5CiQnKyn2hp9dE8hDxXR+bSPB5sjJo11xfPHrAW4oYFiUIzrT05Vtw8pqCr0xZfj+cJQMFgYMRVTyi8Jotd6R32q1Lz+7jdbnZhKZYivngxYyWtnXi3LVOKJiIzpEesMqC5+ZOJUsb4Iqu1q70CjeNHITdnw0lNsAbX2/dv/z2TwMInGz2EuTTLE06FFB1u5qQ8sHw4B2rOMlyUuA8AO6zNCsoj4YHxyHHmWvjmNcpLL29USrTMu5h+6k5bBK6sA/7x5NytYvyyXMVnTMxUlTdjXLqNaPPbVktFLeiVi/XEcwXi4hH2dM5VN9uDk8ujOZobRJ8SI9yO7MgpIlFjgkMUY/lsXorWA3pFLxKZkw7v51mL8LWBwvT5jVvCSXjg7TZrv2325dU61iQjkrEEfPPqCEGZcFr/V72muQczobovlCunAusxPH/PGp847Y8TM1id4GWqzPoIpxOMt34zIIHBxhuDWOlCOj8JcnL7jg4H4PlmbboGjD9gbDS+N4sK6Rme+sqNTbqa2iqo/hwzdJXgWvZ0+hV1E/3i3E+RWUEXctome7foSRrt19LiSZ12dWkmgMmidyNcU4UrzhYsIfljQ1lCVREgPY9Cs/TLRSg5erNsg+TypH5DUsT8ewO+QBc/oZsd9FAWF5EK/+V8k2GES3nm0VuxNTMGai+YTIB+01aK7cw8/8fmB2hNpi3G+xEzBY8gkl7D91RiMsH1Iol8Dy46P1Yhdxwsa9w8GlXxRAaJj4AUrRif1Ne7Mvz+fcFExFbIMkIawPWlPP62o39GM7x4YhIS7pLcGRC3/Z8yT5nPXvufK16qNzaG/4ckoMmeUnnx7ytW2Rsnwp/xo5Otst5JSe6f059DtvBtz6aTVYurxRqcI3cEdqfbm9AU43+7Rujj8mbHw6byQOMqaX91nCm+2Hu/VcwMmL7WrnUhBETFWlqmugXni0FhrGkt7DJb7KeyGmozieGHD89U3r7XoFZMR08JzJAes2upC1JTiAmZp321JQybPVQG0tvAaKdQ+Jgbw1LngBdcucoRwhahAHE3YhVQRmpuqLL5A1z1D9P1AqsaWSOs941rUxYhDSC4D4pvZoVitMzDMVDauW8SRyGkNSzGF0sZZKjw2Cbggy5hsCH1fIwD8ahpWVMs/dNeUomEJcPvBlZWdhACxjT4LtuGHuBide42/iiRy4gum/0zOzYUI80tzYkH0ySRJMF0Ly5R/V+Xmy33ekUuchrrLFSYHRuEuMMDwyztXLjMNitCkO29L4bSq8KadhQ4eEaAAajyUSX3SW5CymE3j3b6PGgsGOmKrkKAIvy0bDeNZcX5d6cdD9zHCuowLGDS6cBa5Qjh7xPn6/i3o2+Ea4m8Lf0DgmJGd4qpyZtFnHHMOAPA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: XvNmG7U7nfyi7qx2gSh7rHUJfvKgZ7luRaJo2Cf0l0WFityMjVZoXSdBzv61dx/cADGmZYfxZz4Q8utOxRziQV0EsWfTJHp1BhYTNYWvPtb9k1gHX3xDWKOweyai2wYTvGpAIdMyUiIEeZMfT39imvaKKUAJ6AG4A8SG4/tNDVTePr2faIb3rkbcq0VQ6DpPa5LXwgcC2MkIMhCznOd81V402MoGW3zHWq8R8PO7SNhncYrjeN6vbxg3P7rNkzBgz2cyfvztdqJgMmskcWCOpTfpKf8yy/e3S912yUNNLTIJMuaN850M30PVI4WDrS5EzYWmQe6ywr8ZYWvOE9eu8bXOgqt3SQ9keR26+bv3H59UEFAglpttf0BeR3+uBkm47Hn+GSSo85dOy2Bfgm1fxtG+q12FiCaCRa/tQGVRe5vtCNci50nmij2cao0dLlOsn0CYjPt5FuAiqR/MSTm0dYTvP4zIqVi9n/BEpI/x85wcyFCLjmAWrHlrRrbZ+SiPDk4QDY02QSRLItDU2qkM6/BDuAnsixTJC0JZv/n/1WA10JrA8EDI5uQD1A2g4Y25vPzAUFD7MWiETtS1rEuyiIgcAQ8tvpAKP22el6I3Vaw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdb06601-916e-4d80-205c-08dd5759beb1 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:32.1165 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3qKZimb1ZFc9MDASvKSyWQOZzqYfSJIpPhmfiL+gXKe5vU3XaE2+3QQJs0LWrpNrC6zUO5fuWcDtNu01cM5FBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: PlTolD0MMtieqOOujTaTzQt48SQrinFu X-Proofpoint-GUID: PlTolD0MMtieqOOujTaTzQt48SQrinFu In future xfs will support a SW-based atomic write, so rename IOMAP_ATOMIC -> IOMAP_ATOMIC_HW to be clear which mode is being used. Also relocate setting of IOMAP_ATOMIC_HW to the write path in __iomap_dio_rw(), to be clear that this flag is only relevant to writes. Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- Documentation/filesystems/iomap/operations.rst | 4 ++-- fs/ext4/inode.c | 2 +- fs/iomap/direct-io.c | 18 +++++++++--------- fs/iomap/trace.h | 2 +- include/linux/iomap.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Documentation/filesystems/iomap/operations.rst b/Documentation/filesystems/iomap/operations.rst index 2c7f5df9d8b0..82bfe0e8c08e 100644 --- a/Documentation/filesystems/iomap/operations.rst +++ b/Documentation/filesystems/iomap/operations.rst @@ -513,8 +513,8 @@ IOMAP_WRITE`` with any combination of the following enhancements: if the mapping is unwritten and the filesystem cannot handle zeroing the unaligned regions without exposing stale contents. - * ``IOMAP_ATOMIC``: This write is being issued with torn-write - protection. + * ``IOMAP_ATOMIC_HW``: This write is being issued with torn-write + protection based on HW-offload support. Only a single bio can be created for the write, and the write must not be split into multiple I/O requests, i.e. flag REQ_ATOMIC must be set. diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 7c54ae5fcbd4..ba2f1e3db7c7 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3467,7 +3467,7 @@ static inline bool ext4_want_directio_fallback(unsigned flags, ssize_t written) return false; /* atomic writes are all-or-nothing */ - if (flags & IOMAP_ATOMIC) + if (flags & IOMAP_ATOMIC_HW) return false; /* can only try again if we wrote nothing */ diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index b521eb15759e..f87c4277e738 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -271,7 +271,7 @@ static int iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, * clearing the WRITE_THROUGH flag in the dio request. */ static inline blk_opf_t iomap_dio_bio_opflags(struct iomap_dio *dio, - const struct iomap *iomap, bool use_fua, bool atomic) + const struct iomap *iomap, bool use_fua, bool atomic_hw) { blk_opf_t opflags = REQ_SYNC | REQ_IDLE; @@ -283,7 +283,7 @@ static inline blk_opf_t iomap_dio_bio_opflags(struct iomap_dio *dio, opflags |= REQ_FUA; else dio->flags &= ~IOMAP_DIO_WRITE_THROUGH; - if (atomic) + if (atomic_hw) opflags |= REQ_ATOMIC; return opflags; @@ -295,8 +295,8 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, const struct iomap *iomap = &iter->iomap; struct inode *inode = iter->inode; unsigned int fs_block_size = i_blocksize(inode), pad; + bool atomic_hw = iter->flags & IOMAP_ATOMIC_HW; const loff_t length = iomap_length(iter); - bool atomic = iter->flags & IOMAP_ATOMIC; loff_t pos = iter->pos; blk_opf_t bio_opf; struct bio *bio; @@ -306,7 +306,7 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, size_t copied = 0; size_t orig_count; - if (atomic && length != fs_block_size) + if (atomic_hw && length != fs_block_size) return -EINVAL; if ((pos | length) & (bdev_logical_block_size(iomap->bdev) - 1) || @@ -383,7 +383,7 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, goto out; } - bio_opf = iomap_dio_bio_opflags(dio, iomap, use_fua, atomic); + bio_opf = iomap_dio_bio_opflags(dio, iomap, use_fua, atomic_hw); nr_pages = bio_iov_vecs_to_alloc(dio->submit.iter, BIO_MAX_VECS); do { @@ -416,7 +416,7 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, } n = bio->bi_iter.bi_size; - if (WARN_ON_ONCE(atomic && n != length)) { + if (WARN_ON_ONCE(atomic_hw && n != length)) { /* * This bio should have covered the complete length, * which it doesn't, so error. We may need to zero out @@ -610,9 +610,6 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, if (iocb->ki_flags & IOCB_NOWAIT) iomi.flags |= IOMAP_NOWAIT; - if (iocb->ki_flags & IOCB_ATOMIC) - iomi.flags |= IOMAP_ATOMIC; - if (iov_iter_rw(iter) == READ) { /* reads can always complete inline */ dio->flags |= IOMAP_DIO_INLINE_COMP; @@ -647,6 +644,9 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, iomi.flags |= IOMAP_OVERWRITE_ONLY; } + if (iocb->ki_flags & IOCB_ATOMIC) + iomi.flags |= IOMAP_ATOMIC_HW; + /* for data sync or sync, we need sync completion processing */ if (iocb_is_dsync(iocb)) { dio->flags |= IOMAP_DIO_NEED_SYNC; diff --git a/fs/iomap/trace.h b/fs/iomap/trace.h index 4118a42cdab0..0c73d91c0485 100644 --- a/fs/iomap/trace.h +++ b/fs/iomap/trace.h @@ -99,7 +99,7 @@ DEFINE_RANGE_EVENT(iomap_dio_rw_queued); { IOMAP_FAULT, "FAULT" }, \ { IOMAP_DIRECT, "DIRECT" }, \ { IOMAP_NOWAIT, "NOWAIT" }, \ - { IOMAP_ATOMIC, "ATOMIC" } + { IOMAP_ATOMIC_HW, "ATOMIC_HW" } #define IOMAP_F_FLAGS_STRINGS \ { IOMAP_F_NEW, "NEW" }, \ diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 75bf54e76f3b..e7aa05503763 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -182,7 +182,7 @@ struct iomap_folio_ops { #else #define IOMAP_DAX 0 #endif /* CONFIG_FS_DAX */ -#define IOMAP_ATOMIC (1 << 9) +#define IOMAP_ATOMIC_HW (1 << 9) /* HW-based torn-write protection */ struct iomap_ops { /* From patchwork Thu Feb 27 18:08:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994993 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 ED6DB199239; Thu, 27 Feb 2025 18:14:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740680089; cv=fail; b=FYRgNh4GLsnSgQRpswcc8zsaa2yg3WXfwDPP9UvjZnGv3rANMHcaWOw5VHmC3ZcdktHk5bVnN86/WiVk/8fJBr+N3Z8V599PLJ4ovEOGYb8Oy64zRpb5Hq3VPXUat3+i7ShF+9FCHz8HljnLOoPFaHesp9sGQQa2v6BmVhAsTGY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740680089; c=relaxed/simple; bh=LEbJBIfFBooE0zNlqDfOV/z4WOoSwMoCQy8rApqEkWM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=LZE5N5c7y8Jwfixa0I9xw+AFg0U1jP3TR5EdqizPB+j+jWW6BGgJIT3n3xg/ZDgcxkYiWrBuUyduKdRmffjcRZfnGuPaxsHl4BfOzyrq7d6iqsKDOoadtObhYBA/8OVfgjW+68ZB58i6B2Alm120ppHF4/xvPnmkLXRMZtnESCA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=FL+wTEqO; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=H5dUpIfp; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="FL+wTEqO"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="H5dUpIfp" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGffbE029656; Thu, 27 Feb 2025 18:14:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=YioyRx6zmpc8ShPUGKJYxXaOJQP8hipccExmoq0jSbA=; b= FL+wTEqO8ApvwfwHWdJiOegU+RyWztcZqXfqc9ya4RdUFuNwStVbU+bJBcXX69fm R7ODontQAy8gGZO3Rr5Jd70qVMoxDxeK8dF546klJSOwfG6kB+qajXUZSzk8X1Eq +ges6iLWA4wn9Zx1WCm9agJblrVzz8c7xyJyMFF6qAShog99vGn5L5ttkyyPAkSn vwfP/+LNGENIAFRUCGBhHsPyQKGj5BOFdSCrGn3x3CgqmLiPJeImn8+SJ8m9COed MarGtZlniiO4JjhGEGrnPbNWEa04psbBbfL/+mmKczZ8dnW0IhrJKXupgTDHs9b5 pkCziyg0PGGVgo5dEL+1HA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451pscc22q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:14:05 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RHJ5Ud010036; Thu, 27 Feb 2025 18:08:35 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2174.outbound.protection.outlook.com [104.47.58.174]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51c6sm6-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Kn6xMZytzihWgL7kT2kLg6C0mCS7U+eDWlw4HO/mqEA5ckBq697OopVzTXPkO0nrw11qM4nxP//AD9CT1w2VwEY0A7BjVvChi3UwaRiUPYLXm3CGP721LVSGVewQS+VD1dlUPExIDnXdPvuaStmztW5O+JfPMclASscG6yCnewWys/ZD2v1vA9MtIfmMIgAeq4mS2lfND+DZmPH2U1SIiyLC34uXqLSlmw2Ha48gyZiin5pRHZBay8nh+tAjxkQAwQPtfXWYcJGgAj4K3iYGy/5xB7ZpdifxFvIoS8LxEklVMXUVvJvlQl76SZFiqMCt4rPpUr8aiWeK2LuOgMx0SA== 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=YioyRx6zmpc8ShPUGKJYxXaOJQP8hipccExmoq0jSbA=; b=GRyqLFaWv7g97KuCmsPV67FPoH/OEGMvXI7yoj9xfeqTF2ddIncS0zbHBX3VZWVpFMLZzHf49MkWviFNT20eBR/2Ng7KvSrENJWIZ16+m9zGNvol/GqURcqOtvtUj41NH1PriSOydWXjvJyjUhT0F7ibM87mSBCB+c8RHea+sxu/vZFf1DtBt6iBWsMbNyxuAMVbX79FEECg6xYOHNlPtDAPanJMNGL/Q2wXVLFTo0tBUjOomqHfFhBV4alqTzpmqun5dL9l2LMF8ibRpGPgHDrxyT8myE6tHsFCg2oxAwZnMoOOxHGQ9xjOU5c/974voJyYEBge0vOKlJ9u4OVP9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YioyRx6zmpc8ShPUGKJYxXaOJQP8hipccExmoq0jSbA=; b=H5dUpIfpdEWF7mm9pPolOUwtjldFDSqTMARmHOgu43l8yzkR2/eZ29x+CzfE8IEXbTXWeQ6jahmci2+txSAGp5zHME1FZ1bIM+DVWxTKuPo2NdkQbGCHwSgwMh594d+WogDUKoQuMER8c8C1sbDkyIXhtCTgcveWmSCCg0ZMaVg= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:33 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:33 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 03/12] xfs: Switch atomic write size check in xfs_file_write_iter() Date: Thu, 27 Feb 2025 18:08:04 +0000 Message-Id: <20250227180813.1553404-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR20CA0042.namprd20.prod.outlook.com (2603:10b6:208:235::11) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: 684d6635-3064-42ee-c132-08dd5759bf7e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: cZYmvisBUICWnzjMYCWHnDypne8OwO0Mo+kiVY1ay+44+NJubfEy2uGiZTSBnZzed30DLLSj9WcvQoBr0uHyobWFOGJm6WzooIlo2Bx6MeXyfNSegCxwGJ6/DCFiTZRxe5D9hyWYOKjzH7vOz+VcA9Hd70PyAI2BDuw870Cavr+bnLRXb1UkynuApIuahngXzn+3zACPzDLpJiUaFIK7PCPiKRyTJ8T7Wtn8AiDceoguCgjitxZV8zL9zfCRDrBmwcb1Jx0Kzo9Z25agLphlaYa67g44d6kRZ5tzWb/1ANmeQ4N8qLMK3ERGks9fNuB8TjmTF+xvWNlte7RqlJuERPa5AenMtmB7hRlWLncIJcg7euL6ze+/tKVX3KxJH+JDQafBzwDyglT0bcFRXXU7VzRNS/OFC2SIvxV1mDFXwzdDKJoIqDpargaNpr4c2ZcDO9q4ca6nyHWJARAx4LpZY3R6QsXB15sqEzxpI/39SfwL6JUVNXMIPfS03f1p7O6xRwtyPm11+NP3ag+69fLvBzoegCEwQebyA5OvJe2MehesIiNq7pH5ffdD6J5mtAdlCAzdnWoDO4JufBv3DJ6zI0Pn/NM5DIWRgamNoahXxNQKrm2neMRJ7Z93QxDUqTMdjAVXhDA+81BQ0+ymZaHA+3huT7ps1KoAWpTfOb/aAmXZTx4qLaGf79cCHfIE88MmLEt0JJ0gMbyiMW3UMBosEN7kWcMT4ptIu2GzQ0HE4c11bmBM4w5Bg47i0eulV+zwX+bVIoJYNBmBpj8czc0vq+SvaFR0fdfNC7Oe/YpB8WzvYkEv4faGyZfa1XIGCXJs+a5V9SWLSYqg7bYF+lo5aotkk3/0RaJQYq99qGpvbKNUNyDblN+5p0AACWX9DjIRxL9peRI9GlSksGLCM4mXqSIlKKc7mKijwR1KQlXtjdNODVPkJnSr2WuwWoaBcB0Ay/jyyJBtGqPh3prN9SC7itt2eRI8JyH3y2N43c9QQgJP4QZ8imr0G++O16fqOXiiMlCat+xPzGnFXxFFb+SWGGTuE72iXWo88r1U4mlgeGc+RABF+TtvoDdy3zgK+6WHpq7XfI+1zN8gbTXg1O6mrespmvITcOaToFKTBq0br488VsZhHTLgzDTCT2Nho9qvWQzpTRBWUEeYORxikbt+Q2Z2JafbYRdJcPNgnVFhHQYb5IROIwSgkLbsnl3EB1kDSagAf3q88PF3mRhFa+wKlcxhlVR5/2ioOA+lnng3IMbkLTeoUUUFQw72py+QgohSX4/2dJ7q/UUdIgDLcAM9Ilfbxv0gCB2vDXv8awZXcwDP/v4jWB4YTMJ9lAYG9fnGcOcCcuFBBhMoCff6jaXouK2oag1XK2yJszX4UCtqHYqAoOFyguthCFVV859sApvu X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qVWfb+9bbbFGCodJjFV9vARJ7OYmaaJ0ItzwAXo9WCujF4UJUyATLi+loLUw14EhZsplRQ6V08xgdyfFiEfhOi2/uJz/wnEZzh44ZmPCws6eK9yW4PdFb3mfhTUI6Sos5Z1W7XcjT+nWFOitmdSfMer9KwxWvQ7Ll8wdO4chSLuictK1LqRIHEDJoMPaXIqw2GXjINEg5L5povAndLCLeqLsMHQfWODvuEWfcvGXmTSUn2uRLRESkKgHRcn8WLQ4HsYA/7MhqcL7nmvhcSdX+TH2nztKTVo9Z7BWrw2kldjrCtUlMDNL+fA0lBX0c1f2sQnuoXMLBPhJjlSXVyv1Qt39Xrt2xK3jq4FEbhlCFMuAdZ5j4nwAEyg0U9UtQH2oxtL7d7isysWiVRBCOwYCGTe66OaeXNDn+gk5UjeW6DGNoMCX4AIeMZAZvon9ld19I7mn8WLqTJa530TuozFV6rD5fobwlYQQYqylCs3sOGKvx6u7cPge4g0URawhEsSFKxStrIj3Vjvq0ByMt0VaYm50dEES8AhmgCnLIefjJ4XDDFpfFEN/gXZLOKpOe+KeDjkZYQPCywVI3k3B3yV6AMey3bxmu2EKAvh8bceFk//qV7Xjc6NK+zpb7SY3ERjXP5cc1L3CCMfPiTBRNVwMRNQFfD+dacqocw4ddsINVaBATshiQvwGLfpIHIrs5uN0CNKpyrIyO4s4t5N9Ck3BpUA1TG143uOu69rUliMGDHbixQj6pE927eX7cq8EUFdkR7gw+LKdr+LitPmR5q5qo/Bn5XAXmZW/BpE5S8cxtgEAfRQ851HUcfMiqRcr/JHlWdYyj11ghTgkZodS816dIHFoSYjx7nRNYANx2J942JasSu3J77LHxLUi7HU+tkbkoX2zQi1FY0nEQDJfjTeYbsI3K7O0dcfvI8cfM/1dGOV1IJP3spJOQSKaZiQgp1thMZ+KcSvMu1acLHbcog0m7TwnTJ6QXAiopY9kEW587bDmGikdX0H9xZtZcrV2+79rxlgtiNoD9xAB3uSjVcn/9nAUm/arLA4BuMMzFJnP3fOTs2P6IbA582qvg5zpb+1/Ev+XaGJ0CtlHYK6rrz+LXd1JEUU5yJ8Tj6NeHULGJeeG8F10JLlnk4b0KyQ3L5xuB3FsCvaxbz3oyFFiFXZfwrbJPn3QTzn9OjLnb8/74FxQHuSuOAH+ox1+Jx/2IQ5zLZz/NjUKWEqZUd4h7C0e+/SzuWpmPUgBRhO5ySPyG8ttOPWhtEj/fEaq9SJc/EQkUTCUCsfjIMzWCW/DiRvqpmiCZwqcG7WIHT+SjjZI+h9w5znMjdeb6xTl5ZtZ+1U0H0iIyM+kdnKT4Y1Smtdb9c8f68Zm42wreaVrRT9Hs07PaNpWVehtMtSECmfAIJvYp4XERYAnRIVADuSVy4FMe9b8YIKwrtFCerWxVlerciK1/3sn8WUSqIygCUzbRvJ8ysL6auqxKYacbxgbjmXNFxaLs7jEMs0tr2v5MGHvnlNLxtJiWrthQ8vz1ZEF3zl27j2POHVroEBdVow8O/yBsF35AFaYdsdMPFOdgSWVYHSiehDbB+3afaPnMlw2UsLzjQ5OObiWJAU7QkeTsmre/Q== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RxbsG2YiKiQcpC+q7I2PMZ0qNkKp3kNQ428YJPrpr1aV4jSfAIShqiM/ppaPOUUMtnmUhbgFDgiXcY4YygPo06r9+Khz4J6+GfGyCb5VR5nn8SKV1/n5NWfHEojIru5Cr7lGSQWWGbDHQJ+mtiAzvEpfvrIn/yhRAZbhWAeXfrDIerMx2RZ8Apx2UOPuqfDD/y9qxvWCqPgEp7EBmhL1QNLIISDukWWAZXWqj2wjX1+e0vV3wyx70PwydZyIJKK41GmugeUxeqrxLuNfwkmLEOwTn9TFc+BkCJa1Qo6lXMfSvMn4f23WQw/vCJk3Q5kMkd3Iu0FNq6AdYyQyj3rz2iYB7Mw01FZ0ypblA3i+5PQ79+DwEb/KuCHp+E6/94EQ4wVVulO0ULbQZG+x8iMj/uIp6acnzWJKJNqVY3kOinTIkVIVCXvf0M4fuv7A2QVHKvX6Z3UK/WS2a01GrWZRUcrGsyr1qp+kjzOZ9gSHa62Q27b3+eqdIZMgfY8jYK8dEuWsDDzY0RNKEzjTwvl+hDZr8mDGEgfyeVnIWPqtAuvkqtSt12usWtfEfoFa80aZ889lZxI5HM2iXiT+KtN6KQNRDfu1wHSmtUR9lH0vA0M= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 684d6635-3064-42ee-c132-08dd5759bf7e X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:33.3987 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dCeHjZwl+bFQm7uSCVou6wbcI+CJlIpLmx2ocMVsgpoaSojw8eTsDEwwWPGgSLMioT+SHnFm533Buo7sufdECA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-GUID: eBgTVYrw8d92nuqRxGwPbTTOl9WPTszK X-Proofpoint-ORIG-GUID: eBgTVYrw8d92nuqRxGwPbTTOl9WPTszK Currently the size of atomic write allowed is fixed at the blocksize. To start to lift this restriction, refactor xfs_get_atomic_write_attr() to into a helper - xfs_report_atomic_write() - and use that helper to find the per-inode atomic write limits and check according to that. Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- fs/xfs/xfs_file.c | 12 +++++------- fs/xfs/xfs_iops.c | 20 +++++++++++++++++--- fs/xfs/xfs_iops.h | 2 ++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index f7a7d89c345e..258c82cbce12 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -853,14 +853,12 @@ xfs_file_write_iter( return xfs_file_dax_write(iocb, from); if (iocb->ki_flags & IOCB_ATOMIC) { - /* - * Currently only atomic writing of a single FS block is - * supported. It would be possible to atomic write smaller than - * a FS block, but there is no requirement to support this. - * Note that iomap also does not support this yet. - */ - if (ocount != ip->i_mount->m_sb.sb_blocksize) + unsigned int unit_min, unit_max; + + xfs_get_atomic_write_attr(ip, &unit_min, &unit_max); + if (ocount < unit_min || ocount > unit_max) return -EINVAL; + ret = generic_atomic_write_valid(iocb, from); if (ret) return ret; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 40289fe6f5b2..ea79fb246e33 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -600,15 +600,29 @@ xfs_report_dioalign( stat->dio_offset_align = stat->dio_read_offset_align; } +void +xfs_get_atomic_write_attr( + struct xfs_inode *ip, + unsigned int *unit_min, + unsigned int *unit_max) +{ + if (!xfs_inode_can_atomicwrite(ip)) { + *unit_min = *unit_max = 0; + return; + } + + *unit_min = *unit_max = ip->i_mount->m_sb.sb_blocksize; +} + static void xfs_report_atomic_write( struct xfs_inode *ip, struct kstat *stat) { - unsigned int unit_min = 0, unit_max = 0; + unsigned int unit_min, unit_max; + + xfs_get_atomic_write_attr(ip, &unit_min, &unit_max); - if (xfs_inode_can_atomicwrite(ip)) - unit_min = unit_max = ip->i_mount->m_sb.sb_blocksize; generic_fill_statx_atomic_writes(stat, unit_min, unit_max); } diff --git a/fs/xfs/xfs_iops.h b/fs/xfs/xfs_iops.h index 3c1a2605ffd2..d95a543f3ab0 100644 --- a/fs/xfs/xfs_iops.h +++ b/fs/xfs/xfs_iops.h @@ -19,5 +19,7 @@ int xfs_inode_init_security(struct inode *inode, struct inode *dir, extern void xfs_setup_inode(struct xfs_inode *ip); extern void xfs_setup_iops(struct xfs_inode *ip); extern void xfs_diflags_to_iflags(struct xfs_inode *ip, bool init); +void xfs_get_atomic_write_attr(struct xfs_inode *ip, + unsigned int *unit_min, unsigned int *unit_max); #endif /* __XFS_IOPS_H__ */ From patchwork Thu Feb 27 18:08:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994983 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 EF50520409A; Thu, 27 Feb 2025 18:08:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679726; cv=fail; b=TQmfhzaRr8814ixs1/g8UB9InMBi8tkx5SjOvPpKI7PJWn4STSwbOeRTaWQZBteIR5yLzNXK19BD6xLw8A2WadsyIVE8rjebrDwMfF5ETWmIAlYPlt6/kyhnKm5YJWugzX93mbeJz7DHAvnRTbUMaaAc+Z8mGe3bD90drTz5QVM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679726; c=relaxed/simple; bh=BLbwDKiELBy2e+k1mUIiQb8HZkntx+nDiWZLSXEh5kQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=dNCtURAnOy+0Cb2xehYlhPPTClo28hjVVj3+m1A5Qk85jfBoh/RgezVUJw6C7Q/IjDvK3tvfMd5QKvK3DYT3jFgl0n5KjJx7F/i4QHXOIJRr0yxnbw3Kov4/fi9qMHUBAnM7S1UIkCJJCksf2Mm2xaavooM+Y3n9Zvbg8QGvmZg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=KyG7fJi7; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QS3I2590; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="KyG7fJi7"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QS3I2590" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfhhd027299; Thu, 27 Feb 2025 18:08:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=gCSMxwYRZK1J/IKIf6CXsfHMMPxCr9kdpGpGCDzZVrQ=; b= KyG7fJi7Sld+jzPG6tZWq/du/gxPzbSe87OYV9Hp+SDgYFjwK8jAyOFnH0UMbe7P TajnMBFW2qZWxmwnuQ+iV5QotWPocfQc1QxdVD08HYmLhyKj0ubP63csDbDqxbqT LB0ugMR+kj4gvjFDuoPJkKSL851gRiu4sQCHeWYPigl3Vrx+z8OTsm2laVyIceCH R5oikxRlTOkskwVttakB554egoIOUOrtOPTe8cVydg1x/ZcwEIHGsHXDC3+5hXMe nev8KTsvgokHqlwvzgaOEhCXa8zTyh4mSX2EkysYXcDMTcru6+7M1baL/THccqYm L9zQk+RjLhGuOqZ2lB11rg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psf41hj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:37 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RHKVtw007383; Thu, 27 Feb 2025 18:08:36 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44y51jhqq1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rIwf49WgdZE8VlGSiqZSA35D7/BagGoDsAFtJ7eS4Gdg3Z1AwJUeFfqtmPvXIrWF2MBjAyMcYDeknvdeoKI+5hE8lhPOAw5YHsZfxyL6Yd2ps1u7U+i0yjf/paCntaDpXzfxVj/EuakjzwiEVDAG9jYpaDxgx+AVJtDzIushv2uM66N3+vxoOTo3DFjJOvruvMAGQm0AD4SGDn466+MKi3C5kD+a4z0Z7N8kPmfrT8YY52AGVGqz7Wyc/fb3OmPLwP2jX7G/KBuGYdTsbAzOC47E8Zm380qdjPDHfyhPMQqMwBBf350QHAkaM7ghEXT3VLw9BYNvXzdVybgUD7mTBA== 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=gCSMxwYRZK1J/IKIf6CXsfHMMPxCr9kdpGpGCDzZVrQ=; b=WyRjF7w2XT4v4J6DHPOUL74DvR+1YjvIrPVcGxtwZ7mLczJJ+RXqOXlliuLTNMxuSo/KcKC9PczdUXrmviMofpJJtdLtv/422/0TXdO0Ev96Uojeceu2HRGbecEJHFghMJs+sCSXZnL3XBlHKGE7e5rzBLQWh6LGl3vp52i6QOAFG5PL6nuHr2TX+PO8W43oPiu4QHu6RiJA2skbU56zaVnOpsbo0pvkgJEkh2W1WHHzKaNBaDz0kz68mcGfeKdQh+BBJC+WIHCtAwyQmovt9I/36aCqaCdc8TlHYosSl8joBS2LNl+w9MC88Jy9H/daC9Xzc+draeOZYIc9/WO9kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gCSMxwYRZK1J/IKIf6CXsfHMMPxCr9kdpGpGCDzZVrQ=; b=QS3I2590azu5mgkqfvBMggJqHokz/JKiTTucpgly1IAmhiWl7xNlngg4c/qH599bKsN6Qb4EnfsxdH7TTWfTWc9vWy91V+CK76IHdZ/PAD3/BKHbAvr7WF0Kn2tk7HhcarDguq5Taz1DkBzOMeJnGNXGJGec8qPp8ZwQ3biENYg= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:34 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:34 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 04/12] xfs: Refactor xfs_reflink_end_cow_extent() Date: Thu, 27 Feb 2025 18:08:05 +0000 Message-Id: <20250227180813.1553404-5-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BL1PR13CA0367.namprd13.prod.outlook.com (2603:10b6:208:2c0::12) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: b772e176-9c81-4762-e837-08dd5759c023 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: GsxGfWkB+lgpi6h/CXv7ZhxIsnGe7IJZgqUYBTtlKgDQvCEUimcQ52A5qc41t5Zbdbsq2LSyxqEBj3crgfMOmG2VHXgMNk+KeiUa5FLUL6AxrNso1oo/aUVEVx5IXAOzoGVQUhBu6CUP5VBUmbvsqm1nNqnsvaDadlpmFpLTq44qcDjeh/59tMSoVmZEqxF9Qe8JDEdqow+5m8Ygmx4T8oH8HM9iw8yZs6bl+aFXvwziU3rlInfXXcYa9uJ0r/w1ONukD0eX2U7DCgbSGzpsKM8flieQqJ4J9y3eQdzKpiGvhF34siKDnPiQ0X+h8LXCpZ95YPrFkkiunDviIKVHYwOqFB+M9v46GloGHgjvyusv+7Aqg/3DUGqTFv7M4vMaNyI3epI4asrpg3VJMhJgJYFYEF5iI2nKmKAetKe9j0W9+R5cKOguWejnVN+4vIDYUbZIzHaNdwTIPuAHo2EU/Gvx7NLjj04hKCQdfQTqsoJ/zVbXqEAKbK81sWrslnM1pvmURBQjSSehsN8tZhF/bAuMoWD4EK74keNMMneThV2n4AxvHl+QH50u2ffAwDVfK7xX3OTl6fn/2GMa0FD0jyMfBipZCr739uKIGcoW0QwlGHLbCxmO9XTSWtAwywzUme0hqJo7DE3nZWcV8DQwz/4C4ChPGhHvLpOfPAc3/RLOHfyyETOb2Nwe2L/B8OAhXnNHiQTunCrvC0+qqootIsxxypyAqISUdjKja/C7EpXbSpTDIrIFU/vhiLK/JhHEY4D6vmX3jTw7n1XQiTJepKx8KlgBEmTowau+1Dert6jmP3YLS4hBVDOaNPwf1xPU7luwRY7RrRTtOjAsSLQ1sT/dOs2gbAMUJIQIzxkAvcHUwdxfW1W6uRikk0ttABZzHsyCsJcFE8gTC7nYhVCXq85Rt6h/x4l7l3THYu2KBHNfm51KRsFo9H/wDjqJEpHKJOA0Gl1Zuv+vuEZ5587CxuBzwEJFMEIml3TSpnxO2R5KaI9JOq7I209fC36PP76AwvZ4OF5rOvK3P99cmhE4JBBGSXOtfLpNkUQEzrlH929V1jcz5PLaTyNXeSNe5jf3RzuMxAv9AJ7FEkm7mSoBnYey9uz/ikgXeisIjHzPv6+mV1Xh4vfVDGHuwmJITl1fsTyakBHu1BI+CD2qP5J+kyU9q0tUrkHb/mz3JLNzn08r00eSQXt32VuN5Ok2TxakGoEB0FrqFCTOo5Fsu64Uz2ORGH1QyZsLNsSV3XWJLrqDnbnUZ18r84fJxxFLzGXC6I3BQobLcaCKU7BkU/GAZcSnUnJFb20LsyFZvDG+1JrGNcELQ+jN52KvqAdphGfFTZLPL56dGtHbpBhQawyhTtOJCOkFgtOwIIMB+JStQpK26A53W2c7vPBqzotKf2et X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CIav+dCJmb0Ya+Er7DHIvTNCRGbaR8ot7BIL3bmf6ySEr6KcjSkkWiQ4FH8JHFh8m7W4wWY49DhrgkM0lPUl+o7YiM+tdq0RX4RF/hLSI9XSAF0d4VfXcP3S/rT7MwnsqbkIuVV1gqvvX5qpxrnBHS8nv2m6ZFeX2cu2Q0QqmtQzycCqUenQujaiV31gmTK+EAeNNwhGDoXzI9pYqLqQ4ZeAOLr13FShkk4vuvzqiZAjYWi2GNxEd28tX7PGh9Ppiyf3c1i0h7EpYnfaI7tTg9RjTNrfHArT5JY2B7uMKHbRPkpUW01XWnhqB0Bv+XkcKNJ8OUL0lROMwh5EZDz0fw0lgsWZD/d7vpTPva2erB0T02I3pcUHqEw7Ss2wv+T1/9lbAmNy2KoWJMCMZHGnuhvZ9cE7fYmuwTdxLzOAI1aO4XrWqwzKaoUJCu9RLWGePu9/P6V503DUMXBNvqcGikS8Dsbs6Yhepm0sGyT39LhZRcEwbHnDGEVBXHZiQY2jePs0oMj7y4cwZMSASnxOMiaFyo9H6Nho2ajEaDq9nWOi9ocS5vOZM5lLQme23hzk+bQAN4aS+HttBb3PQvQFpbGNvNAcmaeLrNvqp7wSkn/f6M+h2ml6SY+hY2nwEuGLbDINi1JWM5Q+VAT92bd+XyU72qGF5NqclFz96eFYu4asj3g6L5L3mhLtmbiFtJ7BzcQ/KjWM9rwEwLUYSbyuqrn9WQ2EdsxpT60a/pfjPMQSdnkxQqtyBfeIjEwjB2zz+LxDxXq2QMdz7OUxVzhi5/Y88iM5xmj6RRpZIXvYIn+07h5HL/7fITMZW6gAjQmhvv8aynJSvrjvvzyxeV02BSqYor6PC5NX07CBgUQJaWeo4sP/gMTvRa8crgmjrSKAJznlNDPq+6B1Uoy5hF72M8f0ZWmaKzQRBibkyAfWWE5PO3YLIeHVaenfqVpng5HP9XrXqGdHLQRZ1kMyG84N9CwsCzk5aahrcvYWSAwwkj0IeI2oDp2K1qt987Tvcfw8ZQ+RGCQlJjUE+ljFLb1/07mcACaeJ5Fyi2kzFCzCXXPQtZNIAaOPF0hDYV0TWzHI59wrpAw9jST8tl7N/8uoi1/jQGJNsp1w4BAYP6y9i4EoQcOOUs1+mqrTi+ov0aphY2Ne901kuo0agFXwP8UdMxRHn/TUWDsh9WLAbw2HBI5BTC8cb3AdUF0v13rUEE52F7DO0/j0K0oxJ//wZDwSYFrgwEazHDxTcgbr3cz3swfSqWoZd+vk/texMuL/kZM8ejH/m6sOR43j3c7GR0H2Dq/eyohzumTmfHhIhuAdGRYxuT3Wzfo2nyAi7pvVYvPweG+CRTU0LeQdXseD16xP9rNgVuxF7B/5RpeK1fvDipC29j4JsRiVrNyyIOJk87hh9CWZ0Ww6ssHObC5/ZzLS1vWDlD7U4RZ7AwtjZ+E5tt0CaJ1Is2zSkrJDvPDAB6jVvcf7bHTLcBd2MHkEtiUd7gJoJ9UDatxjUODEEqveLb3G7KCn0O2EiZjbOaG9tDer7WpAvlIXtl/FQZLhprbvKm8y7rLUTtsibOxjqhx6BX2YHW1RYX8WFbr21TJ2uUsVW/3eK4RHPyAqjQS9PvRrkA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CL6Ni4rmNcpC1rb1HaI1t1eOxjfVzJa+GiGe6+3UQFTJWYed6FTZoixGx0kMkzVgLrRWRxv9es77jwc7n69wbVkd7LxDwEwtVIIQMfM6oW6DHa9bAx+6bfSDwFyl3u5+rkT833cAp8KxWalqi5nbT0f/bENqWZQ/0BmSk9ZbcXQsoFYXEaBES2k4ZwmRgZFdHcDKmiRJQKgiQaK0JhlPz9ZOyufmBw8dY5ceCKabZib2T9UK7RlzWawL/EQNWxUwr6eJ+KHigs5aQWRLlQiPjNxW8pqnGISm+IROaz5YzxZpDFX1HkesXoAYYobfjP+BvNNPhyLDUxm+qU4nMMxSK6o0x1N0y57M5MXxBx+L6W6PQkV4t+6sUz+1vsnb7AemiQ/SyECExtu1LJUk6wbBI9CdaX1oQl/26RIk+Misd+j0RgNUMhgNS4aGjST7LbMd0CsqN2UB6ntrzFzRwPGogzZnbBY8Z31dNH/6M4ppyATh6uj055AjxPBwm9uZtMttLO5lfKQDb578Lj/FP+lUOkEZm2/sblEvBd64dQGlXocGm6env4YJ1SbTtKt8v9P0vcbJu0zeXI61PC1k/BCx5UNpE9+70+Q4+PTJpPaPVPU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b772e176-9c81-4762-e837-08dd5759c023 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:34.4931 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZcDsZZLEs7qDI4wtouJnJ2rK04K7HK7MUd7wJSaSf6B4lENwMK0XJxt0Ky3nZJOA9962q3PWM/ubH/OVxLpE9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: 1yfz2xJjFuIgEjg-KBNE1UrwAXsjNA3v X-Proofpoint-GUID: 1yfz2xJjFuIgEjg-KBNE1UrwAXsjNA3v Refactor xfs_reflink_end_cow_extent() into separate parts which process the CoW range and commit the transaction. This refactoring will be used in future for when it is required to commit a range of extents as a single transaction, similar to how it was done pre-commit d6f215f359637. Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- fs/xfs/xfs_reflink.c | 73 ++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 0eb2670fc6fb..3b1b7a56af34 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -788,35 +788,19 @@ xfs_reflink_update_quota( * requirements as low as possible. */ STATIC int -xfs_reflink_end_cow_extent( +xfs_reflink_end_cow_extent_locked( + struct xfs_trans *tp, struct xfs_inode *ip, xfs_fileoff_t *offset_fsb, xfs_fileoff_t end_fsb) { struct xfs_iext_cursor icur; struct xfs_bmbt_irec got, del, data; - struct xfs_mount *mp = ip->i_mount; - struct xfs_trans *tp; struct xfs_ifork *ifp = xfs_ifork_ptr(ip, XFS_COW_FORK); - unsigned int resblks; int nmaps; bool isrt = XFS_IS_REALTIME_INODE(ip); int error; - resblks = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK); - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, - XFS_TRANS_RESERVE, &tp); - if (error) - return error; - - /* - * Lock the inode. We have to ijoin without automatic unlock because - * the lead transaction is the refcountbt record deletion; the data - * fork update follows as a deferred log item. - */ - xfs_ilock(ip, XFS_ILOCK_EXCL); - xfs_trans_ijoin(tp, ip, 0); - /* * In case of racing, overlapping AIO writes no COW extents might be * left by the time I/O completes for the loser of the race. In that @@ -825,7 +809,7 @@ xfs_reflink_end_cow_extent( if (!xfs_iext_lookup_extent(ip, ifp, *offset_fsb, &icur, &got) || got.br_startoff >= end_fsb) { *offset_fsb = end_fsb; - goto out_cancel; + return 0; } /* @@ -839,7 +823,7 @@ xfs_reflink_end_cow_extent( if (!xfs_iext_next_extent(ifp, &icur, &got) || got.br_startoff >= end_fsb) { *offset_fsb = end_fsb; - goto out_cancel; + return 0; } } del = got; @@ -848,14 +832,14 @@ xfs_reflink_end_cow_extent( error = xfs_iext_count_extend(tp, ip, XFS_DATA_FORK, XFS_IEXT_REFLINK_END_COW_CNT); if (error) - goto out_cancel; + return error; /* Grab the corresponding mapping in the data fork. */ nmaps = 1; error = xfs_bmapi_read(ip, del.br_startoff, del.br_blockcount, &data, &nmaps, 0); if (error) - goto out_cancel; + return error; /* We can only remap the smaller of the two extent sizes. */ data.br_blockcount = min(data.br_blockcount, del.br_blockcount); @@ -884,7 +868,7 @@ xfs_reflink_end_cow_extent( error = xfs_bunmapi(NULL, ip, data.br_startoff, data.br_blockcount, 0, 1, &done); if (error) - goto out_cancel; + return error; ASSERT(done); } @@ -901,17 +885,46 @@ xfs_reflink_end_cow_extent( /* Remove the mapping from the CoW fork. */ xfs_bmap_del_extent_cow(ip, &icur, &got, &del); - error = xfs_trans_commit(tp); - xfs_iunlock(ip, XFS_ILOCK_EXCL); - if (error) - return error; - /* Update the caller about how much progress we made. */ *offset_fsb = del.br_startoff + del.br_blockcount; return 0; +} -out_cancel: - xfs_trans_cancel(tp); + +/* + * Remap part of the CoW fork into the data fork. + * + * We aim to remap the range starting at @offset_fsb and ending at @end_fsb + * into the data fork; this function will remap what it can (at the end of the + * range) and update @end_fsb appropriately. Each remap gets its own + * transaction because we can end up merging and splitting bmbt blocks for + * every remap operation and we'd like to keep the block reservation + * requirements as low as possible. + */ +STATIC int +xfs_reflink_end_cow_extent( + struct xfs_inode *ip, + xfs_fileoff_t *offset_fsb, + xfs_fileoff_t end_fsb) +{ + struct xfs_mount *mp = ip->i_mount; + struct xfs_trans *tp; + unsigned int resblks; + int error; + + resblks = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK); + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, + XFS_TRANS_RESERVE, &tp); + if (error) + return error; + xfs_ilock(ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, ip, 0); + + error = xfs_reflink_end_cow_extent_locked(tp, ip, offset_fsb, end_fsb); + if (error) + xfs_trans_cancel(tp); + else + error = xfs_trans_commit(tp); xfs_iunlock(ip, XFS_ILOCK_EXCL); return error; } From patchwork Thu Feb 27 18:08:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994985 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 3A9EE26B2D4; Thu, 27 Feb 2025 18:08:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679731; cv=fail; b=rjXgMSJR6wfP1ATc5GfysZngdAlqpsXEeIXCrXq14Pr/fh7A63rHId+u6ONBNYvPZu2QqSbpJivvf/Aj58MK3YbhkZmkg3d8Oy5ShsgLZ57D7v5lDvVR/jsbwou8oTB6nBUrChg1rhBdP3TLPoWdahbjghcIqvZ/tr+4lOw0MFQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679731; c=relaxed/simple; bh=7UZoNTdzs3+FVnTRVfgGUEpO6hG6usJMxL3E38RHP5s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RnBNzhrtYE5N6RdRcZ5ASVZx6K9Kqx6R4wx+c6pn9nj9WvH5yxJlUQO0RsHDy5BNmUHBF03snSJEqGZ6urzyVJL2ego5hZcBDL/N+ZbS9P7Vcdz0EBjKjFDv3RGOlicAl/3Nyb++q4urH1z7nfXgO7ZFjE3jnPgUTFoNZvMVszc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=Z465q06/; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=ZskerN1i; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Z465q06/"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="ZskerN1i" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfkvf005600; Thu, 27 Feb 2025 18:08:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=INlzsWks1g/n3Ln3SwNuRsPPhjDGU2NcTMWtvnYyXiQ=; b= Z465q06/2jOayHKtwjfCUfY7BGEVo9z97PhCzLHrm1jLlt0chekON9Nu+jVbzC22 tfOGnkw/Fl+a4F8mk2C/T4IVVL6OSG9CHnqEy3R6gHAyr3tFWvxT00PMM6/bbM47 TnMY0cCBc0JzXN3dBvmM6Ys7MkGQG1xZykD1m1d49p/O0t3VKjKnVW3hnApeZOqX 4nVUg6liW0XgWE9VjIh9MF5UYp5HsaOR7nAxYe1veZ5PMdrzlscztD12oONPVjWt sNr7ook7PmV1Ygkn0mkbjJXQwv02OJTorvESCMSyAqABDgp3FvfZo1/UNCMSoD3q NRZ0TdLa9g2AnoQyFaO5Iw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psf3xr3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:41 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RI7xVx007414; Thu, 27 Feb 2025 18:08:40 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2043.outbound.protection.outlook.com [104.47.55.43]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44y51jhqrb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hAG7paVgu17ZqzXPjYIL0vU3RKR1TZosD1+pmFerM4cejL0uTWhElHOu0FHfug2wqsi3yzthIv/TzfzavSGbzVdK209XXwwbMhwSJq80Znkjr50kg8vUcon0WyhsC8JQkHkigQUyh7oKCRRM8vgPBh+Wk5IpFWLQ1SRiKrVmqkM3vYT76jcwXML4N3yUbbNFXAUdgNz2POzrv/OuoF/xsrMTtZI35Sz8qPbQIB3rPY3mUgDqMlwaCJ81hPxfrB96MdydFlIVS/2zBHnaobzpveu3LwBsXK7fzFBKr2FMBC3JWrEY9T8bQ2gnD7cjfxpDIQs7Thvf5WyaVM5wAEXNow== 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=INlzsWks1g/n3Ln3SwNuRsPPhjDGU2NcTMWtvnYyXiQ=; b=VTwOU875pWh2lZUJ48QvZ2a7AdvRssvQJEeGphT3lTcBgDiNQK2+nHbwG/vlTBGLgy8C4y4UaTmOHg9WJZaLcxzBebniMsZmF2w71vRnjYNRQJNAqcbD7DHOYKVbBrrpU/ISl68UcBvaC3PgDaBvV7oUCMbcPIPgGqwC5TF4SND4wRsK051ek00KOnmTM7mzCZ492qir33kDFbnrrHbx8bxOrUS1AY/v4vR3Thi7oNs5hCvnkayWv99b9Dagxsx2Y1rREv0sn8cCCl1ekS7wYhWeqRA5ZbHJl8H4KcvVsfhZo05UtnS10Nji0raiboJz8wSsgXgOu60yktVUkhHItw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=INlzsWks1g/n3Ln3SwNuRsPPhjDGU2NcTMWtvnYyXiQ=; b=ZskerN1icrqScx0queiD7pwAslkaXPrloPHAuxBSQ3t7Mtt6sgaJUiA/EMvDL+dftU2HcEwAeAc5p9ktM2n05QK58j3yPzuSuHKyr3PHIzZIIQNGp/GSh3SOifcQQ4qUUcSssaHiFjnmiE/UCt2GIukpWVmzlAZ9QwA6sjHL6cI= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH0PR10MB4598.namprd10.prod.outlook.com (2603:10b6:510:34::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.21; Thu, 27 Feb 2025 18:08:36 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:36 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 05/12] iomap: Support SW-based atomic writes Date: Thu, 27 Feb 2025 18:08:06 +0000 Message-Id: <20250227180813.1553404-6-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BN0PR04CA0111.namprd04.prod.outlook.com (2603:10b6:408:ec::26) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH0PR10MB4598:EE_ X-MS-Office365-Filtering-Correlation-Id: d09def85-b975-411a-ab6c-08dd5759c0f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: ldLc1nfxKgOoEpwRqXL0eXT7P5GzYfQG26rCK5JCl5BRN5BmyWYwdu/DsTc+Wu9LEEfLMJAudo10neV2x8ulkyadwKKGu1skejhWNY/VlojoO66WqqrsV9eh10PaWP7f535q0KBjvs5tePPe7ek6l0GkWXWYCpe4ytWRWRi2pxl0cEZKtLmd+6mvCJgKSY555Sx6Pe++tGyum1a4IyRNjATJye9q4UFPeNYr01Wvo7W7xTsj86JLulMzkxr2852KJuWCn2LOh7rWlDtcUj7VVVQ0xKtlAhlqjBABwqaOhnT42olAPgvxjQlUisP/KfzNYuoltfcHIZk9yG5kVvP6UbBXdHCoQ+ui5zM0eVuna16m6Rz1nfJ+E8rcq8d5oiWKI9NzK6I//uzJziovt3+HtSWzIhXwcx0sWvWge9NMPiCqyQjpV+ToHVZCOHg/wmYKyROtSbfg6uwfE+gz5NiThrvmA3FF4fGfvWpkRWD4f+H+QUFQFWXmdynW7Wy4pa68GvR2bPwHD1nBmhBJN+tsW/7df36CxEsQOohpIWa+v6ST9GEox2a4y9MF4v5jwEu8z8r68F0fj7azhEBZV0jpMUjKW4sMISknhOXTjWCGGO5CdtdBeSGGX4KUQWZ7oS3ZCH/eaGty4YuJqlXagjBt/CRtXUiEWMVmEuVChIOgHddZ76tudSEHSj1JSiXna4b+9hmh73egkdmlKpXnWYyweg2a1Q0WhSolP3U0W7OsXoSQUK5beOf43789HdBWuauZ2P/NkwhfzVS9grLlyVtArA73Oa2Vs6tlrfExHsMd3ZjWOiq4Kf7joSIEoHNGv9gCZ6Dfvx+7Av8zKfeDKByB6qP4u1PaaoYKcoNsqX7JCH8FRl/ahGxLzmKXvBd1eQfy8zvXMF0bJlhrS0T83b24SYxq9y7/eTgHkjXDqnFZX0oFvSgNHhuhlM2IjXcEctFcrfe2gN2GcqP4s4KC1ci21wH3t1GeplDdAMZWyN/EXGwrU7zK+/helIBEPW8UAhuKZGcbqXjwTlsavbWVth+4Nk2RCENr47jHZMRmiLpFsnlNtTnJp4EcvqQ0Tw+MK31jENOXFJxVZ4Zk1myajJhfKdGmnyFUBASumRQJb077PwBrPyoQbS87Xp8csrJ6C7ApxxCkFhZ4t5GFwKDzWZlztfhmh+kKJySeLSNM/MtF7yMqnaW/MA9FbDEhNAWfAbk2VwoaY5BmuLT5wUHKwCWZmRq8HICbl9+LgFD0+g2xVW9jLaAJPICj3coCYL+O75hwuXXLawenoV9kbs+JmR79xw9Aq4jDb713zXMLhb955GhzpL+oK3KysAsJ9xFTgixV8XC6Z+lmSTfBaAewfDV93h2n0mvmY4iMd8pAWOFI8eYaVJY33dhna8dku4fQFGmv X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: meVYUabdqyKKIg1+xmp+S+ZR+AjHMRmRiUTjgm2jVFp24hPByEzDLqOhimSluD+ninl+umJDxzEJ49Q92HXHeq+uPSsSHOFvx2JcUnGUEvXpBvn9tsBuSSGYTrI1a1xX42lf9vFS6u+6WOPaju20HnIphiKdurjOdPA4fmSv8G+8mzpwteD5YbufxaVLcAKpwFuTUXilscWAWZiU/N+n3BwE6NWZFqA2e6VydSsBxViJf9cZdCIf8LGhCzXI37m9WZzxcHMUfqEyl6URakdlxPidjA0PcTB8auSVPFn15/ZxvyPjW9MiNBHwqg+WejCVvAKWHHCAiH5KGX3j2yo5guTelYseYP5M24B6bqXIFWisUStjBjOwv1eJZKl8OzJs6A4JWrIBhZfKj6dPU6NOBEVRl0yHPUcCuNMSp871EUEsqKcDXK0HcHfZlV8HhxTSe5BxWO2Ih8B0bAoa6KSwJTpMhS915YRNDxxq4XhlwuPwQ8xGUTSnM28DSZ7VMSNt24935koKK+F+aqC9ivM8Tl4tATN6gk7lR5R6b+G6ZR4HjbcmyOeT5VNARwmC41Cc4aaEWBisevnMQEMLUpF36ZLTE+O/rb/5XkDTdTQjzJgAbBCXIYqxQYrqmZo+Nt0iEBim5mn/eSvWcRbsUr98OaHIlgO7O6kgxrjigjiX+xNrwyf4FxrxyUnehTeI7kAj7UYvDPnPxsimProNZsnovtz7rMoPLGezMXpoKGvB86ETxzrQ8keVmRBKSjrdM8OWviu67WkTF9UHzSXhZDRlRAPpWnc473MHevIlYt13QvbqYHag3Hn0fRIxFQGoVipznd2qsFd5kLdjh796P9jSPbHSs1GbUu5LOG4AiGWruNf8DzZZFv2PkwH/gRIHqJqz1S9PlbKWNrOSUzpUl7YVuDWn2XcBJod6jdDhLEbbQl/oVeNVRlW7oFFNv9KWyXKNP32UX+/LK8OYqaMl/hkgQUGgEvmyrQ/Ii9PwVe6NdwwRQM38pJuTv5pNpBKDDLZwnpamjCR4d3Nc/9sHHLAUnYhTRok5SDuz+BoE3d8dV3Jc5eV4A+pFHmZiQnmdhQ3PWannzJt46LdZm3fDhyOq97TBNXF7XBTiQlnkZIVGQoKMCeuhLNenigLgrTzzmSK/hELYSh07XHwgguw7mjXy0F3x97fa1oqQ5P3AWEbmKDH8HhPTxzyoLy/gsJtgKHG9W/LVEbvlomu9j0nxV7dk1b1SiBHf90H6+G88bb0W6ikgm+uQ838BmAnZwKwrBNOZVzj0V9L6cAboFlHjy7w9uUcfJ3UHZZ+4spK+p+jL+5xiTAdGen4ePSAlwaNp4wq6ADVk07uC2Kh0SiGgTWXr7fcFDPqhCQUzJwC1CawMMavQmPvhmLyJGNNmOQoC4UCPsRDSH5qDrjhqlxOtdgRIPTLMNk4InBaU6xA7jv1vqQUEtd2K5rN6pNZ+LIA5gxtpwtKAncLUObGYWv3hRxDVfAxM874yX0H4QsARCxI5tTFCmBeYiQcfN5pQZBTPXePhhECEl2E1oRX1WG3xRTu0x59+mTNZ8RhPni+9K5ZVP0Sc/WugTagQ/ToYwrbWsDNgivUA3Rm9hlm/dBSx8PUv1Q== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: rFRemCBgzG/3iy0yYz/S7TsW82d0fJmHHjeSj06eNXyKgE/xlveXhAWd6EfQfp2TkhifXRkQ27KOFzS7El0/5iWZx2ua8W6+38JLnxZvMdAWMnSXfLbIgN5nZD0yKreJBi/3tflGnPW/sOk48C+muq+V3zltXaR7ARuGYoBu9l+SY6pNdloLLc1lBgKZym39CqR3jfcw2U9PVS/iAab5zyFcqKO/99BHePOt4gNW2p/EdONnKonVYzDcsGt8edtb225iskIvIPNhyjC/9jKtMhpDqHRCavrLLG8Ug0Zmy6news9hoVo/iE2YB9+ZUSRG9vERZxWm9a56IE2eNz/lPo+X1BIdKHA5cJdnsMtgQ61CZwgGLQXpupa9XGNsg2289gbXiA0RijlPnWd/DEcEU2f1hpk3vSErsI8ANsRuUzdIMzxRR+4m7zxR0lJPgmYH97grn1CyTMc6D1dqwuKEIdQmzz0Y00x28DRCuvqXc4k50ayVzn59DjIMNDTiD+fts/oPkrz891wNEjKTmDaMZ2sxU3wQccRw0ZHUUFQQ6WeRhr9+vracaNC6lMv7l7+xP8AR4goWJyIwQkYYzeQPBPwE9UaoZb9KUJ8j+mQ3Dt4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d09def85-b975-411a-ab6c-08dd5759c0f9 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:36.1696 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: E7LlCz9ZuZXvXc+EhAHTj56pX1kVvGaKxNXY68D/19R/xGIWWkuMscx85wqxri9M5CuvRK51Svx5juOptkdwrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4598 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: Ay7IqmLSpl75WdMiQ3ErhE0NJhvbb0qI X-Proofpoint-GUID: Ay7IqmLSpl75WdMiQ3ErhE0NJhvbb0qI Currently atomic write support requires dedicated HW support. This imposes a restriction on the filesystem that disk blocks need to be aligned and contiguously mapped to FS blocks to issue atomic writes. XFS has no method to guarantee FS block alignment for regular, non-RT files. As such, atomic writes are currently limited to 1x FS block there. To deal with the scenario that we are issuing an atomic write over misaligned or discontiguous data blocks - and raise the atomic write size limit - support a SW-based software emulated atomic write mode. For XFS, this SW-based atomic writes would use CoW support to issue emulated untorn writes. It is the responsibility of the FS to detect discontiguous atomic writes and switch to IOMAP_DIO_ATOMIC_SW mode and retry the write. Indeed, SW-based atomic writes could be used always when the mounted bdev does not support HW offload, but this strategy is not initially expected to be used. Signed-off-by: John Garry Reviewed-by: "Darrick J. Wong" --- Documentation/filesystems/iomap/operations.rst | 16 ++++++++++++++-- fs/iomap/direct-io.c | 4 +++- include/linux/iomap.h | 6 ++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Documentation/filesystems/iomap/operations.rst b/Documentation/filesystems/iomap/operations.rst index 82bfe0e8c08e..b9757fe46641 100644 --- a/Documentation/filesystems/iomap/operations.rst +++ b/Documentation/filesystems/iomap/operations.rst @@ -525,8 +525,20 @@ IOMAP_WRITE`` with any combination of the following enhancements: conversion or copy on write), all updates for the entire file range must be committed atomically as well. Only one space mapping is allowed per untorn write. - Untorn writes must be aligned to, and must not be longer than, a - single file block. + Untorn writes may be longer than a single file block. In all cases, + the mapping start disk block must have at least the same alignment as + the write offset. + + * ``IOMAP_ATOMIC_SW``: This write is being issued with torn-write + protection via a software mechanism provided by the filesystem. + All the disk block alignment and single bio restrictions which apply + to IOMAP_ATOMIC_HW do not apply here. + SW-based untorn writes would typically be used as a fallback when + HW-based untorn writes may not be issued, e.g. the range of the write + covers multiple extents, meaning that it is not possible to issue + a single bio. + All filesystem metadata updates for the entire file range must be + committed atomically as well. Callers commonly hold ``i_rwsem`` in shared or exclusive mode before calling this function. diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index f87c4277e738..575bb69db00e 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -644,7 +644,9 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, iomi.flags |= IOMAP_OVERWRITE_ONLY; } - if (iocb->ki_flags & IOCB_ATOMIC) + if (dio_flags & IOMAP_DIO_ATOMIC_SW) + iomi.flags |= IOMAP_ATOMIC_SW; + else if (iocb->ki_flags & IOCB_ATOMIC) iomi.flags |= IOMAP_ATOMIC_HW; /* for data sync or sync, we need sync completion processing */ diff --git a/include/linux/iomap.h b/include/linux/iomap.h index e7aa05503763..4fa716241c46 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -183,6 +183,7 @@ struct iomap_folio_ops { #define IOMAP_DAX 0 #endif /* CONFIG_FS_DAX */ #define IOMAP_ATOMIC_HW (1 << 9) /* HW-based torn-write protection */ +#define IOMAP_ATOMIC_SW (1 << 10)/* SW-based torn-write protection */ struct iomap_ops { /* @@ -434,6 +435,11 @@ struct iomap_dio_ops { */ #define IOMAP_DIO_PARTIAL (1 << 2) +/* + * Use software-based torn-write protection. + */ +#define IOMAP_DIO_ATOMIC_SW (1 << 3) + ssize_t iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, const struct iomap_ops *ops, const struct iomap_dio_ops *dops, unsigned int dio_flags, void *private, size_t done_before); From patchwork Thu Feb 27 18:08:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994987 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 70E4B26BDBA; Thu, 27 Feb 2025 18:08:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679734; cv=fail; b=ooBybVVwmC2HFKcqv22wCTV0t4En+Diko5BMsAn/COSbSd35S1DsF86L067zXCp17GLUFgXUXo+zCtke8U5olLgztfEXaDSgHUPB85NzLs5Ox6AdaScnt80t1UKq/gQh4k1ZYLfsAcAwEOLCA5Im2MzlCzPtqr/P353ma+Nc/bw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679734; c=relaxed/simple; bh=IuMzCqyBJrm7FFhkNxr4QlcsicZX1Q8oyjS9x1MwZWg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=n6HgjU7u6q1NcpIstIB/PTQEe+XGbTV0rBxd42uPhYGsVDq+z1+HdlMiWngtjcSZesBijjDimR7yOELYQslGrtqzXwZDo7KytZtNRoMi3uZHTTXKTEex2sa74SMcdvVPKWQNQBAZs2WMnBlWmPKo3T3uDIuywEvJzKI74yvCt38= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=ZSiIf6vm; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=eHL+HbWl; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="ZSiIf6vm"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="eHL+HbWl" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfhw4022896; Thu, 27 Feb 2025 18:08:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=ertBSWJn4JQRyQQTuCIhXXQ1MGBn7QCqwt6lYQGslLQ=; b= ZSiIf6vmsaRyNTZpntBNuixODYnyxR66r0AXCO9JNA88Uj/JKnC/qS3YxeTupP0v WTAD/3eoYblrn5FNtFnOEYE4vpqayY+ed3vEZ34FoNiwndUG4/DgxoUJMMpJ/DmL /9ip8T7E24f8avLhIBim/ZuLta3bP9QcdJdIum+4kplUgUYYOP387Sa3sM0CL3ZQ 31MUCK+xFs81uE3fK3lvSHsllX9jsVmX4td+jbLqOiDHGbiXsdRU+oouYurJWWBR krv+cmVgGWoxlnVMKZ2Qq77530/sJPXOYWpm8J/9KMZ0hPhRN94MLTwnXvvZpVRv raYXoiZeng6jPl5YW/0Zrw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psfuyqm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:40 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGoJJh002784; Thu, 27 Feb 2025 18:08:40 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2177.outbound.protection.outlook.com [104.47.57.177]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51cq1wv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Wud2gHot+DWj1J0RrHwaCqLOJd5BrD9ILDyKx3fTHrjHVP0rCBdYFGmw9cl+Yyx1RVVcC7C/wGV//bVZ9GqD8XEPf3+q83NMp1eTQjj8Cyg0jYd59vtzUhEx27nnxdqpSwpkKNu3zcrMhYb+ED3pLKu4rUD0sxSh9nporMJcTRqEDs5ADbvWRlwKQ+dXKClF26gkBWku3NBAgPJPZ5T/LzYSjOWgU/Z6AxjBnPyQVfB2TACBDoZAaJafppei1y/mcEte9ZfehuWGjOCEQGnlwPpJqSirqhjJc6yZoo+2BBSmJkVMzHfqraZeFB2VtySGdX5XGTeRiv0F+R5CP5Ti7g== 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=ertBSWJn4JQRyQQTuCIhXXQ1MGBn7QCqwt6lYQGslLQ=; b=Fv2OhHj8IzNbD3jb9lMB8wBkCjKpHsfFA8+3DpQx3XE82pZ+kW4Ltt+uy0P7EZ2A9Sle6JG2Z1f1DDB0HUgXlpi/EnCuEvPUcJho+WH6+scJhgC5Kr4wx2gRQNGROCbXJFPVKpJjLaJMO0AKHi/7HxuSpECo8N3eB7flud3WBYN1/BwbqxzgnY40sOg+tbH6chDuTzwzw3MfKAF7nA1Hzaa4YBsReroYPkQ85rIKms67Be85d9V0TjaaZqoFuPn14fpzV+YIifHo63BFOQjYP9sM2tnIXiSz6hrdXdn8H2tflUbQFEykybrkaGnm9scBMp4TgS1WWRBmvpguYm5Jkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ertBSWJn4JQRyQQTuCIhXXQ1MGBn7QCqwt6lYQGslLQ=; b=eHL+HbWlFGh7b2BFg1pBgorjSRQ717wfKqnEr8Gl3OUbOl8FkwRYo5vaDuggB8/smsYlZxyXyIhbxN+nJfg/6gBRtXy20q8rIkinX6HdYu5e7hEADL8X8KAf0G22f/nzl/PGEFPGqN5TQ0X9qCEEN2AtRmH0U28ji/90wuPUcT4= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:37 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:37 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 06/12] iomap: Lift blocksize restriction on atomic writes Date: Thu, 27 Feb 2025 18:08:07 +0000 Message-Id: <20250227180813.1553404-7-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BN0PR04CA0144.namprd04.prod.outlook.com (2603:10b6:408:ed::29) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: adcbba36-d1d0-4ef9-63b1-08dd5759c212 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: a8YB4+ph3F4aoeN8shBrIkciqx9P3Aw8uDOMLBhOyrHUc62195pLqY6wpVRxclslUMRAYaDUClvNqJqBjzivtMaJ0euEediExuxLSK6mZ2D8lY10y3Q0nusCNSHb6is85b52I/ISUvYNDsCwd0SixtOSPGbtat1/BOhkUSaUfppxWXb+6C3+yhf9MJkWn+llxAWYqx+t4edNxWKs4JoUPhQpuY0gs4wDxFYX+1Phs7hxajB2LLxkHClturTZNj0jAvoAcYElUFpPw0n/hRiGdUq0ZHGc0uWFAprquq6ukZLqqNw+Z1JCsVsBgHJ5SkgGCt7K6DH/ZGtmjzHZ5e3C4GO8exJd8QoNXz8yDWDDGjwDlj9D+OzyZjMfPOTTuK23jLMeunypLkJO62d8svG5MPn99jayoepyTPLgxed0C0xM0ye7x29yIfUPJgA8orXU1OG1jDyRAzHBeZd4Vf/oUFPGILmRH4kQ36pH5Sp/KAngMstUZxJXr3dYJq0BKfcaUN9QGDQEs4UhotkRfMs2Zv7gadxFcro5CQyJFL1yTU3KEgd3D6GzbshHI4dcRxZ1v5DbdSW9pNQP7CQCzDLPHNNiU6vPrmlj7Yu71td0b/iRUhvfm3F6Ar1GJ0e22DK887cmAIoYuN3nFnvmnuA0ujr9veJhtiPMd3vvlZNGiK48WEB22HKnl4rsnl0eV4mYCrtzxxkUoarGmJ0DbaYyBOPh7FIR4L/Xv+5bOtbSVbVAm1VPtmkCCbWd+4RYJBFwmKILy/BaxO0JZX3xI044F5CtBorDNJY35AJ1L9RKaKl5pq9AGJmCSolMGxmGhS4FwunZSCuCITNkGwgBOy453j0WGCZhkkXCwKfSgZxgGJ31xvDUxgf1u8hUIZ+qh80GtFwYF6whMAtalxawEsxq9rhdQrtEoOznGzaaLARcsNHemUueFNL0s+/pixSTDeS1Ccoy+ndKOKkpDbjzCDxgPh24kvOl3seOCu4PT9p9vl+aEqPQeM6DACz2B7XNvBh0fGWb1aaZmMO/jDHRelK9i1aK1KlSgZCfougdL4wEDiBH2uFMAeg/5xUgST+vgZkoltpVrfMmslIbkQ3HTqkf/VOJCcVrezy3XhbdurCcErweGDdU6fPxwy7ox6XZMBRqSG2UGAdali0/R35yRMuUs+H4HOwV3A4//tvJRwvw4csT3TB/akPsThHUQf2fRjpm9t9nFKW2XBNuJ4XrLRNSLT4f93u64mLuWIgGhf0p1kbmeGiyU8MKmIqhX+FBW6IvRdUUvuy5hzaWdTY53feZUsXyWTq25pLNo10wuvzc0RNUNvC/NMRCUUe5eOGqucsNrMfUsd1I2541xtjhFlUq7pJcCyh2GIScaCqG+1Yf0fxzsV+IlfbCWiNPbKIVNMj5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BKWYX6jvf+y7j2AgaZoIjr/aVuZGrgaZzBwyeZAckJkyIYkMijKnXVnTksrIEo8cnJvLXeL6wndi8mMsYs6HCFgxWSWCx/s4zG6FNbJDh+By4iWfGqYKIeqsweLFQjGDvT7o4lmC1FQ5JtVNratG5TaF8LOWRkbIZSK0XK5tx4ayIhoJvR6kjYIEVyxJvs0dE/4ckRwPjWphwxOi20SIfxwsc+ZBhIasvDSVivH5Me4XsTQzQu5yDxyUyhJa4I8ImmjIRXBQIaxIxM/YNXxCRoHu4R0Ww0B21xF0qYbAqcRJhLBibU6W9ZRxM3YtK+7blwWcVO/LVVvhPwqo0kE+gKYmZzs7zB4ohS9v9nMHzx6Ai7pIZ7B3BewS9zjmooqNLvbYfQzlKG8RjJFToBDbeTt0SF3i8WU0Gw9CfXYBOxByZGRqucgkdO2QRyokenI3A4eXlKrmT7J4sF2Js78TXEKJxs3I4Yp8BqUd1OwO5xAUwaHJ8y0PzH4gzmlGRS30+zv7U/5Fm9VuI90OI0FxKFz05rAqnqSS+2Obc8XPXsw46GRXKIiYSG9pk9C3VIUrSp0/medZhd5gndgwzaONfF+9c3pkBxUfW7o7eDfc1gS35xYDFFZBck2VMC1/8i66OeH3TJTGW9ifDKapnGQCj6fUJrObKcArUrtuEPqhyIk62+cn77rvtrSVg4xZrosqCeuaUPdmuTPgC19boZmHqgzrryKJQNmLBV5+N3TtxcksnfqCA7/UIOyKfOsxFVdGOeVWNnVnTbJSlib9Z5Y9brm05BPC+i+XYRSdcl1A5PCRu5JDhZkrTAVaO59Dy+SSomaT50jEiILb7mBr6YEV/zajCf9hzoq4c2Nv1aJ00rpTYfBuHTLWwANskkneUUlWNDQaAXm3usKISq0p6E41jmYFQGmR6SFbcNWFYgTyqAbBnCQUKTJ0U1bc/N39le7c9ZKqzWhgd3wHRcA/XbYgWZzbg0Ry4yxYFq36aRAPPU3e6z/IawiRHhC9+6yFRG3kIHSsaVMyrpmmBcFTx++HGsEiJ1Dni5SGuNpESCeToYmAmW5DHU9qBZOr6i2Lo58MH0xToTM9tu+VFDLpWIfzHnxfsuGFbVjWE+FM5Vzx3YBHy/f10DxjUv5mrMMrUG4oXcWRaKbm60MxA9rtvrus0ddenK0XadQnkQDFXnv2WTGX/zrZGPtorYaRw/9elEUGQpQRUfPbwO2k7jXKnI5rU41rAJLyhKBJMVO3zzleoQMxor/evyZOsGSxPRwqasX35zbDeqwlZWWzgQyqPvRheUzSRlAT4ygLGQ9xjiDilgQkc/HJ1FR54t806uOdu4Y1VdcJFmzkyfA0y5oGcko4LoLTy7qyE5Vbx7wZ8iYPwnoAz68wFVAVPL7aJEIFzxUHNcS5bQBDCqchePJO2YhY0dR4tt5xuprGEZO1ALFYxCTYM1DBCx2DEltALrr/vxun3YePW4aQmvCsBsICYXl4eOHvgi4XquJU8owO9BibG8lDQTO7l72sublGRVYuYMVSd/iVwVrkMWKQcADz56UY7hpyNszjtLyvDXF5Z5LkoG7OJR23REx9GjqdNfUkdCdryx9keD4ZFH3XO96wbmVTYQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: HX0JqGC4gpglX7fhq2m83Z5eLsNwZqYZvRKo2mWgqUx65bhmDkXFM4RdfBysQSU7va5W51C7gbR9UTy2ErptvxoTHNo7kv2pATvVg3nJfKO+o8pMAaQ1NaMyHbj94cWyGyrMn5gqya5Cjn5qVNPmoTVmoauy4JaBetlh0jHZN6W8FWWWMp7x2NkoxeS/4hAa9iOr//dhDxJq6o4K8lIfHufnw+98FiGp7kGiYSgOcRU54V053wDrxKiGfjvAmM+M24KUhPQR+lFaxJWmQZbwPbjZ9zzcpTo9inhOVVRdDjVk1yKAnn2hBdT5fJhY/eriYOs6Fnr7qGpF2f59/y/IuZRYMBXR20ccb9oQE6liDnu4E1eNYgRGXNSRVQKhSlrESLBUA4SQbdAROK9DDqJjDwVce3l8LVTWwJksca0rT5FyHUeer7L2jJJkq1s6pA9BWNlL7wsppdpP0H3CL3MfH4bnEqY3qvgT/UU6EPzoJ8srCC+AyLWoyXbfAqAa28mA7bXzJLRVAKUjUZyjXt9AoXZaBlZknPUgHbXtvkaos63eTH25Pmrht7Hww9EkWuDBbJ2TAH95oW6KdBbjOjTFPPEAhN2zn0rjj8ST+fULAbA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: adcbba36-d1d0-4ef9-63b1-08dd5759c212 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:37.7398 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: h6+9J+tX5oFhmg8oU837iResgFFg6yar/3jTv7PhbV+b+uJJwzxTUmUXdX0nvbjphDfBdac2r21x135II6jegw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 mlxscore=0 adultscore=0 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: 66g5x8U6e2UWBoG9C__zYSGPGKXqKG8L X-Proofpoint-GUID: 66g5x8U6e2UWBoG9C__zYSGPGKXqKG8L From: "Ritesh Harjani (IBM)" Filesystems like ext4 can submit writes in multiples of blocksizes. But we still can't allow the writes to be split. Hence let's check if the iomap_length() is same as iter->len or not. It is the role of the FS to ensure that a single mapping may be created for an atomic write. The FS will also continue to check size and alignment legality. Signed-off-by: "Ritesh Harjani (IBM)" jpg: Tweak commit message Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- fs/iomap/direct-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 575bb69db00e..96520a38b427 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -306,7 +306,7 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, size_t copied = 0; size_t orig_count; - if (atomic_hw && length != fs_block_size) + if (atomic_hw && length != iter->len) return -EINVAL; if ((pos | length) & (bdev_logical_block_size(iomap->bdev) - 1) || From patchwork Thu Feb 27 18:08:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994986 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 6E8C21F417F; Thu, 27 Feb 2025 18:08:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679733; cv=fail; b=DM1/YNCSN1VxzzALGNzE/42ysuGHpBTS/yXJntCtOFaWjqkEAu+20lPlk1f+hH4CeBm5XyAfb05N2bkYHeqTNFYJ9XDtEETFG6ipmMBj2f+9745gS0v6oUF1c5u1OdL7U1ItUT2jOmL/Ngc1eoekHn3jgHedo6B57MCn6ATFwus= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679733; c=relaxed/simple; bh=u9qSvhBTFJNC8NAi2xtS6ZybO1LBv2KXmZqevjQ8JIs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=WUKLXyhnP3uHMsmY+zJMehoEGxaJr3Obqkn5Z2qIje+HNWF5f3wV4iR2yZCWA9FhE/Tl28tRgWO80ONJSOhKD1rejqP55OwR+lY5uEbrMr0x+r416k8/jfPzmSXCzmpkcpv7TOoxauOU2sqH0XhbSwoT00pK912FQ5ED81G5FOA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=HeHAyYYK; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=qCzeBWmZ; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="HeHAyYYK"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="qCzeBWmZ" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfhCx022890; Thu, 27 Feb 2025 18:08:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=OWYwa/5i+Jj8/qJpWDTKU1Azcekr3UtxyL2aK4F39t8=; b= HeHAyYYKMhCoKzb3B8RjAvZYEvDMJ/2ApzLfaGpl/MRLqju8+8COOHCwO8XPb2Yp npYKDAVVQmsuMUZ0a7tup9Vl4MCoPsKu7dskjYfg5QeKV67DwMjjyPrYmuMBfTri 0y/WOEKmpt1raSjA9PI5qBx9dOzo+FM+QqQDYcEuYSOQiFCwYSaZls4rYML1emtd GsYuTLx5H7NWGw/gJlgr3Dj6nc9pfU3qF2qfSLRLCSgKcy5X86yfiLVPUzTkbpJ4 Pup3ptAl+dfE6Lsb9pbsvSCKm+64D6vq7M29+O6IOjTbckgbBKx7mMFa5iNUFUnv 1QhS1TcOHY7j6WuwEybrGw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psfuyqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:43 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RHUwAL007531; Thu, 27 Feb 2025 18:08:42 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2172.outbound.protection.outlook.com [104.47.56.172]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44y51jhqse-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KIwTDrCuiiTVQ/OV5kVmkttOs0ep8rpnf3L8xRKDi/9qHIvc/8SUtQcyX+VsNLi1h0PsZDgpI55qT9wZ79Hal4OhgD1CGEqAyF2UKSb3AKshaVzeksdg2A/tqiK7abU2drI0EplrxHPRzNYxs2s6QIZJAWWd/EUF54qifU0xIlIf+xtjvHy8/odcwyK7jS0snZCxVuQyaFy+S1TSN039aoZHH8nGjhrfGeTwq6qL20m5mIoet+zgUQImoXqKEpy/Az03iwFiVeeh3fOT1OaTb6Na4qZuw7zHqX0e/4zT4y43+JHnOUgrYatsDqHzlaPjIXSBE4HJDaSEpzCGWMRpjg== 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=OWYwa/5i+Jj8/qJpWDTKU1Azcekr3UtxyL2aK4F39t8=; b=ELW5e0IZQWyqnfxQzGBtSY2AlCJU1zrBP8LtM5rSNzEkf76fct9MJuzmIbw89ENa6igKU1kTXAhYKJ63np/TOvkZA7uAvhdfLrrnB/504bi51G6hl2Js/nidRpH3Td+5TCHcNI/RaO6stGq/XxlbPzVv6TST+xH2iltfyzBWk9L56F1/8/g7RGhbHpiFy58MB0Bp4P1b1JLOni9ZplmVmFj4Se4Q3L+xj+kccTNszJ8tF3aB1KBftMD5Tc9FxJ7G0EaC6ogiRPEknAx8GAebq+0u5c7vKUA+WKKSApdWCREyxxJRuImPrXaeCl+qA+RQnJDp/lmSvl0xhiSJqjHwXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OWYwa/5i+Jj8/qJpWDTKU1Azcekr3UtxyL2aK4F39t8=; b=qCzeBWmZ25qV6vjFYY/NV2k5IJdVbp/3cfZ2pg4+iBQU9EOqQ0IDVz2eJef1HVy+O92VO9v2QdUsufdex0aBN/UbMD6jmC9+KqoscfXhnBrTBy6ftsEchbfjrgm4CkHz7YKeIkDgZ7iYWFvtHp2V4pn/N46AXp8mjyTuKHmF3KU= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:39 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:39 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 07/12] xfs: Reflink CoW-based atomic write support Date: Thu, 27 Feb 2025 18:08:08 +0000 Message-Id: <20250227180813.1553404-8-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR03CA0061.namprd03.prod.outlook.com (2603:10b6:a03:331::6) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: 99db2174-f642-4b43-9790-08dd5759c348 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: 0N4sf03jQRphv/znNg6gxH+DTWGwfvqPEmSROndSZD4felNnVbNJCGa8uq3EPk34DFs6BT/2Upls9a+RVOZW2Y5kYl7QeBycoQ+jOXQckFAFAszE43gVKd2tpdbYOXR6zq6BvkXFAvTujbmiHOtizxpaaaR28MMAFUzn5H8Peh5ECZHaPc7gJxFMpxT/TzVdlWpPa7wRoN8yE+sACLXNegurnyliQ+5smwG/qIsMEnNGjMaVoJ/hZjJ2FKTxz778UZ9EFRlKMK2jqFU3AYwMXSozk1g9g5Q/1PQAwfRE92F7PVX3UDPrwIrOjpmuFv3UBEAqf+76v64xr/Rsqt7EUtX7awahH4hBvQHjBLQxoY64e03Xr5bwl9Gi27j1UbCT1B5WtzNkXCyDIKgqqmPi6EfAeyA7kyJgneO8HH/UWcSz0VXboTYdQvn0RG+ROTF8GfjOxgtc3Vosa3oJqGJWCm3h3UZvg8Kl97ESXQRD4lkqBVrRJF5b7orJMpuHgNz/YFocYpLHy0sDqfNX2Ys6bpU+MXLs+mmWXhdOQeG3CFsi/bEWDM5fwPy4EX8MTblgHjH0OJb8og6a1g/FZdpHHeus+ok7TqE43SC9TZ8fH44g7qr9Af1bi+++K2rD6zBr2ryzvkCRvi93t4fCZaKiK3/GUlr7LTqXV2X25HntB4IXx05nwrXxarxeDqr8ajuFUfhOQuJhxKCaz41wKoGgpNPUMkVcfIkcnEcDVbJSe0Q+ZumFvxI1uiB12KnpiGIGIe01v605VHvmU9GZ5hiq689ahOkUqSpKdan06wR3InKha3OwwF++KxwFdO6jPhz5lcMSL/KhEalk7R2MFJpdS2oKuY8wL6EYSLE34h3vPIK0//rXtg6XJSJ6WON8A2TP565s4y/yYfzR+ZyaRz6ivTW2NkqC3o72zDkEbr0W9TcAK5YWYJ/QwYQIKiXeCztJwrpUOSYpXMl4zqqPJdfhwWU3H0BH7lidrhpXmKGv6lGSgWqM33VjfCIx9+nYGtd0p82STFbtM9fNEmeh0ob8gKCyuqr26OYBBBqqALEnnWAZzCmaBU7d7/wzPf8fTwGv/tuCjPDR3Myb66CAFuMe222vIaQfW9M40fspfnbgZLZCnTPYLpguJjsFckK8uE18hQZAVB424RJTK7rL3qQIW4kchWShZo5ewkF7chjca8vMAUTDSjik3iSAsU2WiHCnuI8wWz5e8j3VP2sL8KO3836yfhFp8BpkJBoj4seR2R3Q/02xXdbgMWmzDEgRu38jqQ3FHZJL90scr4H7rYYA6loPQQjo+gfJi+/404lVoxDgoQcQfX6TSWTv93zIVR+XUEyiaOWzJHRtHn2TDXRuvimBE8X76LQczfeR+p8VefIdM/aA6NLWWe1dPx3+owEE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MQ95peXh8hBLxzlplKoh6bqBLG/PUXcvP7t/AvzEIkxbm53EhNqt60fSZJXFNcunkmXZ7EaZKjzAus4l/xzJ0KlbL+hkor78eGVKwOEINmcDrK/LjhxxsxG5ACX9NnHvpVgoaSKoAYd+6ZGRknMpP8L7KCf+LU4xPS0YdBZ+g8hK54ZSxhvqv7p+iF1OXWJQONvBpGMKqhdyN+uRK2tANcSqBYfxTKhfp7CAbEYpfWggKryHUsFXRdkFmh0NhTnhKPh0jwrYCkxz4D/uGGvEUArbhxO8oZZZAg7lN8L7KgT+WoOq6zw0T1zC8S/UCM04Xz4+05U4Idthk+aKlKxWPWL1AumADdnE85ErCK2NJXyWPbaMJu2o5KwK2nwlocaqpvei7KVbTZdGc/KoWI9dwP4eAMshpAx4ToMV45NqsVrwAlbp++3fP99D8i+w+6eYLdTJSK5wgQdnfs7wJsM2YK9KF+J97QoxJoLvB9e10iFxLO+QkELEAylOrXY415qINSFeNFRqSoxovZ8sd8tij3HHj8EMD/R8PfrQaH3NA+kzItdz+X9DQBk1sgf2J/dDDG3txSA+dfConOLF0MGU8Gsc01dpfn8svB9pr1izLg6TL4kgK/5qeqA8ntxG+sabahuddtPBHwO7+XdAFPDd5yCJc+/lnK8iW5D77a+PoRA5NTNCmLuvOMM3T3sr1MhClsrrBGv7njwbRKC80yOC7k7P/12ZDg52kB9W3GxB0jK7bfGVcRA+JTnJ5ujzr2LpfNGbHz4DPHJISg5yUuAhKNY4lX2hPP5vpnDhaWyxMY/qGVO4lsgeOcBPM/g2HkHxQWZwKOPeanVIeFc1+3jlbFtRlT/fZuAIc+Tq0loacilk6VvXOXBWXGSxIMYcfvhVAPtQiwOD/A8veSdTcXCY5xX/kJRm+RzcwcSzI2Pk/O7tun346KINrrEyxnmDJ3w3QF7nwUqsRL4UDqWNMb6DqZjQKjmsOpQn3zdc84RYp81WOshlgKialj+SC1xeO2wCQskkrxNcf2DxvZM+0Mp3qZ5ZfHVeBTy92OiXDzf0XbfwMfZd9nZMCwG5DFz9r3mJEMBPFHN05hFl8pf5pOmC453oSfexY4GCzmshmAS3NUXmAgDFjzgYu7ZvVoiaz3sPINHSrUEMr0+5pLDNXVv38qp3AALvvXfvQap/q1H2rKcQ9e93eyRlc/Se5OjNGgH9pBYtoyIptCqfRHRUbfX/pSDpHTpjjOYzly4sKtgesgSXYJUnDOwxW6SGA3vYu6KSDricng6SBc+rDrgWiqy11f18BeOsnAh1suRG01CpjyC6C8bNOLWiiG29zwMPDg8xqKKS1JWwXDwrKqnkgjqID8UySUzaLBxDHPz8zjT1N7W3GhPaSmonrG4hcrWDIrVRz6L4sOtc24WZxrYTF5XLbE+c8vyXkGffDo178jwQAsWg6iN3mYqZesuGROVnv50pUjVojv8awIUkUV2eoPwAgTdtbB0S82bpi55uwoJQaMUETqsUte7gHPP64fFUSWMX8KjAMOS5za56cboN8bgv3euIGFy68GZnrEGX1fp61aGig3sCGAEpRRM+yNk4KibdcvjFL1Sbw3CAewAWpXXFXA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: vbYsSphhKPCXyGFoyiUeaaNS8VQSa09INqKvYw2Yt3cT5s6RQf37TCsOBYSjdp3Aj1LLn8CgeuyKjqzzEW/QihS5TXAlOfDQBf8VovWuX5UeSlqIJjrKe9JIfYvGBDS2rNsCxIrM00c4GD1qtLGyQ+STPXjLcohnqgZnOjrNMFTynwsw4et5VT7hv87M6OMlqvJldKNNtERnsw5gLHK4ViNgjB6X0dtO3bC4NpFcxC/qvJqrlCQezMGNYYZ8sD8A+4vJm/3/rgouCdiQ8D/PiLrh/Td4G1HE6OWHiLVz6xHuKyrgNnk6+v/6Hl8wswUoaYw8EYPieg37l5RP/L/EwmY2U04bhCKENY8ysnA1kAlqaWLyfVyEB0Ti1WDrbmSdzzxxLQcIGsh5wy0hW2nDzSn/7y4qLYbwdgVZ1sNW2Wks6ojAQj9BB0rJo58uuBLMxGjiC1q3O8SCKr0vuUfk0xfTswSBNDn5IOWF/KXOc1EdHfuDKw4FhEHSpqsbYJ3wn7Rdu5LPTIxLd/KggDmh26sTM7+WvuhM0OIU1t0jA5a84yQDB1OKW71fgUFAm5JwhgpKFAeisMFTw8MSaz6wbt763113POpxnQ21ccVs3g8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99db2174-f642-4b43-9790-08dd5759c348 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:39.8049 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9Cy2Ru+S/UDHXx1W8WVIkQ/umhF3fu9MCv9fFcPh3/EczrdDnbJ1cQR8fMNETfjEiXdpfRpNzR25QZ1R6DkZrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: C732yQfL-JLruiSzrBKQ-qfHPcEzhtWn X-Proofpoint-GUID: C732yQfL-JLruiSzrBKQ-qfHPcEzhtWn Base SW-based atomic writes on CoW. For SW-based atomic write support, always allocate a cow hole in xfs_reflink_allocate_cow() to write the new data. The semantics is that if @atomic_sw is set, we will be passed a CoW fork extent mapping for no error returned. Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- fs/xfs/xfs_reflink.c | 5 +++-- fs/xfs/xfs_reflink.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 3b1b7a56af34..97dc38841063 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -444,6 +444,7 @@ xfs_reflink_fill_cow_hole( int nimaps; int error; bool found; + bool atomic_sw = flags & XFS_REFLINK_ATOMIC_SW; resaligned = xfs_aligned_fsb_count(imap->br_startoff, imap->br_blockcount, xfs_get_cowextsz_hint(ip)); @@ -466,7 +467,7 @@ xfs_reflink_fill_cow_hole( *lockmode = XFS_ILOCK_EXCL; error = xfs_find_trim_cow_extent(ip, imap, cmap, shared, &found); - if (error || !*shared) + if (error || (!*shared && !atomic_sw)) goto out_trans_cancel; if (found) { @@ -580,7 +581,7 @@ xfs_reflink_allocate_cow( } error = xfs_find_trim_cow_extent(ip, imap, cmap, shared, &found); - if (error || !*shared) + if (error || (!*shared && !(flags & XFS_REFLINK_ATOMIC_SW))) return error; /* CoW fork has a real extent */ diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h index cdbd73d58822..dfd94e51e2b4 100644 --- a/fs/xfs/xfs_reflink.h +++ b/fs/xfs/xfs_reflink.h @@ -10,6 +10,7 @@ * Flags for xfs_reflink_allocate_cow() */ #define XFS_REFLINK_CONVERT (1u << 0) /* convert unwritten extents now */ +#define XFS_REFLINK_ATOMIC_SW (1u << 1) /* alloc for SW-based atomic write */ /* * Check whether it is safe to free COW fork blocks from an inode. It is unsafe From patchwork Thu Feb 27 18:08:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994988 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 9683026D5A5; Thu, 27 Feb 2025 18:08:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679734; cv=fail; b=ungG2cnnjgTXrJh7rbGcx3NOJomFQCfkahj5ZMCR1wf3r3JT8eK85DFNqolvTxPcVDgnO1n2pYuGjsldUC6fLkyJ+vlZMmLpW0iFNt+dG8KWe5Gv4coNdPSZi9mMX/TVugWlxljrAZT6sIHqx2fVL1DM5uCnqF+jlypEQuT59Y8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679734; c=relaxed/simple; bh=/cCIxwU/qNQjjrYRzRXvinLY1UKIwe7V4Vc8nY5Dnns=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=lT9OUP9fWt4+6xVuDLmFB8WSy0YoKsOwL3hmKkyJOFgKk5wLdPo+YHjxQSR4Hhhx8cIBgtcJRv/w/PrWsiwT0+a3mvSV5NjJPOV0wXMbUYA+QpL7KbVbrj5ihnGcyomnFCLctowSFkNJ10GgZjT4z3HAnFsbezz51sqzcX+BifY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=J38C44ch; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=oExC5qY6; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="J38C44ch"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="oExC5qY6" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfjbG016101; Thu, 27 Feb 2025 18:08:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=12/OspGuQEyOVIsPram9VvopVsj3dnRA/aTOCu9dpdM=; b= J38C44chBZj7nIs4kjzRclwl0hhFkOi6ZVf77JUkxU9nrFUI4w0mAfqX1xHiOUpj jFGzkrdi1BHu4A/5aHrihYgBAwWj8Jwhme8aLrxKrULzuwN4kyiV8DGpFeKmcPlg 38TeKq4cwR0Sqz5qxFEIidC6D49lWhUfkvUABLIrooasKwereGsOvpvQJuz0xZcv bSG0sgW0aEVuWaF0tuJ0Kd9Zgtv7X6dz7FUCNZLOvTR1gDQYwUTPEsRABuLf2vNz LuASjXSD52OQENXQ4muCTIynSRALTFtOCNyPsOunzmbH87Qrq/At5xCodEJ6FLo4 9LXTimgNcQPVFtgRHN/WsQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451pse407k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:45 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGrIOf002880; Thu, 27 Feb 2025 18:08:44 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2175.outbound.protection.outlook.com [104.47.58.175]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51cq20k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WnOAB4zE20r7+weZaAvy3M99lYLEDihnJ74NHjs3k/aBg/vCi1Mxhz8CRKqB/loLz3sj0+JnZXoso4OZJZYV02mKEhFWc+ialWGHSh7C53GSd3yZdn+oQSo2H/zFZ+ka/5lu8Y3wq89GPkN/6LyIIOILFcrNJLIZGqba+zKlhMFwJ4PjTB5bNog75UGcJ2nW2/fxC+QR0r48JnSw08RHkESWUksdMzr7/wAb7RM4e450Nr9UoVokBeIOfsIZtBsQSPRgdZnRYRyvn/+AimalfUBk9IfiVwecoCw7mtLvfKtyLplcatOb6YqlVsju5YmIOtKlF9NlF/1ZIcg8tN9EQA== 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=12/OspGuQEyOVIsPram9VvopVsj3dnRA/aTOCu9dpdM=; b=FybDUAMOoveIyhkk0BcwaLk/OF/RkwXD9ziFrfIqBGRLMl+pjw5Zs6fH9Cj3iUv9L3lOD+AiWTGn7rvTio/o/dOgs3HLnrjgz08efXSAkxzCE8ICFKJmHmTfebExEfGEZZSyjctLyekYsHSPxiHzvPREvknbD408BMGGICzbUBTJRE7vecXhc7AC824v9DtbBLbiV8+4DAVVq5OG4y9bMG50TDvJHYf+ve3O9Ei5+JHRdGbrGot6X5rROrHPYlpbUz/iLuWO8Ba2i3DYk9gRjZhDKKfRlQ95kQ6EteH57kTWD6RF4HU7dfQy4Eh0unVS3tZSfP8rwxGLHGQmJ+TC5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=12/OspGuQEyOVIsPram9VvopVsj3dnRA/aTOCu9dpdM=; b=oExC5qY6qIVsIKKFky2w407ryzwruoVnS0bJNtNYOY3UQZ1SyK36MpHNAROm9VTIZ1jiBOTam/Kfdca66rApK4MeLqWWaEVN9r5Ghi0naO9LWDstQhQ4y2MR6k+t0vV3CZokxu4E77ycxUtMmXD1rhkLNteI4U2257/6UmAJgMk= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:42 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:42 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 08/12] xfs: Iomap SW-based atomic write support Date: Thu, 27 Feb 2025 18:08:09 +0000 Message-Id: <20250227180813.1553404-9-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR03CA0070.namprd03.prod.outlook.com (2603:10b6:a03:331::15) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: 353d4b2e-65d8-4c29-5ea9-08dd5759c4a2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: 7X79F15fiICXzDLLg4lTh4w1EG4Tm5puEnj72SdXjqSbwNZqG76Dtrt/dfaTIpDV4hdJ5jnvufpVxQKs9lvDUmFqotV9sil/cwR0jxeSlSyPA+/P4AJaCy7L118H+LzWsL0kqJj4klaZfz2OO3oHbL+vfcpBMEW6s4Vt3TS5QAJCuRvyOmLxAwDt5Tt5OvT615Wub7lqPR4YyFp6AFFFSjIHYSB/Bnct/YVW0ujqp8xocOdpsQabS6v0NEJn9WhwqD98+UJs2jbn1mU6bz+uPNQoiER9TV10Inyy1dw7odGkrxrURQAhMvSYCp9XniNjxjfbgYfSgBasdPm9gOCY0y1TBYj/cWJ8WY7/D9pr2SwL+lVX/mtj0Bn20YcfskqSSChUp9m0osCSFvM3d5lkVzJDJJMOz049++WN7Hyq7Ab+qIhWc5Hp7rMVM8pnx4cCBgsewp66gTtjLFaPnonyUC3HYoOHmQRytzCJlqx/Jzc/cAzVCwyQ+CTo4uCGqQoWgZ+cFcm3MVpMC6RQ8abhRyjV4O7OfDSyAf5ohKX2itWq6SCszdOhnVRQblAQ79WEQHM77tiP9bSrVCCQTjPjAWeZEaBPMXxD9DZjN6lb+DUuqDcZyIivxYJ9VNOVfyaM7zNeFyanQyWXtt5tdcmAqOyw0iV9TQeI97+uPg8SHL+y/iMPH5h10Q1Z107oi53VjBej5uHp1qLza6mmVV1KWXGKC2xwD1QNZSMzINtE47WcVIc08bA2mX3qmvpU6ZCoxjCy4qtoq6BsH6XRC40l/VmSV3o/qJEvXvbP7lWud6MUvgbCzqKq0t4p1vSlsq501WUKf4ZmIwe806bc/GdW5vNhGE0TndJktQ8o7J6tV3uB7DDx0PmKNdQQXhNfr2FfktP/KGhWpwHhTdpUItlmFElBOfXqBnaqYFH7Qvho25K2JaVSXV/GZee78cYNA/RbTm7dR4mpEoUOJSdmwIHuG6QTCHadIFeSPmBeOhjZckz8dlHifXQByRyPrdtBN2DcfoVnEtzesCtQ5OQgB0NQMJkKlyj3gEf4GoJQHsXYWbLT24/xFPZasd0KczsuDVGwQLVy3dFvSkOXu7TBW3aBcUhKLB2ndInrkWxPna851FYw2SLlg59bNq23x5luW39AsmBq9odtWent6DaAfWWwFBFUyEU7uol9jsWMnNAdkdYj7UOctQbzuROD6H8+dMH6PqGDvsKvOCZU5G2j5gMeerk6gUlrnqFUJHHFjp1bLbzlPBa6K45yCSiJvY/lGyzSF9OHd3oUPEvYP4dOCqtre+5mscetuiDt9Kk3DyfhdbvZz/RQh9xmvVx7Ke8tnlpQbxFeOz+GVFhuSWh8Bpnig9tzrKYMsTDAxKi16/4xrInPaIzCLPp1a+8j6F8G1QbH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hby4N4pUhyyGEsgONz3e+j3qN5NlBJv6XEboHfek6ewhCQYtgJpR0S2GdXM7kwpVTkIX65HBMo0m0zjCRUd3HXTKwcy7ml/3Wa6WTsQlbnfBFh8soiUTHcH3Grz81CtH2exdwYap/yx+IFhDHlt6WLDTu62wMoNUmtOK0ZYynPJ4iH3dHuTi+4zrGkp++2vWc2MCmqDtnQNsV9n9S5WTXVMS3pyr0qpLNOihswmoHYatyj9//rUV38bFcEyplUUccKu2aSkBqRhpgPzGM+XQUiRunNoGUHIg/DN5i3IEa/RW1F7PBVOSIsBmp7hGOjSUbgmX30xEhs4pv1urfGlcbediatKYDbXGTyXRJ7sWnbwDNXH9i0WFWGz8T3GhulYehZU4eB65/A9e9nggtW8n7y7OvCwwwTveTz75Mi5OSP+6cROr+xUAUzxH1vgnzbs+3/C4h3lSwgrszCTWLl0oP8v65nJfP8Cg8x/ci9NaXlUJFRYUif9DAGtZG7ZGMc7GM4LNg7fNsU0kigFZADBduCBHetdABMa7HWPwzyOmPOt1cChdp0At36A2DrNOQTcGP5ogLccJxtA8Ky45ftK+0edvyUurDIbUmgCQg52H6pm8GRv9mvoqawzSSzLCiCAIFcHL591yDuWrbGl5SWEoL8Kf1fLV0ayhh6HyxNuV8EUO8DeY+9MzvqaYnkvUzaDULLS4/FRbwZ9BKFXvfK+rBQbKmdHQs8TSd1XTaKRouFqgJnH/vvD/TKU5CMt2KkAIcAjGl7SD2whahDe7Y9uEipHKgi/D2riMFm36KFOqlFY2cpXBTIW2DVK0U4FJH1ltfR9bVO2bqylVXPJk9vFrSHzDBz+xZKV5oPQHP602fdwagmpZ4+GDfXhd4ut/pqSe5hnWl7Ks5nZ7GMxrGmvBG2ME6yKtFPKk/iZZk7VRXf43flSXADIkNdykhV96kNb1lN8Y+77gCV9WqmjLn4MThgxE+WGWl6gobXMO2Z4DdUxb2HAHdKuVAviU81JbQRcDFT5so/ElLOM+EUkmaVvJYhyctDGIXhlXkcdH0d8WsgvRzzJ5xQQfMcfPBClKLUkXG96P3ilu5qGMvSm2zoXZkIfBt9H1J5xlIfgUJrzRhZL0hTPzd7d4qkgZt/i3D85VnfYgadAUlPG2pHkTRYMbxFmhbBRdVOk0MbJI/mFhA5xLu9/p4uVy57+btxLLOL1nCFFCejbil3iEdYNEkUrJQwbeYUHlKG/VZrU1JNQAc6cU8sczQQHrlsWIDaKmcYbuIde55Yq3n3eQkqqfeHD4ww8huzLUUTOZLkS8YjelGdPCPeluTgcHItu5BN08++JXWB9XGUqTfcMSPidawtMsDnvIQD8VgCpmO7UfnFL4a4hLgdNIVbp2DN9TKBhdZgvHsl6/HOJGaBK0NNpRcShCFfx1c9YRIZ7ydqY1CRSfxNP9wOM9DSAOTeKCyPXLsU416tgMGV++KkMdgqwQAtRMefUTSg1o8gd8Hyz9uJF769IS9i92jrmp7tF4bwrxWZRhS6MASNxeBCVi4713u1/a8UHbhsENVvPLrPrbrxuO2oeaXuZOyXtcewyZIRGSkwE4nr0Nh1675rPBuz7FEkmv1g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Vond5mLwGhEweObQpAMaTIytwWGzcRTx0HNDzPn6f7hDWAf7RXDJZsLuLbEUlZ5/vueI/XKB8OeewFBX76EDB/Wt8A39GS1W8ujywoCkVWyvMGZB/yrUpM8RgXaTPthlVehwIpgGUGHCKmg32I1X0nLYcC+0Di6Rdu2EY+uRtl7gwMUTqY4bMIALgwistD2UWkHfoy6FBr5eC5MdXOu31950VumEdWxf3nBz8qSrum0cCUE3CSX2fBVaGI/athUYDhqpRH8pI4nT72xD12AwzuOHXpJiiU+9imhthmC0B5AiEP/v0+ga2Ia68LA/50G6GamPJ8cLKl9vwwQjaAww6CpbDz14sKAc8ymkMq4TlwC5VwxHpEotMfrNwp88ca3cw+gzxc+W0C7f6BzAeB1xOSjttUL5Z1OgwieQDPWd4iNoP4RabN/jbYGdkwdIHfiLLewfl4lCi32VKWh8biqyy59bQP3npkJz509PDc3cvAun1apSacJ6Q0KtMOUJRbvVEQZ0M6vpZNERpdzl7i7NiHhGqQk+q7l1ZoO6er0e2lJq9zZseaxLbIKpaas1+Np1rDKxtfqrtldpHK7YldwHcp+qAwCPQmUtBwki1Ma9dHY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 353d4b2e-65d8-4c29-5ea9-08dd5759c4a2 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:42.0644 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SiKkCWBOYknX0kaWMsKnQvM06SDYC64b2CxxooHYLulhLEnlY5/loSZQumt3DdhDIlkoXIqxSiQ1k2xaBIeQxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 mlxscore=0 adultscore=0 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-GUID: hk_KXPonkK4P43P2vKkZSCNoPx8h6etT X-Proofpoint-ORIG-GUID: hk_KXPonkK4P43P2vKkZSCNoPx8h6etT In cases of an atomic write occurs for misaligned or discontiguous disk blocks, we will use a CoW-based method to issue the atomic write. So, for that case, return -EAGAIN to request that the write be issued in CoW atomic write mode. The dio write path should detect this, similar to how misaligned regular DIO writes are handled. For normal HW-based mode, when the range which we are atomic writing to covers a shared data extent, try to allocate a new CoW fork. However, if we find that what we allocated does not meet atomic write requirements in terms of length and alignment, then fallback on the CoW-based mode for the atomic write. Signed-off-by: John Garry Reviewed-by: "Darrick J. Wong" --- fs/xfs/xfs_iomap.c | 143 ++++++++++++++++++++++++++++++++++++++++++++- fs/xfs/xfs_iomap.h | 1 + 2 files changed, 142 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index edfc038bf728..573108cbdc5c 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -795,6 +795,23 @@ imap_spans_range( return true; } +static bool +xfs_bmap_valid_for_atomic_write( + struct xfs_bmbt_irec *imap, + xfs_fileoff_t offset_fsb, + xfs_fileoff_t end_fsb) +{ + /* Misaligned start block wrt size */ + if (!IS_ALIGNED(imap->br_startblock, imap->br_blockcount)) + return false; + + /* Discontiguous or mixed extents */ + if (!imap_spans_range(imap, offset_fsb, end_fsb)) + return false; + + return true; +} + static int xfs_direct_write_iomap_begin( struct inode *inode, @@ -809,10 +826,13 @@ xfs_direct_write_iomap_begin( struct xfs_bmbt_irec imap, cmap; xfs_fileoff_t offset_fsb = XFS_B_TO_FSBT(mp, offset); xfs_fileoff_t end_fsb = xfs_iomap_end_fsb(mp, offset, length); + xfs_fileoff_t orig_end_fsb = end_fsb; + bool atomic_hw = flags & IOMAP_ATOMIC_HW; int nimaps = 1, error = 0; unsigned int reflink_flags = 0; bool shared = false; u16 iomap_flags = 0; + bool needs_alloc; unsigned int lockmode; u64 seq; @@ -871,13 +891,37 @@ xfs_direct_write_iomap_begin( &lockmode, reflink_flags); if (error) goto out_unlock; - if (shared) + if (shared) { + if (atomic_hw && + !xfs_bmap_valid_for_atomic_write(&cmap, + offset_fsb, end_fsb)) { + error = -EAGAIN; + goto out_unlock; + } goto out_found_cow; + } end_fsb = imap.br_startoff + imap.br_blockcount; length = XFS_FSB_TO_B(mp, end_fsb) - offset; } - if (imap_needs_alloc(inode, flags, &imap, nimaps)) + needs_alloc = imap_needs_alloc(inode, flags, &imap, nimaps); + + if (atomic_hw) { + error = -EAGAIN; + /* + * Use CoW method for when we need to alloc > 1 block, + * otherwise we might allocate less than what we need here and + * have multiple mappings. + */ + if (needs_alloc && orig_end_fsb - offset_fsb > 1) + goto out_unlock; + + if (!xfs_bmap_valid_for_atomic_write(&imap, offset_fsb, + orig_end_fsb)) + goto out_unlock; + } + + if (needs_alloc) goto allocate_blocks; /* @@ -965,6 +1009,101 @@ const struct iomap_ops xfs_direct_write_iomap_ops = { .iomap_begin = xfs_direct_write_iomap_begin, }; +static int +xfs_atomic_write_sw_iomap_begin( + struct inode *inode, + loff_t offset, + loff_t length, + unsigned flags, + struct iomap *iomap, + struct iomap *srcmap) +{ + struct xfs_inode *ip = XFS_I(inode); + struct xfs_mount *mp = ip->i_mount; + struct xfs_bmbt_irec imap, cmap; + xfs_fileoff_t offset_fsb = XFS_B_TO_FSBT(mp, offset); + xfs_fileoff_t end_fsb = xfs_iomap_end_fsb(mp, offset, length); + int nimaps = 1, error; + unsigned int reflink_flags; + bool shared = false; + u16 iomap_flags = 0; + unsigned int lockmode = XFS_ILOCK_EXCL; + u64 seq; + + if (xfs_is_shutdown(mp)) + return -EIO; + + reflink_flags = XFS_REFLINK_CONVERT | XFS_REFLINK_ATOMIC_SW; + + /* + * Set IOMAP_F_DIRTY similar to xfs_atomic_write_iomap_begin() + */ + if (offset + length > i_size_read(inode)) + iomap_flags |= IOMAP_F_DIRTY; + + error = xfs_ilock_for_iomap(ip, flags, &lockmode); + if (error) + return error; + + error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, &imap, + &nimaps, 0); + if (error) + goto out_unlock; + + error = xfs_reflink_allocate_cow(ip, &imap, &cmap, &shared, + &lockmode, reflink_flags); + /* + * Don't check @shared. For atomic writes, we should error when + * we don't get a COW mapping + */ + if (error) + goto out_unlock; + + end_fsb = imap.br_startoff + imap.br_blockcount; + + length = XFS_FSB_TO_B(mp, cmap.br_startoff + cmap.br_blockcount); + trace_xfs_iomap_found(ip, offset, length - offset, XFS_COW_FORK, &cmap); + if (imap.br_startblock != HOLESTARTBLOCK) { + seq = xfs_iomap_inode_sequence(ip, 0); + error = xfs_bmbt_to_iomap(ip, srcmap, &imap, flags, 0, seq); + if (error) + goto out_unlock; + } + seq = xfs_iomap_inode_sequence(ip, IOMAP_F_SHARED); + xfs_iunlock(ip, lockmode); + return xfs_bmbt_to_iomap(ip, iomap, &cmap, flags, IOMAP_F_SHARED, seq); + +out_unlock: + if (lockmode) + xfs_iunlock(ip, lockmode); + return error; +} + +static int +xfs_atomic_write_iomap_begin( + struct inode *inode, + loff_t offset, + loff_t length, + unsigned flags, + struct iomap *iomap, + struct iomap *srcmap) +{ + ASSERT(flags & IOMAP_WRITE); + ASSERT(flags & IOMAP_DIRECT); + + if (flags & IOMAP_ATOMIC_SW) + return xfs_atomic_write_sw_iomap_begin(inode, offset, length, + flags, iomap, srcmap); + + ASSERT(flags & IOMAP_ATOMIC_HW); + return xfs_direct_write_iomap_begin(inode, offset, length, flags, + iomap, srcmap); +} + +const struct iomap_ops xfs_atomic_write_iomap_ops = { + .iomap_begin = xfs_atomic_write_iomap_begin, +}; + static int xfs_dax_write_iomap_end( struct inode *inode, diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h index 8347268af727..b7fbbc909943 100644 --- a/fs/xfs/xfs_iomap.h +++ b/fs/xfs/xfs_iomap.h @@ -53,5 +53,6 @@ extern const struct iomap_ops xfs_read_iomap_ops; extern const struct iomap_ops xfs_seek_iomap_ops; extern const struct iomap_ops xfs_xattr_iomap_ops; extern const struct iomap_ops xfs_dax_write_iomap_ops; +extern const struct iomap_ops xfs_atomic_write_iomap_ops; #endif /* __XFS_IOMAP_H__*/ From patchwork Thu Feb 27 18:08:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994997 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 0EBC41F584C; Thu, 27 Feb 2025 18:16:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740680203; cv=fail; b=J2bzpY0cjkKjFmOukQPHNI/6WevUHZOQH51wYEwvwsejQiZNQR3h0hGuLsTQVsjuU3M7s8cps33rd0XeJvt9lxbQzq1XOWGgwoA/QUlSj5MueM5UzWQNzVTU1fh8i6XOpF2fddw7BXdvOl8bwIR30Z1krJ9an1F23Vs9zKmsss4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740680203; c=relaxed/simple; bh=Nbu4TqT62xCn17OylykG6bmUT1AxqQ6Rzo4PElWlBB4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=E4amapKQZ7ENOJ0aLOfcnJwxuy6VAnWjLqBaTGmffzH31hHDnsm4gCp//GujO75she2P8A7WEqB44PtA6DDene3vvRFZCWNMrCXarB9RkKeTek9nk/kvKflZuFNy3U8NrraqYzHl7m0f7h71I+5FFEJjta17UdzPTuz+acW58ok= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=kTt7K8GZ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=czIC4d9o; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="kTt7K8GZ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="czIC4d9o" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfkxP005600; Thu, 27 Feb 2025 18:16:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=P/+ApcAcNL7o3thA0sV9mr2CpDhelM1vxeoL1cDXdjA=; b= kTt7K8GZyc3JuwGwjkzju9NtALwUgeWLWm6z8KIgCVKJkndUnGf0iwT9MhkqMh7g zAYqHSUhRs+gnm6BeKe2RcMBajXd03Klfj3JIeRV50eHYL0C5S+esyxoIL84tXpB G67qgmYHtJfFQdrcJddQFBg1//+N8sT7MV2F4q2ovD8S1ii4SdIWbDy0wTnAVZF8 CBLrTk2wkr4i7rdbQlnAgwTAFckwQaFD53u9JdXoOW7Hif5pJ68VA37LNniJmZFe BFo4I6Rg7EMv/b3rHY1IADxGKxsYEzVLh2GB12dtu+tWR4VTZlLapzUGAtazM/oz UdserH2bUqQWSHC+a6qPew== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psf3yaj-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:16:36 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RHcwhT010193; Thu, 27 Feb 2025 18:08:47 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2174.outbound.protection.outlook.com [104.47.56.174]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51c6suf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EQpaDfQPz8lznaoR56dUs8BxA3lSEm3/vsVmzIFTRZW983b4xq+9rX3i5VFW5ShcwgBeSFK0I3UcAcGq3iJPvZp74CJ9CiMpeQcTq8fHDnQHPeovhK72q1qJJmSqhK4zjURejn//SETHJXca7pCdwkeLt9WRnzLY4PtribEWgoyn7vT4wV3bKjP5oLfxldLJFGbWOgVDAppVLkzi59wgQTfMtv2YA2p7ph193ryaOtfYPBXmFcJwMUhSdFE+agd1fB9vDQTCz2RrTW3jWFIFAP3XGHYyXYOLxdFClamVdOCNM7ijqCla8nnoKtrh8Nfw/UNfYp2ihuja9PCax0AEaw== 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=P/+ApcAcNL7o3thA0sV9mr2CpDhelM1vxeoL1cDXdjA=; b=E3TbiC2JkNsW5LLipDGwVBvZiWswAb/RmoEd6pcVEuqyxDUC9fy6HjYH4J9/Nxwte5wEt9THKCQBcczNlUC5zFP3ZsnFDI1mwBdwFkpxLfMP06PYwpkCrXsX2A9FkomwByPzenX2lo5zylN+VVfR+W1DNh9acHaoeUoFSyXg+SNp/okkIJgp0IjrMEv7c6/bzKjsXvy0OD807P7SDYCr53o49LC6i2OThkX027nk31/xOgApqph5ZtLjOQVBoPqOIlzZdCWkO7WeolV0w8ztOZmugT/D0F1im+CJRwJJWGxwQ+cXGcBC8CpEIqbGlBzR74vj3RwMI+CVl6OYiul9HA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P/+ApcAcNL7o3thA0sV9mr2CpDhelM1vxeoL1cDXdjA=; b=czIC4d9oF4zJPps6WlhgBNwpcs4j/vbE5yGPdY/wZeXmqwXHB/+rZSemsc8QrLhdYNSyF24hgWenco8VbTcF7i8vuenD4HJQpn4avgKvo3xc4Xkd7iwiwaVBnbWG0p42fwk8Vv4cc9wFQwe6nXc4584pbislL1JnD+7GqGymKPE= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:44 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:44 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 09/12] xfs: Add xfs_file_dio_write_atomic() Date: Thu, 27 Feb 2025 18:08:10 +0000 Message-Id: <20250227180813.1553404-10-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR03CA0069.namprd03.prod.outlook.com (2603:10b6:a03:331::14) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b793cba-8769-4ab7-a327-08dd5759c5fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: Ne4Ba8Exobpbs3GvvnUEG9zeMXFBA8/QinSdSs7S3fggS06vjZOKR0h6VzPCdzY61CDF62S5uiTt6OR8TDhcHiBky8WVKOxsRLNO3DkJBtN/Jb37qw6zWfMQNhlV6V7wNN5pp7O4m3TxYT4UOpbjairXZ5hlSqPdcFpulfIVDXoxBEY48NbW5y+fs6zmLq26pQSZe1rm1ngliQz6OENalPnvFimSX5cefH2EU8qvN/OOiRrbGDqGygQGCTfHJMpIWT3qzvfdH8apVJXyN43blD85pXSEpblBh0HzeKdsZBi+CXas8lQH+MoHfLn8934Akr8xpHGqTGAU7l5XF5HAaalfKvcgCl/HkTK6ZCjx5K9TczIrQtDXCfKqxQJ58p02qbRZ6i5kRh7SNYRBMvEXe7q6rErmawoZ1bu6656XKuGmUHUeuJMkNGEPhWCepHmwC+8AczHPVDTHhiUaJozgROA+NFS7r10Zwn26lP7hyGViWu6PTzkzUtML55Pkh7IuySR37Ac3xIWT37sAd6bo9gzL80Fy+a8vpO5U1lCHg8S/GmxR0eNyFbJvlhQWrrWJBNTXaa5V5buBYQz7SvpmMRjSpRHxPPS3lRZEgqnuGIjSGFWHTLiksD1IoKig1BHEMnnrzJ923bP+Q3WI99JUyWmp3S9hyIF7pJrSJZGH8XUvpj6BhHUPfYhIs6QwaJRcrnwzoG2gMA8UUZkntuyuGhtFkP+5GNSrjvaQ0cfOBhfuHen2yeEfzkKXkPa3pK8UfXasNfzlxtImju+fNxVEYalVexhLTWVkRHRbo3LBjKjB8/AvUwxw5nzc3m2OtfMKSb/m1eo0edLfM3ZvyXKTcW2t/2NeiUYSUnbeYaKor2HCPp2dLz1TJNbRxKmjNdPskhjRugaxuu1CReeErdPzQRcYbkWmlFuDES+/72ZYQ+0E6RiWWQlCv177VKxHLgAHSGe0CK0qo0fDMRpMAeyNwV3Jej6iQku1/3M51D/uQdFfXYbop+NzBDUAimQmN0mtdrTzrffJJWwg9WT8YBuJ1DVyP9zcgfBNhct7mJ+xnILRbd1WHbwNTugZ7ufaYZheFDEd4rF/OGeSBBs/vr5ZM0pdUbyBTGb2Gc3MbsIl7VnGIY1bTmVCkI6V8vHe7ZLVrRUR7Q3i1YzjW5rL1xhWPw8E3EfFVRd6CkRNrq4eJe9t8Fk+Gxo6SU6pEl4hxA5y150JhiyIQoIpNM9kbA8xqZJtMbmP/wH67CSvp49s55BetOQGUjCyZKY9NjC+m8nZq0F80U78n2MX621xm5W1LgYaoQ/ea1pYDQmOsc4dpLO/DDBnj7zfaCCjP9wyEUIbkaIfff5fUYEbUOGydYgrF6wbyI31lSe9kzoVgemwGzNWTK39i/Ui7t3wwNo7UIGe X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K1faPDsWKGNKCM3zUbcgvxyuDcrXCgISfB63dX2YMDO9D85q1EbObQ0Xf8KUaLtupueDgWKl3y510V4UJ7qVIy9CFZLpTeVEY65wS8PzcIVgHyj6wlgR/zFlAMrMb6LyrXFXXZm/gqaCrxqgSb63DaRD745P2ev9LwmTdbcDZkMR4hDR3gmJgQ/nCsv63HO7rPWacx/WPLN4tu6lvbuhnXEVroGW/H+mjHcOzj7ZA9tNsHuB/rLTz21HNINljTmpBK9u6s3Vi8T/6LdeQIo9zMmjEUL/N0A+HrM9Rst3RI/j9Zu9yLLGNR7ciO4Wn10TwP9oWsl31ClmcdKThoq/H9yt044IBPwUTaBapOx3ZfzaQ3HRX3zsYLPEOKg0BSCN0hXiz4nqQ7nu8Fc7DVAYfCDhKLG5J5A0VmKLPymsGxSeB67N0Kal/EPw3gRvpqmKWdiob7RsLXp6dGLt4dDSbHVXNg1mTFgr4futf6xpfJs4egaIqd8DABp9wqdKM332JUcF4jE1gwz8AYEYTRalhqgGf75Nh4p/opxPJ3BziGhE9s4tt8EucmQRa23lOzf7OvF9tGQAaBa5xvX3I2esgYnXKlxUEDgv3uWBw1Ass1vIsfXygEa+tGVPWzpUPIH76qImpx0tVy6Co+RkscRoVVzA7ofCoB6GKHF0ztaZq0QFFunMm7Q6SxzJOTayQabF0KuCH1AzPNAN4R8pySXmGmOUmGb/+z6LV3eY8nJfi83DM2NOS1N+Gcu7ibzVj894/46aEOVPPqwQjXMtflNBgAkjUpUQc2NWDrIM7Fqsv8ZeRobfn/sf2bDeFmuZLMuEK66p51BJdEMUiOzlk/dg77PcEmti7n/9vJa1Xxr+906Ioda7CZYIe5po61Ka4OWfB2BLjKcJ7aaoEny6Ro8Enyy3hsy3+XRLdtaJoybROzcKInFiiu3Bjk9SOO4r0oZlWjhRmkjrqUPDGDaZM4Q4ra5wtiBBZ8MEt1wPl+4IFzUm7+HEZT1FnXRQaRd0d2Nj/PJJO6vLc7o8FX/MlHJOCgxxTBe1Arbf2OfAItFLZaMrZ3xK/TS9NjcGrlDbAFuiaTeMso21RvWDyql9JYrrvTL2MacZqh6xdeZXQXgsFCr+R0YuHuf5qEFajIG775fAnxnPElVg3dA2X+THs9DKi1ahfVGb7544a/evGnfhW9/rp+Hwo//PZZsAZmjNeZIT7/jYGMpNM5esUyJeIWbt9YSnRjEiDZTfZ7gYOHhXkWGrdreDrDXANZDrAj32D75N1JlSGb10Vu1nXvSH0mwLEHF1BrShPME0Y26MlWz0Er/lEWisgK8MOKPkPOEKZ+ccAJjaAFmZlqM8suLOVoLbI/g0LSX+1hoIqNUJjGXfRWpBTD0ZmRVnoScMHQNLXWdv0SCZjw/+YPKanIpnXbXZayb8gPNvf1H98dWZquNe9SNtBO1o0SEmyMt+vaj1DtZrb2AGTbPPE5BL+5QhTCSeOF1HlnC/nCE4ewLU6VrQGKEr6Ej+Nho985j6/Wpiy/WmMTedLGAaqlq00J3Z6FVCY18AQ3F0uSS8LETBkJmvb7/+CAJNq+DHSr7ZcGuBeFzLSoDamWT9wERL3MhIRPv5IA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: wD1U7otD55IZ7pDtXyan5O/XTLE44L/i+VwC7ITrDCJvojN0ytWqWjwj37UYbyV57ODEJNFBAlMMPg2pDXDd1nzfK8DnSIx5EI+1g6T7BubTqa/csovienlXVhEcK+Ar+KZL2ckAS5JezOwX4x2x4ZAoIa2FuoHsJ04OlljFG1d8TQIM8lqyTdZB9YJe38guq5aHyc7sVE2LGn6RFWwingdmXXMaz1Y42RauTuZ8HRDpLgxYedfK/i1WRiExaHDC+xZJuD0GVoF9hOUD83ZF/OwTSmz4REu+Zof0PKB5qdUuWR/f93HOH5IQBITf6Sq3sXZ17Q3qUY+fQqxP4Bc7arZ4Nvbt7GTJC2IWabOQOGhDrlB5kiBKrsgcaP/MoZOvLtEATPAfqpXWWlcRIcUeU8Wr78PWuR0/TSh/xGlVm3TX9WatAPZ24gxwFyOGFDhQyQkW0Ok8suCSLCTG9hYRUthIqgu2QzOayZ2n80qNyZtIk0Rs3MEiJE4N88tgDYXf4U4i08AbUtRBjEHW87klwPTMayIK12KTaL0TmXboJ61OoKEgH5db/fRcXcOSBPZzifTXUaq6q2Nqg8PsRceFoW5HP4Ue9g3ijedGjZY11LI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b793cba-8769-4ab7-a327-08dd5759c5fd X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:44.5228 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YwpHkJd3PEiq6LxfXJsfdLMw9tdahRi2iuoMsLgvI8PUQyU2hVdqcBCuUD0g7IvRGYr6WRjp7JGgNCu5TXOQaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: Rd5DGELiceqbvf1BVgTfNS9dEcplXUYr X-Proofpoint-GUID: Rd5DGELiceqbvf1BVgTfNS9dEcplXUYr Add xfs_file_dio_write_atomic() for dedicated handling of atomic writes. In case of -EAGAIN being returned from iomap_dio_rw(), reissue the write in CoW-based atomic write mode. For CoW-based mode, ensure that we have no outstanding IOs which we may trample on. Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- fs/xfs/xfs_file.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 258c82cbce12..76ea59c638c3 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -619,6 +619,46 @@ xfs_file_dio_write_aligned( return ret; } +static noinline ssize_t +xfs_file_dio_write_atomic( + struct xfs_inode *ip, + struct kiocb *iocb, + struct iov_iter *from) +{ + unsigned int iolock = XFS_IOLOCK_SHARED; + unsigned int dio_flags = 0; + ssize_t ret; + +retry: + ret = xfs_ilock_iocb_for_write(iocb, &iolock); + if (ret) + return ret; + + ret = xfs_file_write_checks(iocb, from, &iolock); + if (ret) + goto out_unlock; + + if (dio_flags & IOMAP_DIO_FORCE_WAIT) + inode_dio_wait(VFS_I(ip)); + + trace_xfs_file_direct_write(iocb, from); + ret = iomap_dio_rw(iocb, from, &xfs_atomic_write_iomap_ops, + &xfs_dio_write_ops, dio_flags, NULL, 0); + + if (ret == -EAGAIN && !(iocb->ki_flags & IOCB_NOWAIT) && + !(dio_flags & IOMAP_DIO_ATOMIC_SW)) { + xfs_iunlock(ip, iolock); + dio_flags = IOMAP_DIO_ATOMIC_SW | IOMAP_DIO_FORCE_WAIT; + iolock = XFS_IOLOCK_EXCL; + goto retry; + } + +out_unlock: + if (iolock) + xfs_iunlock(ip, iolock); + return ret; +} + /* * Handle block unaligned direct I/O writes * @@ -723,6 +763,8 @@ xfs_file_dio_write( return -EINVAL; if ((iocb->ki_pos | count) & ip->i_mount->m_blockmask) return xfs_file_dio_write_unaligned(ip, iocb, from); + if (iocb->ki_flags & IOCB_ATOMIC) + return xfs_file_dio_write_atomic(ip, iocb, from); return xfs_file_dio_write_aligned(ip, iocb, from); } From patchwork Thu Feb 27 18:08:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994989 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 95FB01F583F; Thu, 27 Feb 2025 18:08:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679738; cv=fail; b=iCyq6IDtif1ze6pwHoo2at1JnOMaxih90GohwgbAEDafrflJRs3PeP+uWOQefG0RZqqZpvfzTDayFIpO+PjZWkVVJwtF5u0K9fqZHoNa+Max/7bYu+XtbBFRpoquzwy70/7CJ0hN8nRRlBmzDYCbiLeAUU+5Rxi4f6nNa/CuAlw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679738; c=relaxed/simple; bh=WbNbJC+Jv06o0dJElj5AfpyjU0AaFensUD8vjoIsmZY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=PWWzxMvOlbLwNb5EqUKn8jr7mlzSH3bhAgsNsojAZLEUh9751tGPnMbQK5j144/cI89cJ84ZQCzN2mS8bA3fi41QSIcg0mBMy7wdSkYbLx8AvHiXPI2JvDDE3kPxri0ysK+lTHr9HC9J/bEUntMg/XfMzuaUFtd7N2SVmtYJD4k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=EUUMiTPR; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=BLGrlAv3; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="EUUMiTPR"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="BLGrlAv3" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfkpT005586; Thu, 27 Feb 2025 18:08:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=7/Ioky/yfctmoiTBCU0MxkRb0yPFCsEeydZWIa6sxkk=; b= EUUMiTPReRj8321Fsn95mnO9FQvYusfhKgvSlScF+AqASLg3FMS02W5iWGaKKEoE nZqmT248B7H68Ew+LlRWHR/nookJmxsZdwGKO+YhRW1sfXBcdPsWUSooKybmlXdC pntv2IpvV2RCCMyfmALRy9jP3VoVwszsnDSE8f3HNOsd8BnCYccFa9AJU6aqJm6n DeIC7FfUQPxG6ukMpyMY22Ry/Sn7WkvT9ptOZprq1A/XxjrqmCMmhMggjodag2u/ lLVHpMm2ATuDZ0ChclzryF4XN0DKjpVLh4ZiSiviwWrjBxhxQ5fUZIc8rAoSA7Vs WY5W1Ae/qwX73ljkaLuF8w== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451psf3xr9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:50 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGq8cZ008182; Thu, 27 Feb 2025 18:08:48 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2177.outbound.protection.outlook.com [104.47.57.177]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44y51jhqx1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I8cKQY5VuDhiibfcxyAk8m6uPlP7pnYyZkJrPbd2kpA/rmkGpArlkPXjdVyE+FkfDCXcrYtQoTvklNune/mYOWO0ui/ArosT5Ev0wVu10/FZRkKBoJ63hizyDWz2qDWa1MNmlWr44j3Q0sRCa/GrMpfcGwhsFFxVQBaA9EHRoDBcwkp6JW7xqNyqhuuQOVieFyqULLlwScDtS9KfETIx0cwPL+rDoG8JJJ+3PomXtGrcbTcjcQuJdqcAbM1mkhEzJC0zpnBvMJsgBWvIsihPg999Yrk+V9BrZxkrvS7l0Mfc6SXYGeIgm7XfcYG2ST+FCQbseSVcoTAqg00hd09J0Q== 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=7/Ioky/yfctmoiTBCU0MxkRb0yPFCsEeydZWIa6sxkk=; b=cYugIPTUeUlMiCDMjjHD2XXQKsFlE4IBA5j3kZDKeN5qkVvV+k7Kaww5cWNBSO5UD7CUJT4+dM3IxaPFOAPiKJpQUrbFxjmD6O5FTT8rYxAvE15z0ZAZ2xFmM5k7VZI4wkdHBi0jfgSS5PHBwr5hPFFCdVzjPkC1J8BGMaq1ryjaxNhy55F9iTdkqCutGFy+Efcq0v33kgBGW+uF6cHj+0h+noyv/hAuYH8+io1ojwjcdWGVV6s7skSqXlfOcXYHn461/b7nTQOUzfXHOJygMRpHAkC4+CMDbITGGyMrwPqj6d7hSy5/2MQBLNl1ukkLiQBZPmDi7Gvc5ny9Fq35bg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7/Ioky/yfctmoiTBCU0MxkRb0yPFCsEeydZWIa6sxkk=; b=BLGrlAv3rWo8De516zyclFbVZRafIqtIULeGwwoJEg8EOu/SNoszxudhcEAHqW2YoVjOPWurCI7crXNBdOkr49uXFCHq7rfrTwuDECM1q5Nextwv1Le7MgTfFn22LyMp8JHplaZF09eae3AXt25ORalMTULaP7OwPhM/YkLzako= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:46 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:45 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 10/12] xfs: Commit CoW-based atomic writes atomically Date: Thu, 27 Feb 2025 18:08:11 +0000 Message-Id: <20250227180813.1553404-11-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BN0PR03CA0056.namprd03.prod.outlook.com (2603:10b6:408:e7::31) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b0ec751-1d1c-440f-3c74-08dd5759c6ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: shc5ZAFMNTqk+1ea2drL3FWXVG0z0GFwE8y7npf8ca3Hx11NAnhnT9i21t01udYAyTc28XwqMnZVGrkTu/F4S/idZxsgUpmG4fRolYCJ1y0jqHGxd5N2MyMr7E7G9h8CFvvD6L/feKJGS6nbGcpSgJIirqQYsF99HF22ve/niaabeC1xiSJtFnegQOPz3tRQ4T/ofdbAAQP/84/wMBdFnMFddW/ZOkb1k0ugWTEeXhCnSB9dk+IaZqSiLWUVYaEM2rvg2eeRzNGnjn3zi8x27hazI3dZZ3WscLgmdDV0PK9xbOpekihPnqmxs3knkkw1xIWbcFN7zRxmfuqq0h/IVH920ELgO86Wnn+BgPCm8GDtBPIYEYgBRWqxdJaaXMtNpr9J7SA04ldZk+2xFUl8EOa2FIuc/Tb6xQNwwyc3gTV+rWReoZdpiYurNAzJ5jw6QJVvl0OoVdmcLLCNe9bYvP//1kHjjHMIkFQ1uf6KHYBtxddPi/JRdvQwZuHzu/P73j28KuWAYCGzK3A4jcDpiqur6c87oeMYatV27uzLVmh33iFSWQFtyrsr50ZGgCiCGVU5LioT8iGxCaGqR8cu4dhfOcgSzaccY7Qk8lJrmukHNYqWByACgU9bNXeDTa/yArEhXhQGoxvAdmNSImsXNVOzozjmtCLXMcqVAbwFHYGmTI88w0ry7LU7flGaFUaX1n0ATCzZlKvqGJYqNWGGmQTDgTab6/htuc23fBpivjaMxkPXpTpvTr7LQF+iIhN3AN3Ox25O95vAVqfR1/MpzXvb0wlH0GMVEzqj3LAVWkPp5sS1cl2fRVmNA/xl1KOn56WNsC7q5bOrurD9LIJzokZQUijetN/E/8CXWL9PF2oU5FS0p/spZGKAL5qpD0RreNVQbLDA3+JG93qybNiAWiT9xKxhp50I6lxZBy8U4xlkPVq8CXyZg0LqFNAne1bMJQsO9w++GxXBbe+2qXDrvzp962/EWJUmXe0t66jyzMMSljWHvNiQTmZerjoxP7NWdp05YbIlzLwa3RU9BeaZQ4F7clOJxipbHgUiIt2VJBaJQhlyI/x03dUIOlTLY593sYQHth63Ns5zKtKMdksC+7i20TSDPVzwMxRG8cf3ri0cgqejiEEoScoW+oGIbOJyx7E/+DfixIzzwc17o1GR3gsouYurvOBHLgmRSpwfcAhhxt1sMWkI+/NzIU4QyW1NV2BfBjxNySKV8fS1CtmIWzEQQGQ9pmbNSxErsVUiyViEcESpl7HcxP7qtGQgy6sclEyi6mzfpNNEyDZ0KVyZPCmMbQoHvjFsbiLtsBS6J3H0OYwyTcV9jrBFa2qudhuGKc1Tcfq7vON6FpAkkdZuqh1ctxCBwm1t1ABwaIazLopE+M9ku5nM/kk7Ty3US31b X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AVonkEBbEBLn6Vw6EKtQLAL2KQyiDWS/SJESuhFZsYxKInOEoxH+jTBg+976MPh6gdWFR16gzW1ZKyqkiwyv5C53a24nea+N6mGVBw1clcYgSElhCjCsI4h1YbxqfoHQTvBwodWbumjT9JheH4Zrwx1t8bUSd3JcsEf7+sbjVbN8XRqeOxDZ04voP2NwPa5cAQYyCP1oO2DsBKFmDM/FH0bfDmdw7YH5nor/3EUEchPRvoFQxJyA4c13JaVUColT4JBQryDO9kZT8vWsQFQzFz0chl/vSeliRsRcFqRqBAFCGxnItNdPSZXJIul2F/RtuP7NmMk29uOf+Eh2kQNhOfWsQPX0MzbZ8+UoBgirtIWIaTRUwoIHgNuzSzT5zVQMbC06NiMjqwnR/5hMy7QE3aVp/B1OIYNKVvhMUwEeE1alBMXjKdPzsKWrTr7ZHi8zHyIKzbyeqyPhldO3HBHqcYN1yslOOPJH20Q9ofZ2LbtEcKcOB3bk8Jz7LCGQDohPJ//4DCIngqu3sJ2wQ6JJOB+eXuPtfBQReVIyezvyUyuMVZOgKSIW/bPN0pBIwa1HGNzlfoYWl9p3DwvmUlcelQdXFQDewP9ddbWIKIuEaOkUeLpHuD47zC/VjO/Q4qHy5UhhSlhJGdPAvgMjAyZ8IGP+T6Z/CmquYO5271LJbu+tRLLCOw8gjxIvPcYbj90BRNAgdfYzaWEmqbFmIz5pBxuoSEkzMlhNsQLNPMdnU09KyxE0UJRqPhgQeK7Ghke4iI3MevCUtWnjPDispL6eTID7Z8O9DPfQy+sCMLw59Mliaq1024of7/8NhKVruUw9B6/5k/h/rc+C7tyXXVl2uO/dXaAFwOtlipztAGOmdvZlHsVKI0uunp2xlXDieZMq7FoTE5Quf9YzbM0Mv0O1yDSqLiHrdOfSFGaR0rQ0akvMNugy1Oq6MGou0VqRIx5Ak7TBdqq3hTD0uY/1FQWM7gO+DLrurZpqf4WHrF2SNdU/PcSFOKTdwIb6WGNOzRkh5xgY41OPWQEO/i629C0NpSUJ2NmS5UZV9A/FfSaImkdMjxTqt9R/IUV8k26JqB2XMxAsNw9cAw0im58DB3z2vYCtHWX4UUgebO+8Au3bqjsC+jaq1WGrILC8el2Owxj7on2ddC0voPFXClhjjSZj9Cv19sN81jAGfTjbTl+DXl1tw+HIrjGuljLG5OE9xtCSdRBRDp3953vE79R4Aje56YnyFCMQTYxbs8unVkLwsPtNBbRGHnKy8Bv7z5C6zWkRpnbPVTEJMEu3to9YiMlcLOs/2hFzUCWLKYdJd04/+7/Og81aTYId9lIK3r6KK5U+N5kWOUttSwW7lcpvgbIvBLtZdlRjXIcULnCt2MxL0PnjBblFs2k9PUFK2+quUL7VlQ6xnQVmEGaEx2G7MoP/QQydIx+4kXvX91EjfxvtoAWCAuYMR4T7kw0/BM1+q9+hzRNQQcaXlnPO0rADdOkxYDXMckkFqf6N4vM5uyxMxCY/4OR8eNOjcgnlmcifQ5rldd7orPC7xupYt/T/FvvnygCJQgN8Hkuyi25xOsF4NkpcygjtK1Z2DwkgnS1vHdJlkNkvtF2zG0/E31pcs41LeQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: iAyPX2dV7ntTzwXsez652cecGcYQkCKNKuW7E0yeU5/q1OFPSsZHhkPtym1AA3o2LA0ogRXtsT35Bhu5CZerSVlrhZ6xTcMcTP7rCfJUuyoZDq8atBwK3HldTm5iTlIN6aHJqzRt8EgUpfBSKdnt94NtO020ZZEVNIUVGOm2ThxZ1lTeZAdUzbfGEAEG/nHeNKl7/A+nmVSEgJSrmDTo7jyX/36qJkUVPRrumpSuaVz1S+WQGTOBmH5AYgMdqGirYyCOkNjzj+UObTTmpjwgwN36eTP1MEsLDTR3i/Gy+qlV26X0cezKs5e0Df3ThoLlYxuDPDVw1vNeigBgYVw2qt3uQSQAWpK1M2mDxGsTuBO8xejr/M8pZV9imz7TCN0+tInpAV34j7pX2UQ0qTIHqrVXDWVb16/OYNg143fFTMDwrBTK4fi/w2d7uv+MsDpTLjTPXEiBrXow/FOF2yWN0L4aEm2ceip2r98efB7SqPBL7ZP8xKJCsFrrOCHl+t+VhQ7L+vvYkzKxwC9FLZZX0rSRnzTwBNmeGNzE0Hm+V8XAA4plRKU8CVLVaUvEJ7G4iKKPIEbV8AFxy9lNA4exFGl75iyjZIFZlILYDCLVTSo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b0ec751-1d1c-440f-3c74-08dd5759c6ea X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:45.8739 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cVldH+DMoJ0pxs6ig0N1m1y6gsYH9po6L2htwMmqzqVQ80p7EC+PvDn+jvKTh8iiJCEgWgqKSO4y/zVoT+VsfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: nmpzOX-lUVIg7AW-53yjiNaJL4RnKtH7 X-Proofpoint-GUID: nmpzOX-lUVIg7AW-53yjiNaJL4RnKtH7 When completing a CoW-based write, each extent range mapping update is covered by a separate transaction. For a CoW-based atomic write, all mappings must be changed at once, so change to use a single transaction. Signed-off-by: John Garry Reviewed-by: "Darrick J. Wong" Reviewed-by: "Darrick J. Wong" --- fs/xfs/xfs_file.c | 5 ++++- fs/xfs/xfs_reflink.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_reflink.h | 3 +++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 76ea59c638c3..44e11c433569 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -527,7 +527,10 @@ xfs_dio_write_end_io( nofs_flag = memalloc_nofs_save(); if (flags & IOMAP_DIO_COW) { - error = xfs_reflink_end_cow(ip, offset, size); + if (iocb->ki_flags & IOCB_ATOMIC) + error = xfs_reflink_end_atomic_cow(ip, offset, size); + else + error = xfs_reflink_end_cow(ip, offset, size); if (error) goto out; } diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 97dc38841063..844e2b43357b 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -987,6 +987,55 @@ xfs_reflink_end_cow( trace_xfs_reflink_end_cow_error(ip, error, _RET_IP_); return error; } +int +xfs_reflink_end_atomic_cow( + struct xfs_inode *ip, + xfs_off_t offset, + xfs_off_t count) +{ + xfs_fileoff_t offset_fsb; + xfs_fileoff_t end_fsb; + int error = 0; + struct xfs_mount *mp = ip->i_mount; + struct xfs_trans *tp; + unsigned int resblks; + + trace_xfs_reflink_end_cow(ip, offset, count); + + offset_fsb = XFS_B_TO_FSBT(mp, offset); + end_fsb = XFS_B_TO_FSB(mp, offset + count); + + /* + * Each remapping operation could cause a btree split, so in the worst + * case that's one for each block. + */ + resblks = (end_fsb - offset_fsb) * + XFS_NEXTENTADD_SPACE_RES(mp, 1, XFS_DATA_FORK); + + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, + XFS_TRANS_RESERVE, &tp); + if (error) + return error; + + xfs_ilock(ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, ip, 0); + + while (end_fsb > offset_fsb && !error) { + error = xfs_reflink_end_cow_extent_locked(tp, ip, &offset_fsb, + end_fsb); + } + if (error) { + trace_xfs_reflink_end_cow_error(ip, error, _RET_IP_); + goto out_cancel; + } + error = xfs_trans_commit(tp); + xfs_iunlock(ip, XFS_ILOCK_EXCL); + return error; +out_cancel: + xfs_trans_cancel(tp); + xfs_iunlock(ip, XFS_ILOCK_EXCL); + return error; +} /* * Free all CoW staging blocks that are still referenced by the ondisk refcount diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h index dfd94e51e2b4..4cb2ee53cd8d 100644 --- a/fs/xfs/xfs_reflink.h +++ b/fs/xfs/xfs_reflink.h @@ -49,6 +49,9 @@ extern int xfs_reflink_cancel_cow_range(struct xfs_inode *ip, xfs_off_t offset, xfs_off_t count, bool cancel_real); extern int xfs_reflink_end_cow(struct xfs_inode *ip, xfs_off_t offset, xfs_off_t count); + int +xfs_reflink_end_atomic_cow(struct xfs_inode *ip, xfs_off_t offset, + xfs_off_t count); extern int xfs_reflink_recover_cow(struct xfs_mount *mp); extern loff_t xfs_reflink_remap_range(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, loff_t len, From patchwork Thu Feb 27 18:08:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994991 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 0E04F26F447; Thu, 27 Feb 2025 18:09:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679744; cv=fail; b=uGmtsdkt6En9Q9t0zSArsT1aS4qDK0VW4DYqvTIdGSYeCiFxUVTrBimx6fnus1gkyzG+5fvnC7s88B6kJdKfKF2VRmE6Ws0mGI27WtBHBHGfdMAjTDaSqj+H5/AsXQSZ4rotj9QMCiDx0Evp9w+uKqBqke+SHYK7oxDPubzJXbs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679744; c=relaxed/simple; bh=HXZAfDdtHJOSIQMzZzhfmlgrqnh4AceN9fI4VR9x21k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RvgyyB8kV13qHC6M3sEKvKb+2gMqxkbdB90F63Oxs++FqyvmP+AJ8ovqDNljaGuqBXLCaikMyJViDsAvJ3Tiz3C3j8+Ih1RqvlFOp/lAwIy8jyd9PPdR0n2J//QyP9TVhdYvhtRWFHS8el2Ff/csUK9EfRtwHnb8Z5yv8q4HqVw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=Xij1VGzi; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QiQ8gtib; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Xij1VGzi"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QiQ8gtib" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfkgF018396; Thu, 27 Feb 2025 18:08:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=ExND6N0l3au/RHo/27D07/dBkt3h9j8UuoJMQoYZ0v8=; b= Xij1VGzih3O8zpIHPJArgtks+Cb8zVvHDaK2JRA4jsRZ83PIfpUT/AVU05VTCDnK 4rcxcZhHUqxcGroNdu9/4/3LCTnM4Wic/tMz8gTA+CIScrMptYgLiaYHLE5u77Kq XSBHfP+I5lfU+bhHnSX8i8XCopIzC2hpn4TsPH8h+aoZ5NjA8iPMR1yQ/Y51sE2G XMQEOP1vKHY94WZI+4NPDv5VwzhrxFLemnuLbcI1iS8vzwbQkGmWj3hoHCI5nUwM 5h6z993Euej/dahIlDJh0tvrGnZr/8I2/nJ9oiO7MKMi4SVOFxUxsysmMXIbW2Hv Nemvz0jgLBWCWpPxTyG02w== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451pse40m1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:52 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RHVKR3012522; Thu, 27 Feb 2025 18:08:51 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2172.outbound.protection.outlook.com [104.47.57.172]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51dqknq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K095Ofq3hJ4pgLOIAk8OHJ3YcTKPb6Jk+S5QcnQsRRpyj05paXFi1ym0vlpvuSS7E/PKZeVwshqlDE0W9qOn0chsnpiiyLTvasCp5ACzSVAZwt0G89rlBIBaBh0JgjxtpR7xVfiBOECRF1UbBD3lEgiHWCA9F3bAMc6Gp+RsMv+YHqI2bIoYLIkAcOsJ65W9nbgHSRU1so4VQTdaHGd0iU1q0TFPbXR2F3zcE+f+WmIYu5BC4GRM2zdT50/0AEihC4CH7fN7wy/6xy6Vex7ncAO0qmGJVnnut3OC/paRVWPeX3HOk8Cuo4gzqGOOYaWpL0YtXze0lEtY2wiY31jIwg== 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=ExND6N0l3au/RHo/27D07/dBkt3h9j8UuoJMQoYZ0v8=; b=ULD/9tDFdYW/bA1Udnci8/SWth5pY3MCsrWo1NJ968quKGD7u0kP0h8i1MJ7Fukw1OSd097Q1D44UbOIKZS8170P/HOiVGhTzE/zAyySbtrVESZhgGffli+uyuITmQoZeviPYk/rI5IPJ9RjpGCgjY5+Zf+RRzEDdoQIbrf0C2bkYrLXyB39QrKAIr+ju897pb4cfMMCnNsYvbFHx3kokrEmEXGMeeW/xIEZGQJogdJlmG5myxk2vJG0r/SztnS1sDes3ukur+VCkbqzZj+N8ZgqrdNhivkrzJBum93ydW2fU+QAm6NAzJBrp8hx7WBxIpsb6wjRfJaUzYCQJwNJfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ExND6N0l3au/RHo/27D07/dBkt3h9j8UuoJMQoYZ0v8=; b=QiQ8gtibuNZyViyK0Agx+4cpt7LD3Tx4V8jUmr4PYQMG1iiopWBkZCPU/bu9N2mNwDD6s1qXURMPSusxdjlWOkWsDUZ7Lb1aDZzCRe7pGY3HPH+g0yf1nG2A/YRP/R6RpQWb5agQozm5MG6ofyAvcNoeAatc2MIelOUoPPZFpqU= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:47 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:47 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 11/12] xfs: Update atomic write max size Date: Thu, 27 Feb 2025 18:08:12 +0000 Message-Id: <20250227180813.1553404-12-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BN9PR03CA0358.namprd03.prod.outlook.com (2603:10b6:408:f6::33) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: 11d96dd0-7faa-4006-67a8-08dd5759c7ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: EFXr8qCMcnKfSiMR/Uv97gnN+m4MKhv6K5l1aE4FNP0C2vTKVutHa+2sv7/IzUJM2Alu030RoZyjyIqUA3tpZdEI9+77NPu9/JA72TLuJhOcmSMqRQOwokJlVs5XtfTSZOJBKEEfVy8WvZaJcNt+kNmWx4VM9kxkVxJacxCs/gDSwvui1kafNa1mJVgTponufg7QLv3ufvLlVpGHG4F9dxF/snVglQLzGkh001zIW4OIt6vGQ+8k0ObjWneyaNLQBlOyE0F8w8sqP/9jZqgpcNGqME3H5oOs2WIoNnlDXIMNQf+8zbjH8uaueDqUI6mY/oT6DmNa0/+/islJPvWGG/PkeUpYc4bUiom6rysZDz808dqu/Be5Dp+ulKrodFiSvtRFGicy/pW/8l/F2NE3L1Q5UzBzKRSGOgS+YeonK/lVnfH2q1Dh0uhO4cgBDo8KtccWRuPQUTrCYBgq462LiGOa9lKOg/Bo9Mflx3q7NQ1tFzF1Zysfg0aVF2w1JWeabzwavbw6Ze8kMQqr0RQDICjTX0m7zFTL5FHvo++yRU+J44UQQ0eXQxtdmV/R9jPCHXY36hLqMZ0NRXl+FFDNVtdZaGEHDzXVD4/91QYX7fy3UysXlvnOBxjv4czI6IGdkCAvP5a04ljmpLhpKusW27PIDOYF0E9gWHub9D+yxZe9BHk25h5+khBmULCTLG5Xu2wQLJVetxkznLSYRAOMxYSKiIm3gdluFarysE4Bm7xl/n2j9cHZUhf4dcPWCeG22wiJv8f54UU75HyLeK7snABvQUNJqHLcqEIp9B6cBLYTKCoxPcXvdVRaRlUkiWTgRfycjvKSZAjmET8kE/jYWrjUOuUBHcz6Y82XyRgqKVuosaekWFvodVYdZJPofsgZL0n7hRHsHRB24LGwmfT5UvHowGaOSLTrn/5Q0BUDaPIpSl4BpdB2T/Tvg7XOvJyrGxOBRY/+HzCEJr7+TIrnNnT2IP0W9fzuu8hAfKaS80qVN82kMI7Lsxm8m9QPQKK1bk9IsdithAX3bCbG3CAFJt2JYnSSEyCQ8Obr1d9ppzwQWZKci/OZBTn0ejL0jMK0PU3SKe+udA2LCKtvL9t/KF7UxV6/sw6YLNsSd5SC5oI3mpCtPu8m8wc+rZoa1JN2RVqI8+yWYNzz7MnGvwgZvktUdwnDXLIjclSIh+rpuMCLkR1lPiPNjSIPw//KIO0zEdv1s0pNL/bxEUCTkLhRX44k26bCgM/mLPhDtF6uMeth2fji6aaq9AVP5Je54upooY214B6H1KGk8IiIySx+eNESKJjiGUfMp78/Xq1FkM9xVnLzOyH8wB6iuFP9Ykq63BurMameQitq/d13oeWvHscD3547MCr5eE2+4mN54M3ixW6Zlrv6uuT1gvyl5Frc X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LdloIaNrZE0+ekpyPC49m3MgLGjO7JriniylLJ4hJrfFnPdpfQSmDW8FFLWZC8qJxtndM+bpQ1ynaGXfJE+wqjN8SmtBP0NbJ86MHi2rmbPvhZPhGVXzCOrBRdasVdnbxxsAIrokZpmsriUy8wM66PhEzl2M9XnMFqA9HkjS5mPQcZgniVs5nIIcCDc5o6bB2SDekh/bo/tyZ8ZbzgjKc3kl5Bqhb1maACKYaelw3fHjDs7qG5TaU/vYatqJ6GtFwTEcJn597lyzU7LdCo4pW3WtwhEuZr4gELKK+XUIFJZa/InEckAZ9S43PIzIcgth1CtMbul1byYylpJKTHzmKAsfm4jvp3IuEzImHZV4cfMFdRkLrZ6g4ZbNbOog0wL0MeJaN4gwkGtw7/bn9WtPdSFdLX6cGdhvqnzCrPqZT1Fhgqe6CEZZFy3iJ+MISySKvY/s1mKKtSDZOibYZDFsamtr2U/oEoQpviB22yqo6IHp/Q1iWxxCRUakrNwnp6c1gaywmMYapfwZoXyPnbRpmq99RIfBUpTMqxt68+6zE4qFk/o/g+hBVwpLqVJBmPjfOzwLAuwUrOCcMKOjeQBYv71zpNM1rmilSGb0LMTkP7u6wXMYkKdEslWLNR65exDJHtbZ+oATT5baaqLi7SGLHkEnLV/1mssN9g2IrCgwQZ6p1feASTju4jBPn9CboE5c3GEOh9BqdKRVwa5X1xIwS5pybCXo7IQRPeB1PRNE8QxMTFM2tyROo+tT7xyc6ptImlzqgW7IT3sQ6Sl8Qo3N/yDuhBM0Cz5Cs0p+4cQl96UGOWrydNaYW55rC26eDsQWFo1L8r9OumPYgjDMNeIFPa1AdbrlSQCxDxEPEZ18zdTfk84b0QULBSPO574Bw1ub1K8Ux+T3tFHUb9CFzBq1xY1pXrCxnneBhPbNnWwwmlWhRdTviDmbLY6lVKOhlSJomQSr3pF5U60gCg/JvoHbwpRMNhIbti8AcB1l/AmhqjXpNVL+jn7C20Mfsxfrquq5tGi8A3P0KoDN7c9bdw4Sn+CLBglBgdNVVAP+59G5RGtccDWM6vOxnH75asCX/hExgoUGo8AjyBmdZxCkStZqzRHeqbVawukjOYrOjH7tBKN00LDfbZXdTE+16sDq+gxbeiitccYpL7rFUIKFuFJM6Im/PdSxJoi8i5otEEJk9gxlVb2T8ieE/gO0uXLmnYJSyKrqvsaQ94BBMHoGvk7i5uFfKQ7xqIOQ8ikus049aWkrK2CkHCMv8FjtQnWhPthjh8IF8BqmYpmRbO0mLon2sGtEz7ybo/4GX9GDsiZNVzwoksHtBghccTEv7PZzPT3CtXUb6kk1RjmWdfIjIYNwbYa/w2hPNa5SJz0ho0UiAasyfRdKS/O4e6VAv8xIK5qNNeo181w8pJrdeM1qjdufbQ8+wgl1fyThF5W+bkZFQNNFfL3tQ+XxcNCuSvl3g1L9BoKQDUGnHtfYFtgVnm7/Mwfm0LTlTpy/0qyEGfIg12xOvEOWczYeO5kzVaYhPzPPowi+rMCcR8JojGThfY/3yqX+W7rFSTSiUYVTyl/hGWyHux5leRQaz6t3ClFL674xEDQOXyGA9XhHVsy+2Qp2gg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5R2ObpNXdV7dgCwlCdloj4x6Pcg2yVJ7xTpYGiP/fz035DU6vqZcXXIpas3v5aAZ0T0rYsV07WVr2wYD47UHV8tYgYavf2n+GEW6cxsBvmufKd58veCBUplwJ1P2siYuy/P/X+D0ztlWVqx1M6x9LPZK393MkBT4eMnIUNpgtx2OhT7sbkP/BcY3XnP0jInYHxbOB3ZjHk3i9zPsRKDH/wO3tWOZ/RnyIZENGU9O5v4q3tmlMm8zU+AWitDRV7EKPaXURRgUxf0EkrNKSUCtQuYK7AE9Fw9mduBAOJYjTa7ocizcBVWr7u9a/9I4d6/9enD4MX0/c/OK9eMzKDH0pz2QpLFOEzB+BxGCzrlhtl0t5O7MRaLSYzb/y6VBv/tiAK+N4POIN/kzDll3usG3XbBg26sbiVQ9W2Ca2XrPJ/AIqRkP5N1JdZrtuI/831wL70C/f1jyGYQaR2aHT1iAIg29HvinjraMJaiHHA1Uo2XqxeApjcEoENOY3PJjRqm122CyzUmzZQT/nOq9cOge3gtIO9hn8MSeCKLkWz8q7jJHTSh2NN7m3ugNIlmrjv+hdQV76vOMAQeVyY7OQark9vQGomZebQvZ48b6ZPfGd0k= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11d96dd0-7faa-4006-67a8-08dd5759c7ca X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:47.3491 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qq4yBX60xuolXe8v20xxhuF8xMc+DFEoJ47/dJOGLEysfyRLX1QHKLn9Y1Uo7dgGXasEqxHSmZE/zkslhAqQgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-ORIG-GUID: aFD8hGaSHO4MLaBACxkTTg3laik4s69u X-Proofpoint-GUID: aFD8hGaSHO4MLaBACxkTTg3laik4s69u Now that CoW-based atomic writes are supported, update the max size of an atomic write. For simplicity, limit at the max of what the mounted bdev can support in terms of atomic write limits. Maybe in future we will have a better way to advertise this optimised limit. In addition, the max atomic write size needs to be aligned to the agsize. Limit the size of atomic writes to the greatest power-of-two factor of the agsize so that allocations for an atomic write will always be aligned compatibly with the alignment requirements of the storage. For RT inode, just limit to 1x block, even though larger can be supported in future. Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- fs/xfs/xfs_iops.c | 13 ++++++++++++- fs/xfs/xfs_mount.c | 28 ++++++++++++++++++++++++++++ fs/xfs/xfs_mount.h | 1 + 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index ea79fb246e33..d0a537696514 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -606,12 +606,23 @@ xfs_get_atomic_write_attr( unsigned int *unit_min, unsigned int *unit_max) { + struct xfs_buftarg *target = xfs_inode_buftarg(ip); + struct xfs_mount *mp = ip->i_mount; + if (!xfs_inode_can_atomicwrite(ip)) { *unit_min = *unit_max = 0; return; } - *unit_min = *unit_max = ip->i_mount->m_sb.sb_blocksize; + *unit_min = ip->i_mount->m_sb.sb_blocksize; + + if (XFS_IS_REALTIME_INODE(ip)) { + /* For now, set limit at 1x block */ + *unit_max = ip->i_mount->m_sb.sb_blocksize; + } else { + *unit_max = min_t(unsigned int, XFS_FSB_TO_B(mp, mp->awu_max), + target->bt_bdev_awu_max); + } } static void diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 477c5262cf91..af3ed135be4d 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -651,6 +651,32 @@ xfs_agbtree_compute_maxlevels( levels = max(levels, mp->m_rmap_maxlevels); mp->m_agbtree_maxlevels = max(levels, mp->m_refc_maxlevels); } +static inline void +xfs_compute_awu_max( + struct xfs_mount *mp) +{ + xfs_agblock_t agsize = mp->m_sb.sb_agblocks; + xfs_agblock_t awu_max; + + if (!xfs_has_reflink(mp)) { + mp->awu_max = 1; + return; + } + + /* + * Find highest power-of-2 evenly divisible into agsize and which + * also fits into an unsigned int field. + */ + awu_max = 1; + while (1) { + if (agsize % (awu_max * 2)) + break; + if (XFS_FSB_TO_B(mp, awu_max * 2) > UINT_MAX) + break; + awu_max *= 2; + } + mp->awu_max = awu_max; +} /* Compute maximum possible height for realtime btree types for this fs. */ static inline void @@ -736,6 +762,8 @@ xfs_mountfs( xfs_agbtree_compute_maxlevels(mp); xfs_rtbtree_compute_maxlevels(mp); + xfs_compute_awu_max(mp); + /* * Check if sb_agblocks is aligned at stripe boundary. If sb_agblocks * is NOT aligned turn off m_dalign since allocator alignment is within diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index fbed172d6770..bc96b8214173 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h @@ -198,6 +198,7 @@ typedef struct xfs_mount { bool m_fail_unmount; bool m_finobt_nores; /* no per-AG finobt resv. */ bool m_update_sb; /* sb needs update in mount */ + xfs_extlen_t awu_max; /* data device max atomic write */ /* * Bitsets of per-fs metadata that have been checked and/or are sick. From patchwork Thu Feb 27 18:08:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13994990 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 D093426E97D; Thu, 27 Feb 2025 18:09:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679742; cv=fail; b=cGj2gmgYLmHf47mlJUxtk+v1Z4i2HUffAR/nJqZ38OEcziNQ+YxU/UhUDjHmmZDcp5kQnyThyCsoTwjkBz88weNmfmIjl0K6CPQuqiaBCe8Va0ycmgDfJygDRieGvsjtWIkDQC3CssBc8G232L264izj5IhMwIQy5RRhriVxY9w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740679742; c=relaxed/simple; bh=Ew5mmVK8Q58H3hyOE3GF/xUDrrAIp6SiKFKY0WOHiKA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=XOokr+V4qWHnMzWuiZca+6IRoFQmRcayi+QIIHAfjquIl+PKGz11rhBpB2nEJL9WngSct1oR3PXgwDG4VGoVeqGlRXBwZPIz5DdycpWHxBRvh1mrH/aDlHlyL6f0cqMJd5KaPzBxsernxc/vwcV2JPsyk9q/1RrftNBXZHgzH4g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=IpMuPlvM; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=bIBGnrHT; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="IpMuPlvM"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="bIBGnrHT" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51RGfiuk016050; Thu, 27 Feb 2025 18:08:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=NyicfsSOcVUe3XC4hGKHkWG7h23c6u9MWAkfr3bmx6E=; b= IpMuPlvMZ8hjntYS9i4tG5AOHGInxpMAMzRBBTux5byxg5rnyADxrIrDp/kNkj8d 5zhRdKbMc/BCaWTAo67L7x8R7Cj+GVnkeV1E+P9xdeLPKgtc0ih++1OLW1A91cQG VaU+YRvYcGqN25dhzyW/7bQ/ldFIpQo0E+xR2PqS0Fh/6o62U7WLLNHV0Wdga+JO s01k2zAZGIuCDJBzRHKENyPTJ5RsM5GJcxq869zPDuD6/xZwNPIzGqOEM8iFpUNy BVvmjNPs5tJnim4Knx1RekSZUMbUhIqde4YHlWG1Om2wyiUrRTo40kvsAL7YhAkI pHuTemh76/3OUPCzPlNr+Q== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 451pse407w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:53 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51RHVKR4012522; Thu, 27 Feb 2025 18:08:52 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2172.outbound.protection.outlook.com [104.47.57.172]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 44y51dqknq-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2025 18:08:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pGuOh9+6S7N0eXXu7wqXW6hyxG2pEZgwkYxkhQnZ+Wzvtj7MzeHLmZg+m8wR9mtsuXCnVIySmjIllu/dnlvuG7qWaq6PKLc6EvtCKve05yibXlunoKbftT1+Y7T6ng07WfRIkhz5/IXvaTdnfXLofptxDL29d8YddSOkgUk4rM2Q41gpNmaZ/St06xFMu67NyX9v0TH7kaWB36BJxVEHyORQd2WIv6UwgJSWicNq7Fi3h+JJvTBZmj7sAw65VED6HsGM5p+whZd/L+d9dLFzsH5k/AIoRC8VKavLm/KFlGqYBIHM8U3cgs/hxuwqmtFkMk7Pg9RO05WdRSM76+AiJQ== 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=NyicfsSOcVUe3XC4hGKHkWG7h23c6u9MWAkfr3bmx6E=; b=rlAQM+Gn+4MaXQvJTV0MX0g+ctw1Vbv6p6s97c8rboMofi0YJ1BdgVMcw/xQK3TTPL2FaQmhPvuPTVRpLFBiCvcavFrLo+1j0u9SlH7nCVJpwFiJG1hGAE5JD2d743PwTbYu4MQs4tamGTA5DA6V0FAIVKIQ7G9kh/+tcrbtvZ8Tc1P8ccUPA43WGt0G2cNP0qSyVKXVzkraIdEiCnr3uCRh9zjcb8c9YbjNDe1dAW7CXdM3dR5ME27pZSH2Ar1V0KGVBrFafkyMZ9XNpSz7H0ztuP0NlDhUyE0JALdc9iSRNPcjnZ+8l7Abmqq61GtwHq3eBPTNm2ywWfhA+8BQ8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NyicfsSOcVUe3XC4hGKHkWG7h23c6u9MWAkfr3bmx6E=; b=bIBGnrHTIrKkcv6QrvRezj71+5tLA+9zQScfAYIymswj9prV4mBfyCb+m76ItIxrFb+ynd/39w4l2LKa07kiXfFMwNqsedinb3zQo/qGOwUr2ZD5QGRgZB8Q09Ao2Sk/v9SiJ2vHSOeGmucucS1uHcJH1+iZFfvHEzk240L6jXw= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by BN0PR10MB5031.namprd10.prod.outlook.com (2603:10b6:408:117::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Thu, 27 Feb 2025 18:08:48 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.8489.021; Thu, 27 Feb 2025 18:08:48 +0000 From: John Garry To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu, linux-ext4@vger.kernel.org, John Garry Subject: [PATCH v3 12/12] xfs: Allow block allocator to take an alignment hint Date: Thu, 27 Feb 2025 18:08:13 +0000 Message-Id: <20250227180813.1553404-13-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com> References: <20250227180813.1553404-1-john.g.garry@oracle.com> X-ClientProxiedBy: BL1PR13CA0380.namprd13.prod.outlook.com (2603:10b6:208:2c0::25) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|BN0PR10MB5031:EE_ X-MS-Office365-Filtering-Correlation-Id: eef67bce-a0c3-4a5a-a158-08dd5759c888 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: 8miQUIDRkOTfv0g/tF1BLR7IHGLE8qi32d6hFSiTctO52MJqWjlj86Ff2Ko/oiUh0MnsK9k81+NxSIWMfvxFlCmUoeqcKCPlypSe7OsUmrXgZnbGLkVbyN/cdmo6wfkT3kWsXAG//ppxKepYxn52WcTlLwgY02qgGn2NoSF3qzvko0GJV1fkf94xWzBwMQ+InBEkXDeRQVNuY6HvAnezL5LJtE7mRvyqkkbJqfot3pr784g91ji2vxTqiO2jTapx/t7wdklFC1/xZ6dsXGF3dsvx3jecJuYN7isY6ZmExhHZkkRWq0FwG2dWd5cHj0CVB/LZEBO1vr/JoMMVa/tqX1N3BBI3Ij3HLP+k7It8B5erIM4SxTg85eMG7EGahR7zz5NSMPpXiO7wKokmOFWOCXaKcgdspouFGgOm/8oDPWxWFMLMRqxvqNO8yq6eDP84Dchtt+xCIZ6TX4tkZ0y+4PjFHm1j3bWVM6o5WPoaV3rjREpH/LTtoeHSOLvPVpZ28Uqvb6KB02BVMmLnkX9C/f8Y1j4llLZtVNvt2fn2q7NvjNvoJbHbH991mysrXgCUBlKyAgbyLD8mwhiuTHScC58y9JsYI/vInvz7SJEwqN1h73SVBbw+/wALZyn6l4XFSpjT0H2NBrHf4lxBX37CglNoHmACB/dbNldQi6esixM8/aVNqkPq6afjUi8iEB0r9+IiL4DumVeXC+rO7xyeCe+qdw4J88FjCT0UIBDHK2x+6DJ5tIp0ilZ1R71XgYK5BhLv7i+O3QJrQb809WeCGl8LLqf1yMmaYXmM4GkI10RBqpKL3R1w6fJe5ruQ2fcavzeF1MRz4uKbmdXCREPRz14DHBjRYZJdPjjZYLzR1QYzkNfvLKv6vI6e8TzbnOipr6KPgOv9/Cg8SmRxER/FQh7oxT0QTvvxrvLyy02YF1zwA52jPO8BYke8z2sSxkFKyECVUuRLqPwa+AB9YWMi0VeNuApXgp2FKYZGZoZpuW9YAeSgdJtUlYfvtmennXa3fltTNc3SRnfTTOlD2xoHZqheUobp7rm4jzEzR593aC7rlj3A1xsqaS6d7m3GHV+stUqHqjpPzdpOSNm0lkzVpEYIC02uH7rWERVTUY0YjIJWpTJby5ZgWC/uza74Frpg07b7fEwJPrefzvvEU8gLzcx5PCLqLAxlJ0AesDc3FkVcm6ToUVC67NBVKgBzGKPACdVXfbMefl216ylpSgrq+p+LmPlmXe6o5ABYE+zr3whQ27Q1hd4vGc2lVMQyi+mEQqJ5GcO8fKJiTmT0uSq2PmA5JnSJRNmh9y1Tj9xo11P+mS2wr3Zs2KdTJivfpss+YMetTpGVAxLiwojd9NufGRBp9e3AuWyxhqGm4a4+FMPRLz+dhwrsCRs2CMXaoMqK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ivbXHubwpM94bTNeg4WhEWQtgYo/N4qmTywo4e1GSKdRSO/J1Ygt0BGNRj92HtRcBzDDcEshyf7elaDxkVv8WFVXR1V0pjOKFr7hOZraSl3NYQCeM4W4EEjVCrxOu/GkzgHozx3PJiLmC9nGp0QsGiF+DQv5hTm63IesJcAWprY6g9Yp4o+PNsZQscWcwZGYZSx2CUhogKtfFTCjkdjq7mSI3OYIk6Ta08CrfVbakcC4RVhieFJ6Xb4OIGh+TeOvaY5JfePkHhTTvYkVCKZoEsNl75AhwPNxFaNkl7aNMtAF+aA8xv7CMBpBnQbcKavpW0yVDCiS+LzRAJtdC1p5VUt56hZa/OWTlqUhRmzNKEltvFNwXBiTffr9Uyz+5olw+hXgHKJqtfh/FlKMx6Bo+aMFeag+Zvm43UJFJf/OrnqDj2NnnKxMGf6iTKHg8HcAjvmhp1EkFZXAZ0If9thGek6anr55PkO8FuPRIjqXBC/v1sLpw9PWORkyo8pKuuFw5bO5sCkqhgkYk/wvK2e+Wn5TjT7sE6P26CYl2iMJIrhxQTf/Ht+tGkL41DvpnChLTEVFwE1DfGRdm2NKCQsT3VSSi3ZxIT9rM/MYlIRYNH+BXHFS+2mtEl2B6W4f5V9H5or+ElkJjZRVj37oOT+AlxDkgfqet/Kw/1r1fmfAEpdBnq6F3AOkFgd6OIWWbL+AiUO2O7bpNQ2WjoHMr4S4B3e/wrPCuEri/Iv2Yi2lCvzrO+bEeAigAqZGk2iNDYJZsUtcwsam5sTP+5V5sYU0geVSWrVqjYXTMxpMC2pqcb550v5Mep+b2Ku2h19P0s4e5yDlwP1DakNVHdFe3Rn1hhvjxctfeRcoIJg1huhw5pOd0uetcwp9hOB1WUw34MipazO1KcOEwIi61x21whKOWjebBMVmnlVz6SW4VDGZRKxHW8KRS3Vc6Yk8GRdxsYzo+e08Z62aekG9MLi2HnpFyb3155HG0/1H4uXkEhNGAYh38IUYgFpG+UB6UAsjx540173TTG9PlFUc2OutSdSUwXvlKGXJhMuyxdXCdqkEeLPFn/IDKeMBOMO1+W6mdPO7KzqdKQytS1NdPNrCpvytqGtcBKRNQJG9N9ayVQEqPFpB0j5HfrKtdyX7Z1IXGZRnxcrxzUvYIvZl2GztkTzoaGOsWFF+FcLDGhNMmgtXamsDs+344IZ/B30cW49ZBvUr2eHn52B9rpIhwYSt4H6MXH8nDlv++638LRvGts5HydrpqmtgDA3Oo/501LodW+NrLJFU3FqMBdXfL1WyT5PSK/l8wvpRU5hSSt1PlFQFnwLYBuP6H3RXv0po95BRHWxY3zMM8vgnoV8HkD4rwnMXj+KPTw4XF+rs2JT7bTPKAxTtiCGVAdF3qvdnEM127tduPyqTUKmEcidOGB8Wi7sXmh8NkSs+wEzPLmpmHcWRc7Ktn3YPw+Bd3SsbwrByMaBIN3vka/OX5S/tBiK0ipU0U6oEK7M1fkkVXzfDdf9jgJszwFUmDkFe1+Y6kE8cTxsCoZKcit0tPmzw+OMvCLdbHpyQq8bGG9PQS4/7OTffzQcnBeZuf1kYH9ZWAcHsjVh4qvPTQ2x2VrxN/g2D7DVuhQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Iu01Z5AevwxhuGBNrzKXhm+F3QnmorXrm0My5tR5hlgCBbbV4I0olsGM/sBABe7mZQeNP0t8ELZGXhHKGi+eO1qeQ+s22qpHWd8IhwHHS5jUoAcvDjXZDn2zo6n2+5AkNyou88ivRWnwPVdbkrRjDTIB4KQmlzKunhCTfX7cBaKqmylVNsTgMw+QYL9cTlOgj3mb9v5x50iEUtbosSQcHWP7QKDpklfHjerhxK9fEjG5XzMrukDj6tL2eFgj80GOCppBZKfWAHIZdz92xLzbMkhQbMZlUwLI0OtQZSZ2Nm2mQXoRyYl37Xo8UyN+3RFsnOVuSqbRtT2O3j3k9J7QA/tv0jGjISWWPs+E8H/y3/GW9I5FgHm5mceZAAO3BwuSR9vnMxt3193HPrRw42+m9K5kBK+ky8uFau5oJ3sfyqDdenTp+3AQsPgL4ERuuTLNIk7+ki9IcTYua4xNyRNa7tSRmINMo8GP6MzuBafc06zxx5dG1jhPs9jXrplVEFIwEd1M0IM4ImzqiPCI3bIF0r5HMJKObandoTJQ4RYbLno0uFvNY+qfJaTjQEUr4bmVvEj+gvLj72zkRcU640/P3VB4QsEUWO+rcXzKIxKiV30= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: eef67bce-a0c3-4a5a-a158-08dd5759c888 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2025 18:08:48.5911 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tHwuaXuAgtjhpD6201MZrcLyWNdEgNZw426NRbVzVefZjdttGgUVRnqkpeLCAiMFqvGdhDrr0WbOQJTMyKojhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5031 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-27_06,2025-02-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502270134 X-Proofpoint-GUID: YcHLTEcB7JXmc6r7T2Pq3nFsTnYsTDKn X-Proofpoint-ORIG-GUID: YcHLTEcB7JXmc6r7T2Pq3nFsTnYsTDKn When issuing an atomic write by the CoW method, give the block allocator a hint to align to the extszhint. This means that we have a better chance to issuing the atomic write via HW offload next time. It does mean that the inode extszhint should be set appropriately for the expected atomic write size. Reviewed-by: "Darrick J. Wong" Signed-off-by: John Garry --- fs/xfs/libxfs/xfs_bmap.c | 7 ++++++- fs/xfs/libxfs/xfs_bmap.h | 6 +++++- fs/xfs/xfs_reflink.c | 8 ++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 0ef19f1469ec..9bfdfb7cdcae 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -3454,6 +3454,12 @@ xfs_bmap_compute_alignments( align = xfs_get_cowextsz_hint(ap->ip); else if (ap->datatype & XFS_ALLOC_USERDATA) align = xfs_get_extsz_hint(ap->ip); + + if (align > 1 && ap->flags & XFS_BMAPI_EXTSZALIGN) + args->alignment = align; + else + args->alignment = 1; + if (align) { if (xfs_bmap_extsize_align(mp, &ap->got, &ap->prev, align, 0, ap->eof, 0, ap->conv, &ap->offset, @@ -3782,7 +3788,6 @@ xfs_bmap_btalloc( .wasdel = ap->wasdel, .resv = XFS_AG_RESV_NONE, .datatype = ap->datatype, - .alignment = 1, .minalignslop = 0, }; xfs_fileoff_t orig_offset; diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h index 4b721d935994..e6baa81e20d8 100644 --- a/fs/xfs/libxfs/xfs_bmap.h +++ b/fs/xfs/libxfs/xfs_bmap.h @@ -87,6 +87,9 @@ struct xfs_bmalloca { /* Do not update the rmap btree. Used for reconstructing bmbt from rmapbt. */ #define XFS_BMAPI_NORMAP (1u << 10) +/* Try to align allocations to the extent size hint */ +#define XFS_BMAPI_EXTSZALIGN (1u << 11) + #define XFS_BMAPI_FLAGS \ { XFS_BMAPI_ENTIRE, "ENTIRE" }, \ { XFS_BMAPI_METADATA, "METADATA" }, \ @@ -98,7 +101,8 @@ struct xfs_bmalloca { { XFS_BMAPI_REMAP, "REMAP" }, \ { XFS_BMAPI_COWFORK, "COWFORK" }, \ { XFS_BMAPI_NODISCARD, "NODISCARD" }, \ - { XFS_BMAPI_NORMAP, "NORMAP" } + { XFS_BMAPI_NORMAP, "NORMAP" },\ + { XFS_BMAPI_EXTSZALIGN, "EXTSZALIGN" } static inline int xfs_bmapi_aflag(int w) diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 844e2b43357b..72fb60df9a53 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -445,6 +445,11 @@ xfs_reflink_fill_cow_hole( int error; bool found; bool atomic_sw = flags & XFS_REFLINK_ATOMIC_SW; + uint32_t bmapi_flags = XFS_BMAPI_COWFORK | + XFS_BMAPI_PREALLOC; + + if (atomic_sw) + bmapi_flags |= XFS_BMAPI_EXTSZALIGN; resaligned = xfs_aligned_fsb_count(imap->br_startoff, imap->br_blockcount, xfs_get_cowextsz_hint(ip)); @@ -478,8 +483,7 @@ xfs_reflink_fill_cow_hole( /* Allocate the entire reservation as unwritten blocks. */ nimaps = 1; error = xfs_bmapi_write(tp, ip, imap->br_startoff, imap->br_blockcount, - XFS_BMAPI_COWFORK | XFS_BMAPI_PREALLOC, 0, cmap, - &nimaps); + bmapi_flags, 0, cmap, &nimaps); if (error) goto out_trans_cancel;