xfs: fix off-by-one-block in xfs_discard_folio()

jira LE-1907
Rebuild_History Non-Buildable kernel-rt-5.14.0-284.30.1.rt14.315.el9_2
commit-author Dave Chinner <[email protected]>
commit 8ac5b99
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-rt-5.14.0-284.30.1.rt14.315.el9_2/8ac5b996.failed

The recent writeback corruption fixes changed the code in
xfs_discard_folio() to calculate a byte range to for punching
delalloc extents. A mistake was made in using round_up(pos) for the
end offset, because when pos points at the first byte of a block, it
does not get rounded up to point to the end byte of the block. hence
the punch range is short, and this leads to unexpected behaviour in
certain cases in xfs_bmap_punch_delalloc_range.

e.g. pos = 0 means we call xfs_bmap_punch_delalloc_range(0,0), so
there is no previous extent and it rounds up the punch to the end of
the delalloc extent it found at offset 0, not the end of the range
given to xfs_bmap_punch_delalloc_range().

Fix this by handling the zero block offset case correctly.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=217030
Link: https://lore.kernel.org/linux-xfs/Y+vOfaxIWX1c%2Fyy9@bfoster/
Fixes: 7348b32 ("xfs: xfs_bmap_punch_delalloc_range() should take a byte range")
	Reported-by: Pengfei Xu <[email protected]>
Found-by: Brian Foster <[email protected]>
	Signed-off-by: Dave Chinner <[email protected]>
	Reviewed-by: Darrick J. Wong <[email protected]>
	Signed-off-by: Darrick J. Wong <[email protected]>
(cherry picked from commit 8ac5b99)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	fs/xfs/xfs_aops.c

Author: PlaidCat

ciq/ciq_backports/kernel-rt-5.14.0-284.30.1.rt14.315.el9_2/8ac5b996.failed

@@ -0,0 +1,109 @@
+xfs: fix off-by-one-block in xfs_discard_folio()
+
+jira LE-1907
+Rebuild_History Non-Buildable kernel-rt-5.14.0-284.30.1.rt14.315.el9_2
+commit-author Dave Chinner <[email protected]>
+commit 8ac5b996bf5199f15b7687ceae989f8b2a410dda
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-rt-5.14.0-284.30.1.rt14.315.el9_2/8ac5b996.failed
+
+The recent writeback corruption fixes changed the code in
+xfs_discard_folio() to calculate a byte range to for punching
+delalloc extents. A mistake was made in using round_up(pos) for the
+end offset, because when pos points at the first byte of a block, it
+does not get rounded up to point to the end byte of the block. hence
+the punch range is short, and this leads to unexpected behaviour in
+certain cases in xfs_bmap_punch_delalloc_range.
+
+e.g. pos = 0 means we call xfs_bmap_punch_delalloc_range(0,0), so
+there is no previous extent and it rounds up the punch to the end of
+the delalloc extent it found at offset 0, not the end of the range
+given to xfs_bmap_punch_delalloc_range().
+
+Fix this by handling the zero block offset case correctly.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=217030
+Link: https://lore.kernel.org/linux-xfs/Y+vOfaxIWX1c%2Fyy9@bfoster/
+Fixes: 7348b322332d ("xfs: xfs_bmap_punch_delalloc_range() should take a byte range")
+	Reported-by: Pengfei Xu <[email protected]>
+Found-by: Brian Foster <[email protected]>
+	Signed-off-by: Dave Chinner <[email protected]>
+	Reviewed-by: Darrick J. Wong <[email protected]>
+	Signed-off-by: Darrick J. Wong <[email protected]>
+(cherry picked from commit 8ac5b996bf5199f15b7687ceae989f8b2a410dda)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	fs/xfs/xfs_aops.c
+diff --cc fs/xfs/xfs_aops.c
+index c46a16ba4c33,2ef78aa1d3f6..000000000000
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@@ -425,39 -449,44 +425,54 @@@ xfs_prepare_ioend
+  }
+  
+  /*
+-  * If the page has delalloc blocks on it, we need to punch them out before we
+-  * invalidate the page.  If we don't, we leave a stale delalloc mapping on the
+-  * inode that can trip up a later direct I/O read operation on the same region.
++  * If the folio has delalloc blocks on it, the caller is asking us to punch them
++  * out. If we don't, we can leave a stale delalloc mapping covered by a clean
++  * page that needs to be dirtied again before the delalloc mapping can be
++  * converted. This stale delalloc mapping can trip up a later direct I/O read
++  * operation on the same region.
+   *
+-  * We prevent this by truncating away the delalloc regions on the page.  Because
++  * We prevent this by truncating away the delalloc regions on the folio. Because
+   * they are delalloc, we can do this without needing a transaction. Indeed - if
+   * we get ENOSPC errors, we have to be able to do this truncation without a
+-  * transaction as there is no space left for block reservation (typically why we
+-  * see a ENOSPC in writeback).
++  * transaction as there is no space left for block reservation (typically why
++  * we see a ENOSPC in writeback).
+   */
+  static void
+ -xfs_discard_folio(
+ -	struct folio		*folio,
+ -	loff_t			pos)
+ +xfs_discard_page(
+ +	struct page		*page,
+ +	loff_t			fileoff)
+  {
+ -	struct xfs_inode	*ip = XFS_I(folio->mapping->host);
+ +	struct xfs_inode	*ip = XFS_I(page->mapping->host);
+  	struct xfs_mount	*mp = ip->i_mount;
+ +	unsigned int		pageoff = offset_in_page(fileoff);
+  	int			error;
+  
+  	if (xfs_is_shutdown(mp))
+ -		return;
+ +		goto out_invalidate;
+  
+  	xfs_alert_ratelimited(mp,
+++<<<<<<< HEAD
+ +		"page discard on page "PTR_FMT", inode 0x%llx, offset %llu.",
+ +			page, ip->i_ino, fileoff);
+++=======
++ 		"page discard on page "PTR_FMT", inode 0x%llx, pos %llu.",
++ 			folio, ip->i_ino, pos);
++ 
++ 	/*
++ 	 * The end of the punch range is always the offset of the the first
++ 	 * byte of the next folio. Hence the end offset is only dependent on the
++ 	 * folio itself and not the start offset that is passed in.
++ 	 */
++ 	error = xfs_bmap_punch_delalloc_range(ip, pos,
++ 				folio_pos(folio) + folio_size(folio));
+++>>>>>>> 8ac5b996bf51 (xfs: fix off-by-one-block in xfs_discard_folio())
+  
+ +	error = xfs_bmap_punch_delalloc_range(ip, fileoff,
+ +			round_up(fileoff, PAGE_SIZE));
+  	if (error && !xfs_is_shutdown(mp))
+  		xfs_alert(mp, "page discard unable to remove delalloc mapping.");
+ +out_invalidate:
+ +	iomap_invalidatepage(page, pageoff, PAGE_SIZE - pageoff);
+  }
+  
+  static const struct iomap_writeback_ops xfs_writeback_ops = {
+* Unmerged path fs/xfs/xfs_aops.c