[ciqlts9_2] xfs: resample the data fork mapping after cycling ILOCK

[ciq-kernel-automation]

Summary

This PR has been automatically created after successful completion of all CI stages.

Commit Message(s)

xfs: resample the data fork mapping after cycling ILOCK

commit-author Christoph Hellwig <hch@lst.de>
commit 2f4acd0fcd862e22eab45690ec2c08c80b6ef2e7
upstream-diff |
	Between this kernel and the recent change xfs_reflink_allocate_cow()
	was refactored into two separate functions in d62113303d691bcd8d0675ae4ac63e7769afc56c
	xfs: Fix false ENOSPC when performing direct write on a delalloc extent in cow fork
	In addition after fixing the bug the offset_fsb and count_fsb need to
	be refreshed as a part of the above commit it creates
	xfs_reflink_convert_unwritten() which refreshes prior to returns.

Test Results

✅ Build Stage

Architecture	Build Time	Total Time
x86_64	15m 58s	16m 43s
aarch64	12m 24s	12m 57s

• View build logs

✅ Boot Verification

• Status: Passed (all architectures)
• View boot logs

✅ Kernel Selftests

Architecture	Passed	Failed	Compared Against	Status
x86_64	174	24	ciqlts9_2	✅ No regressions
aarch64	140	28	ciqlts9_2	✅ No regressions

• View kselftest logs

✅ LTP Results

Architecture	Passed	Failed	Compared Against	Status
x86_64	1439	81	ciqlts9_2	✅ No regressions
aarch64	1408	84	ciqlts9_2	❌ 1 regressions

• View LTP logs

aarch64 regressions:

• fcntl14_64 (PASS -> FAIL)

---

🤖 This PR was automatically generated by GitHub Actions
Run ID: 29616164768

[github-actions]

🤖 Validation Checks In Progress Workflow run: https://github.com/ctrliq/kernel-src-tree/actions/runs/29626705315

[github-actions]

🔍 Interdiff Analysis

• ⚠️ PR commit 707a785839b (xfs: resample the data fork mapping after cycling ILOCK) → upstream 2f4acd0fcd86
  Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -388,22 +387,4 @@
 
 	/*
-	 * The data fork mapping may have changed while we dropped the ILOCK
-	 * (a racing O_DIRECT writer under IOLOCK_SHARED can complete a full
-	 * CoW cycle including xfs_reflink_end_cow(), which remaps this offset
-	 * and drops the refcount of the old shared block).  Re-read it so the
-	 * shared-status recheck below and the caller's in-place iomap both
-	 * operate on the current mapping rather than a stale physical block.
-	 */
-	if (seq_before != READ_ONCE(ip->i_df.if_seq)) {
-		nimaps = 1;
-		error = xfs_bmapi_read(ip, imap->br_startoff,
-				imap->br_blockcount, imap, &nimaps, 0);
-		if (error)
-			goto out_trans_cancel;
-		offset_fsb = imap->br_startoff;
-		count_fsb = imap->br_blockcount;
-	}
-
-	/*
 	 * Check for an overlapping extent again now that we dropped the ilock.
 	 */

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -440,6 +440,7 @@
 	struct xfs_mount	*mp = ip->i_mount;
 	struct xfs_trans	*tp;
 	xfs_filblks_t		resaligned;
+	unsigned int		seq_before = READ_ONCE(ip->i_df.if_seq);
 	unsigned int		dblocks = 0, rblocks = 0;
 	int			nimaps;
 	int			error;
@@ -465,6 +466,22 @@
 
 	*lockmode = XFS_ILOCK_EXCL;
 
+	/*
+	 * The data fork mapping may have changed while we dropped the ILOCK
+	 * (a racing O_DIRECT writer under IOLOCK_SHARED can complete a full
+	 * CoW cycle including xfs_reflink_end_cow(), which remaps this offset
+	 * and drops the refcount of the old shared block).  Re-read it so the
+	 * shared-status recheck below and the caller's in-place iomap both
+	 * operate on the current mapping rather than a stale physical block.
+	 */
+	if (seq_before != READ_ONCE(ip->i_df.if_seq)) {
+		nimaps = 1;
+		error = xfs_bmapi_read(ip, imap->br_startoff,
+				imap->br_blockcount, imap, &nimaps, 0);
+		if (error)
+			goto out_trans_cancel;
+	}
+
 	error = xfs_find_trim_cow_extent(ip, imap, cmap, shared, &found);
 	if (error || !*shared)
 		goto out_trans_cancel;
@@ -511,6 +528,8 @@
 	bool			found;
 
 	do {
+		unsigned int	seq_before = READ_ONCE(ip->i_df.if_seq);
+
 		xfs_iunlock(ip, *lockmode);
 		*lockmode = 0;
 
@@ -521,6 +540,23 @@
 
 		*lockmode = XFS_ILOCK_EXCL;
 
+		/*
+		 * The data fork mapping may have changed while we dropped the
+		 * ILOCK (a racing O_DIRECT writer under IOLOCK_SHARED can
+		 * complete a full CoW cycle including xfs_reflink_end_cow(),
+		 * which remaps this offset and drops the refcount of the old
+		 * shared block).  Re-read it so the shared-status recheck
+		 * below and the caller's in-place iomap both operate on the
+		 * current mapping rather than a stale physical block.
+		 */
+		if (seq_before != READ_ONCE(ip->i_df.if_seq)) {
+			nimaps = 1;
+			error = xfs_bmapi_read(ip, imap->br_startoff,
+					imap->br_blockcount, imap, &nimaps, 0);
+			if (error)
+				goto out_trans_cancel;
+		}
+
 		error = xfs_find_trim_cow_extent(ip, imap, cmap, shared,
 				&found);
 		if (error || !*shared)

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -354,2 +356,4 @@
 	xfs_filblks_t		resaligned;
-	xfs_extlen_t		resblks = 0;
+	unsigned int		dblocks = 0, rblocks = 0;
+	int			nimaps;
+	int			error;
@@ -356,2 +362,4 @@
 
-	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
+	error = xfs_find_trim_cow_extent(ip, imap, cmap, shared, &found);
+	if (error || !*shared)
+		goto out_trans_cancel;
@@ -382,6 +498,11 @@
 
-	*lockmode = XFS_ILOCK_EXCL;
+	do {
+		xfs_iunlock(ip, *lockmode);
+		*lockmode = 0;
+
+
+		*lockmode = XFS_ILOCK_EXCL;
 
-	/*
-	 * Check for an overlapping extent again now that we dropped the ilock.
-	 */
+		error = xfs_find_trim_cow_extent(ip, imap, cmap, shared,
+				&found);
+		if (error || !*shared)

This is an automated interdiff check for backported commits.

[github-actions]

✅ Validation checks completed successfully View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/29626705315

[bmastbergen]

🥌

[kerneltoast]