Received-SPF: pass (google.com: domain of linux-kernel+bounces-162785-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: John Garry <john.g.garry@oracle.com>
To: david@fromorbit.com, djwong@kernel.org, hch@lst.de,
        viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz,
        chandan.babu@oracle.com, willy@infradead.org
Cc: axboe@kernel.dk, martin.petersen@oracle.com, linux-kernel@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, tytso@mit.edu, jbongio@google.com,
        ojaswin@linux.ibm.com, ritesh.list@gmail.com, mcgrof@kernel.org,
        p.raghav@samsung.com, linux-xfs@vger.kernel.org,
        catherine.hoang@oracle.com, John Garry <john.g.garry@oracle.com>
Subject: [PATCH v3 15/21] fs: xfs: iomap: Sub-extent zeroing
Date: Mon, 29 Apr 2024 17:47:40 +0000
Message-Id: <20240429174746.2132161-16-john.g.garry@oracle.com>
In-Reply-To: <20240429174746.2132161-1-john.g.garry@oracle.com>
References: <20240429174746.2132161-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?fUAgLrXUR9QguHpEbiEDgl0RazXiJY2ylklow7OaaIqmGg3tu/RmYYL2Yk1k?=
 =?us-ascii?Q?kUIMbY0DV3ozXvnXfpVuNzPCrgDK1hoG9xgsmq49ybedJTfUPavJUhASvsIb?=
 =?us-ascii?Q?ibrxlleIl4w3hdjaI8robHzxtov/HkMIVRs1pF6sMfLWk61LraQTM79lCN2u?=
 =?us-ascii?Q?qbcMfGRBc6Z6IThly8soxief18taw7TbJcOnvlh8IiFxcqmBH30X/5OKfllH?=
 =?us-ascii?Q?amsWoAXNo2CrSsLDL/w3mky65Z6LMJm3sRt1j8Fdvl+98fnF47OJ7BG2rD0D?=
 =?us-ascii?Q?VaeUsrmAhKGhQZes0iB4bceXRq/IcQfZkMVTe+9aN5Sp17kRBk9wUmDizjTh?=
 =?us-ascii?Q?UOjmzyhjcSAdlf8fX4adnWgYPxHVMzKdJl2vVbd7Znj1xDxBBzuaEwkwOkvN?=
 =?us-ascii?Q?Q7iSdDkCmN9FWs5pAsIbWwF4YiT+ym3usgW6Y/DSatgJV0Cu0XwnYVdJMZQl?=
 =?us-ascii?Q?eHelqgQy8zBNid/xuU/q371CEU6/3XrJ3/KKLgiydD6BncyyDo9TJBRbavtX?=
 =?us-ascii?Q?a5yJJlcBccEVB9/bFiBX4vbLdu085Qkzu39Du5BmFmf3O84BgYUoBSc5CIIO?=
 =?us-ascii?Q?pJqlDoi62HT+tGtmnly2UGlCSRfDTWkHKJz9sI+RcIWfczZwuLVwCvzRdqvf?=
 =?us-ascii?Q?5Eer2PMaN49ksMW0LmD9AoVzBZW4NJVW95b8f/G1COKwLunAWpFwsneEOVP6?=
 =?us-ascii?Q?KBU0fRvvJbz3L/KmKdVpmYLx7+UgOzg6amX/azCRLrPgH/CQPGABC0VlSosy?=
 =?us-ascii?Q?nHrVJv2UEkVbjA5Lz59C8gINsY8pbwL4VUU/AtLP/WKtB8il4oXaCZ4cFlDj?=
 =?us-ascii?Q?9Wl3fXPxJhH0XZLELJ33myHDJ9Iqpp6EoMUXlsr8fNp4CxQ68CUuxvLEN5Ve?=
 =?us-ascii?Q?e8NI9/1fadiFc096PTfJ02j+jNqx043HAk+um6XCo01Ef1om7qFBXa58WhQR?=
 =?us-ascii?Q?/CAmy8sDEcE4XAQ5ps3Y0DFY2eJxtjodStqfJ7j5MlvSfQfGN4mLzRo9uqdi?=
 =?us-ascii?Q?8ykgRO2A+up3b5v69ORbbd4SxutB636FYFldHEZmTcidqABlcxy5e2M8rbpK?=
 =?us-ascii?Q?eWbjuec3lE0do+G55GeVHt74TCu8/nDRBLOph/7bgsXwZwK16vuby12hFtQm?=
 =?us-ascii?Q?zpdykccOomAfbVcv6TwU97Fmy2VaVCO+uRkTh5w+nYyiNVLev9LNnAxfhacE?=
 =?us-ascii?Q?PjNpBRmnRdI4SlO1cvKN4JxpmKLFjMGvxEVGxTdq3gEMcXwhvX9mXOaQXuhF?=
 =?us-ascii?Q?RRT21bQap5Ut/0KqhKKwmqrlwMB2svJExbqR7of1btBKgHWD0TlfdRcMqC7s?=
 =?us-ascii?Q?6vfrcZhBWFxMXTMJCXb/JFBngEwg0WBGY1vatT37+kuu2q1F/JpYEawEzFVb?=
 =?us-ascii?Q?WrdQ6hLhuM35RPkrJfHmVBXAeeLet7KcKUUNSZeDkx0p1rbf0Q3X8Ap0Q8J4?=
 =?us-ascii?Q?CEXDgay7VH8mpT5tHQaAGGcOxu9EDM9vawDoOfX6rqckqtlNqW+x/5Lo3lT1?=
 =?us-ascii?Q?iovfp1MLVue9XGAokbiDr07Yc9uocCld/gQtreJ/E3H/aeZ9gLRbXuD+kBsi?=
 =?us-ascii?Q?SeksSuywlXvnGHjTC8YlrZPqWkU5cedT1lAxtN8rP3nhJ4VmzFODt/oqTqtO?=
 =?us-ascii?Q?mg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	sp9SaSsEzkWhs94lSbpJg5qFNARxxtXHBEzXbwaNl+3wWxE5JspglT+bhysKnb121rVHyDlDxK8wgIixj4qpVwEwboJtCVNkR5YHnCaHJCb4Slhn0OTTLPGTzmcXVop3f4T+59f70+BSWvFtkHQ0OzzHmK4Kr3cKPBgOv2aC9QNfVcRRFwX4ueck/hVp7y+X1WUE8rkM0QUgc92uZI2HIAT0KArM1bL8Sg9tYpUMMZ+4ALecaaO1As59a7daPfiwJmiVTDbBLykHzf28+CHWho2ikbsWej6JvEViGj3GbKeBWUN8AIBsHoyj49eYEeRZJeAEhC3Ut8wl+fBzoikTpiogPc+SP4lGuzh0syK3anwRL10xbjPq9xummqiOI0V4z6tNLrs9fKXDPf8v6hSkicZCuax8Wfqb5wpUtR4ZrVTJ4+Eklm6AyligdE8Mq6P9je4XKTseW5bzVIxK+StEZzg7vdC0kp6Pu8A5YSKx9ublPtcUdH5yud8goc6Aw0kdV2hBDEitKEBp2rUHZI54QqwPYqL+lplDP24JpMSAI0O2cL+ghutROy6csR+9u7t2nRfzw9hdHNagnUz4e8qQz531jqy4P8K6QdTLjiE0yFs=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6738c47f-df69-4c98-9105-08dc687499e6
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 17:48:38.8422
 (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: O3TjdIDH23t6mlWkC+lwJ7GE47TdhWrI6Ps653D4xeuqQ5PtnN/wZxxvw77RU6v5tot8QOBgBnNB7bynIJXMfg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7763
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-04-29_15,2024-04-29_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 adultscore=0
 phishscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000
 definitions=main-2404290115
X-Proofpoint-GUID: 0Lw-b671ApsmBz-E6o1J_h4fPx9gAtd0
X-Proofpoint-ORIG-GUID: 0Lw-b671ApsmBz-E6o1J_h4fPx9gAtd0

Set iomap->extent_size when sub-extent zeroing is required.

We treat a sub-extent write same as an unaligned write, so we can leverage
the existing sub-FSblock unaligned write support, i.e. try a shared lock
with IOMAP_DIO_OVERWRITE_ONLY flag, if this fails then try the exclusive
lock.

In xfs_iomap_write_unwritten(), FSB calcs are now based on the extsize.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 fs/xfs/xfs_file.c  | 35 ++++++++++++++++++++++-------------
 fs/xfs/xfs_iomap.c | 13 +++++++++++--
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index e81e01e6b22b..ee4f94cf6f4e 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -620,18 +620,19 @@ xfs_file_dio_write_aligned(
  * Handle block unaligned direct I/O writes
  *
  * In most cases direct I/O writes will be done holding IOLOCK_SHARED, allowing
- * them to be done in parallel with reads and other direct I/O writes.  However,
- * if the I/O is not aligned to filesystem blocks, the direct I/O layer may need
- * to do sub-block zeroing and that requires serialisation against other direct
- * I/O to the same block.  In this case we need to serialise the submission of
- * the unaligned I/O so that we don't get racing block zeroing in the dio layer.
- * In the case where sub-block zeroing is not required, we can do concurrent
- * sub-block dios to the same block successfully.
+ * them to be done in parallel with reads and other direct I/O writes.
+ * However if the I/O is not aligned to filesystem blocks/extent, the direct
+ * I/O layer may need to do sub-block/extent zeroing and that requires
+ * serialisation against other direct I/O to the same block/extent.  In this
+ * case we need to serialise the submission of the unaligned I/O so that we
+ * don't get racing block/extent zeroing in the dio layer.
+ * In the case where sub-block/extent zeroing is not required, we can do
+ * concurrent sub-block/extent dios to the same block/extent successfully.
  *
  * Optimistically submit the I/O using the shared lock first, but use the
  * IOMAP_DIO_OVERWRITE_ONLY flag to tell the lower layers to return -EAGAIN
- * if block allocation or partial block zeroing would be required.  In that case
- * we try again with the exclusive lock.
+ * if block/extent allocation or partial block/extent zeroing would be
+ * required.  In that case we try again with the exclusive lock.
  */
 static noinline ssize_t
 xfs_file_dio_write_unaligned(
@@ -646,9 +647,9 @@ xfs_file_dio_write_unaligned(
 	ssize_t			ret;
 
 	/*
-	 * Extending writes need exclusivity because of the sub-block zeroing
-	 * that the DIO code always does for partial tail blocks beyond EOF, so
-	 * don't even bother trying the fast path in this case.
+	 * Extending writes need exclusivity because of the sub-block/extent
+	 * zeroing that the DIO code always does for partial tail blocks
+	 * beyond EOF, so don't even bother trying the fast path in this case.
 	 */
 	if (iocb->ki_pos > isize || iocb->ki_pos + count >= isize) {
 		if (iocb->ki_flags & IOCB_NOWAIT)
@@ -714,11 +715,19 @@ xfs_file_dio_write(
 	struct xfs_inode	*ip = XFS_I(file_inode(iocb->ki_filp));
 	struct xfs_buftarg      *target = xfs_inode_buftarg(ip);
 	size_t			count = iov_iter_count(from);
+	struct xfs_mount	*mp = ip->i_mount;
+	unsigned int		blockmask;
 
 	/* direct I/O must be aligned to device logical sector size */
 	if ((iocb->ki_pos | count) & target->bt_logical_sectormask)
 		return -EINVAL;
-	if ((iocb->ki_pos | count) & ip->i_mount->m_blockmask)
+
+	if (xfs_inode_has_forcealign(ip) && ip->i_extsize > 1)
+		blockmask = XFS_FSB_TO_B(mp, ip->i_extsize) - 1;
+	else
+		blockmask = mp->m_blockmask;
+
+	if ((iocb->ki_pos | count) & blockmask)
 		return xfs_file_dio_write_unaligned(ip, iocb, from);
 	return xfs_file_dio_write_aligned(ip, iocb, from);
 }
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 4087af7f3c9f..1a3692bbc84d 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -138,6 +138,8 @@ xfs_bmbt_to_iomap(
 
 	iomap->validity_cookie = sequence_cookie;
 	iomap->folio_ops = &xfs_iomap_folio_ops;
+	if (xfs_inode_has_forcealign(ip) && ip->i_extsize > 1)
+		iomap->extent_size = XFS_FSB_TO_B(mp, ip->i_extsize);
 	return 0;
 }
 
@@ -570,8 +572,15 @@ xfs_iomap_write_unwritten(
 
 	trace_xfs_unwritten_convert(ip, offset, count);
 
-	offset_fsb = XFS_B_TO_FSBT(mp, offset);
-	count_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count);
+	if (xfs_inode_has_forcealign(ip) && ip->i_extsize > 1) {
+		xfs_extlen_t extsize_bytes = mp->m_sb.sb_blocksize * ip->i_extsize;
+
+		offset_fsb = XFS_B_TO_FSBT(mp, round_down(offset, extsize_bytes));
+		count_fsb = XFS_B_TO_FSB(mp, round_up(offset + count, extsize_bytes));
+	} else {
+		offset_fsb = XFS_B_TO_FSBT(mp, offset);
+		count_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count);
+	}
 	count_fsb = (xfs_filblks_t)(count_fsb - offset_fsb);
 
 	/*
-- 
2.31.1