xfs: fix zoned GC data corruption due to wrong bv_offset

xfs_zone_gc_write_chunk writes out the data buffer read in earlier using
the same bio, and currenly looks at bv_offset for the offset into the
scratch folio for that.  But commit 26064d3e2b4d ("block: fix adding
folio to bio") changed how bv_page and bv_offset are calculated for
adding larger folios, breaking this fragile logic.

Switch to extracting the full physical address from the old bio_vec,
and calculate the offset into the folio from that instead.

This fixes data corruption during garbage collection with heavy rockdsb
workloads.  Thanks to Hans for tracking down the culprit commit during
long bisection sessions.

Fixes: 26064d3e2b4d ("block: fix adding folio to bio")
Fixes: 080d01c41d44 ("xfs: implement zoned garbage collection")
Reported-by: Hans Holmberg <Hans.Holmberg@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hans Holmberg <Hans.Holmberg@wdc.com>
Tested-by: Hans Holmberg <Hans.Holmberg@wdc.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/xfs_zone_gc.c b/fs/xfs/xfs_zone_gc.c
index 81c94dd1d5966bc97ee320f42905fa6ad99c483d..d613a4094db65c3f6cec2ed171fabccc936b4d70 100644 (file)
--- a/fs/xfs/xfs_zone_gc.c
+++ b/fs/xfs/xfs_zone_gc.c
@@ -807,7 +807,8 @@ xfs_zone_gc_write_chunk(
 {
        struct xfs_zone_gc_data *data = chunk->data;
        struct xfs_mount        *mp = chunk->ip->i_mount;
-       unsigned int            folio_offset = chunk->bio.bi_io_vec->bv_offset;
+       phys_addr_t             bvec_paddr =
+               bvec_phys(bio_first_bvec_all(&chunk->bio));
        struct xfs_gc_bio       *split_chunk;
 
        if (chunk->bio.bi_status)
@@ -822,7 +823,7 @@ xfs_zone_gc_write_chunk(
 
        bio_reset(&chunk->bio, mp->m_rtdev_targp->bt_bdev, REQ_OP_WRITE);
        bio_add_folio_nofail(&chunk->bio, chunk->scratch->folio, chunk->len,
-                       folio_offset);
+                       offset_in_folio(chunk->scratch->folio, bvec_paddr));
 
        while ((split_chunk = xfs_zone_gc_split_write(data, chunk)))
                xfs_zone_gc_submit_write(data, split_chunk);