Skip to contentSkip to conversation

xfs: fallocate RT flush unmap range fixes

RFC PATCH In review John Garry 3 participants 9 messages May 3, 2024 – May 8, 2024 XFS filesystem

lore
Share & tools
lore

John Garry

author
#0 lore raw

cover xfs: fallocate RT flush unmap range fixes

As mentioned by Dave Chinner at [0], xfs_flush_unmap_range() and xfs_prepare_shift() should consider RT extents in the flush unmap range, and need to be fixed.

I don't want to add such changes to that series, so I am sending separately.

I am marking as an RFC as I am not intimately familiar enough with the code for me to say that the changes are technically correct.

About the change in xfs_prepare_shift(), that function is only called from xfs_insert_file_space() and xfs_collapse_file_space(). Those functions only permit RT extent-aligned calls in xfs_is_falloc_aligned(), so in practice I don't think that this change would affect xfs_prepare_shift(). And xfs_prepare_shift() calls xfs_flush_unmap_range(), which is being fixed up anyway.

[0] https://lore.kernel.org/linux-xfs/[email protected]/

John Garry (2):
xfs: Fix xfs_flush_unmap_range() range for RT
xfs: Fix xfs_prepare_shift() range for RT

 fs/xfs/xfs_bmap_util.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
Signature · 1 line
2.31.1
author
#1 lore raw

RFC PATCH 1/2 xfs: Fix xfs_flush_unmap_range() range for RT

Currently xfs_flush_unmap_range() does a flush for full FS blocks. Extend this to cover full RT extents so that any range overlap with start/end of the modification are clean and idle.

This code change is originally from Dave Chinner.

---
 fs/xfs/xfs_bmap_util.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
fs/xfs/xfs_bmap_util.c +6 -2
index 2e6f08198c07..da67c52d5f94 100644
@@ -802,12 +802,16 @@ xfs_flush_unmap_range(
 	xfs_off_t		offset,
 	xfs_off_t		len)
 {
-	struct xfs_mount	*mp = ip->i_mount;
 	struct inode		*inode = VFS_I(ip);
 	xfs_off_t		rounding, start, end;
 	int			error;
 
-	rounding = max_t(xfs_off_t, mp->m_sb.sb_blocksize, PAGE_SIZE);
+	/*
+	 * Make sure we extend the flush out to extent alignment
+	 * boundaries so any extent range overlapping the start/end
+	 * of the modification we are about to do is clean and idle.
+	 */
+	rounding = max_t(xfs_off_t, xfs_inode_alloc_unitsize(ip), PAGE_SIZE);
 	start = round_down(offset, rounding);
 	end = round_up(offset + len, rounding) - 1;
 
Signature · 1 line
2.31.1
#3 lore raw

Re: [PATCH RFC 1/2] xfs: Fix xfs_flush_unmap_range() range for RT

In reply to John Garry
Quoted 22 lines · John Garry

Currently xfs_flush_unmap_range() does a flush for full FS blocks. Extend this to cover full RT extents so that any range overlap with start/end of the modification are clean and idle.

This code change is originally from Dave Chinner.

---
 fs/xfs/xfs_bmap_util.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
fs/xfs/xfs_bmap_util.c +0 -1
index 2e6f08198c07..da67c52d5f94 100644
@@ -802,12 +802,16 @@ xfs_flush_unmap_range(
 	xfs_off_t		offset,
 	xfs_off_t		len)
 {
-	struct xfs_mount	*mp = ip->i_mount;
 	struct inode		*inode = VFS_I(ip);
 	xfs_off_t		rounding, start, end;

fs/xfs/xfs_bmap_util.c xfs_flush_unmap_range( · line 815

Quoted 10 lines
fs/xfs/xfs_bmap_util.c +6 -1
 	int			error;
 
-	rounding = max_t(xfs_off_t, mp->m_sb.sb_blocksize, PAGE_SIZE);
+	/*
+	 * Make sure we extend the flush out to extent alignment
+	 * boundaries so any extent range overlapping the start/end
+	 * of the modification we are about to do is clean and idle.
+	 */
+	rounding = max_t(xfs_off_t, xfs_inode_alloc_unitsize(ip), PAGE_SIZE);
 	start = round_down(offset, rounding);

round_down requires the divisor to be a power of two.

--D

Quoted 6 lines
fs/xfs/xfs_bmap_util.c +0 -0
 	end = round_up(offset + len, rounding) - 1;
 
Signature · 1 line
2.31.1
author
#4 lore raw

Re: [PATCH RFC 1/2] xfs: Fix xfs_flush_unmap_range() range for RT

Quoted 9 lines · Darrick J. Wong

fs/xfs/xfs_bmap_util.c xfs_flush_unmap_range( · line 815

Quoted 8 lines
fs/xfs/xfs_bmap_util.c +6 -1
-	rounding = max_t(xfs_off_t, mp->m_sb.sb_blocksize, PAGE_SIZE);
+	/*
+	 * Make sure we extend the flush out to extent alignment
+	 * boundaries so any extent range overlapping the start/end
+	 * of the modification we are about to do is clean and idle.
+	 */
+	rounding = max_t(xfs_off_t, xfs_inode_alloc_unitsize(ip), PAGE_SIZE);
  	start = round_down(offset, rounding);

round_down requires the divisor to be a power of two.

well spotted, and so the round_up() call, below, also needs fixing.

Quoted 4 lines

--D

Quoted 1 line
  	end = round_up(offset + len, rounding) - 1;
author
#5 lore raw

Re: [PATCH RFC 1/2] xfs: Fix xfs_flush_unmap_range() range for RT

In reply to Darrick J. Wong
Quoted 9 lines · Darrick J. Wong

fs/xfs/xfs_bmap_util.c xfs_flush_unmap_range( · line 815

Quoted 8 lines
fs/xfs/xfs_bmap_util.c +6 -1
-	rounding = max_t(xfs_off_t, mp->m_sb.sb_blocksize, PAGE_SIZE);
+	/*
+	 * Make sure we extend the flush out to extent alignment
+	 * boundaries so any extent range overlapping the start/end
+	 * of the modification we are about to do is clean and idle.
+	 */
+	rounding = max_t(xfs_off_t, xfs_inode_alloc_unitsize(ip), PAGE_SIZE);
  	start = round_down(offset, rounding);

round_down requires the divisor to be a power of two.

well spotted, and so the round_up() call, below, also needs fixing.

Quoted 4 lines

--D

Quoted 1 line
  	end = round_up(offset + len, rounding) - 1;
author
#6 lore raw

RFC PATCH 2/2 xfs: Fix xfs_prepare_shift() range for RT

In reply to John Garry

The RT extent range must be considered in the xfs_flush_unmap_range() call to stabilize the boundary.

This code change is originally from Dave Chinner.

---
 fs/xfs/xfs_bmap_util.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
fs/xfs/xfs_bmap_util.c +6 -4
index da67c52d5f94..2775bb32489e 100644
@@ -896,8 +896,8 @@ xfs_prepare_shift(
 	struct xfs_inode	*ip,
 	loff_t			offset)
 {
-	struct xfs_mount	*mp = ip->i_mount;
 	int			error;
+	unsigned int		rounding;
 
 	/*
 	 * Trim eofblocks to avoid shifting uninitialized post-eof preallocation
@@ -914,11 +914,13 @@ xfs_prepare_shift(
 	 * with the full range of the operation. If we don't, a COW writeback
 	 * completion could race with an insert, front merge with the start
 	 * extent (after split) during the shift and corrupt the file. Start
-	 * with the block just prior to the start to stabilize the boundary.
+	 * with the aligned block just prior to the start to stabilize the
+	 * boundary.
 	 */
-	offset = round_down(offset, mp->m_sb.sb_blocksize);
+	rounding = xfs_inode_alloc_unitsize(ip);
+	offset = round_down(offset, rounding);
 	if (offset)
-		offset -= mp->m_sb.sb_blocksize;
+		offset -= rounding;
 
 	/*
 	 * Writeback and invalidate cache for the remainder of the file as we're
Signature · 1 line
2.31.1
#8 lore raw

Re: [PATCH RFC 2/2] xfs: Fix xfs_prepare_shift() range for RT

In reply to John Garry
Quoted 25 lines · John Garry

The RT extent range must be considered in the xfs_flush_unmap_range() call to stabilize the boundary.

This code change is originally from Dave Chinner.

---
 fs/xfs/xfs_bmap_util.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
fs/xfs/xfs_bmap_util.c +1 -1
index da67c52d5f94..2775bb32489e 100644
@@ -896,8 +896,8 @@ xfs_prepare_shift(
 	struct xfs_inode	*ip,
 	loff_t			offset)
 {
-	struct xfs_mount	*mp = ip->i_mount;
 	int			error;
+	unsigned int		rounding;
 
 	/*
 	 * Trim eofblocks to avoid shifting uninitialized post-eof preallocation

fs/xfs/xfs_bmap_util.c xfs_prepare_shift( · line 917

Quoted 5 lines
fs/xfs/xfs_bmap_util.c +1 -1
@@ -914,11 +914,13 @@ xfs_prepare_shift(
 	 * with the full range of the operation. If we don't, a COW writeback
 	 * completion could race with an insert, front merge with the start
 	 * extent (after split) during the shift and corrupt the file. Start
-	 * with the block just prior to the start to stabilize the boundary.
+	 * with the aligned block just prior to the start to stabilize the

"...with the allocation unit just prior to the start..."

fs/xfs/xfs_bmap_util.c xfs_prepare_shift( · line 921

Quoted 5 lines
fs/xfs/xfs_bmap_util.c +3 -1
+	 * boundary.
 	 */
-	offset = round_down(offset, mp->m_sb.sb_blocksize);
+	rounding = xfs_inode_alloc_unitsize(ip);
+	offset = round_down(offset, rounding);

Again, round_down requires the divisor to be a power of two.

--D

Quoted 10 lines
fs/xfs/xfs_bmap_util.c +1 -1
 	if (offset)
-		offset -= mp->m_sb.sb_blocksize;
+		offset -= rounding;
 
 	/*
 	 * Writeback and invalidate cache for the remainder of the file as we're
Signature · 1 line
2.31.1