FAILED: patch "[PATCH] xfs: fix exchange-range-to-eof file size exchange" failed to apply to 6.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 7dfb218c829c1acb626e0fe92c5fddb9a26a03e9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026101217-request-humming-58e8@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 7dfb218c829c1acb626e0fe92c5fddb9a26a03e9 Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <[email protected]>
Date: Wed, 7 Oct 2026 10:02:27 -0700
Subject: [PATCH] xfs: fix exchange-range-to-eof file size exchange
Norbert Szetei posted a patch containing an incomplete description of a bug in XFS_IOC_EXCHANGE_RANGE's TO_EOF flag. The bug tricks exchange-range into modifying a file so that it has shared blocks starting beyond EOF, which is never allowed because files never have written data beyond EOF, and you can only share written data blocks. This is key to all the incorrect behavior that follows.
Eventually I got from Norbert a description of what's going wrong:
Quoted 37 lines
Fair. Here it is with physical block numbers, 4k blocks. peer is the file that gets rewritten and file1 is the one that ends up with the flag cleared.
Start, nothing shared:
peer size 4096 -> [100] file1 size 12288 -> [200] [201] [202] donor1 size 4096 -> [300] donor2 size 4096 -> [400]1. FICLONERANGE peer's block into file1's middle slot:
peer size 4096 -> [100] file1 size 12288 -> [200] [100] [202] reflink flag set ^^^^^ both files own block 1002.
XFS_IOC_EXCHANGE_RANGEfile1 against donor1,file1_offset0,file2_offset8192, length 0,TO_EOF. One block is exchanged, and the sizes are exchanged with it:file1 size 4096 -> [200] [100] [300] reflink flag set ^^^^^^^^^^^ still owned, now past the size donor1 size 12288 -> [202]file1 says it is one block long while it still owns three. Nothing was unmapped.
file2_offsetis block 2, so this exchange cannot clear a flag.3.
XFS_IOC_EXCHANGE_RANGEfile1 against donor2, both offsets 0, length 4096. Byi_disk_sizethis is two one-block files exchanging everything, soxmi_can_exchange_reflink_flags()agrees and the flag is cleared:file1 size 4096 -> [400] [100] [300] reflink flag CLEARED donor2 size 4096 -> [200]Block 100 is still shared with peer.
Quoted 8 lines
4.
pwrite(file1, 4096, 4096), which is file1's second slot, block 100.xfs_is_cow_inode(file1)is false, so no CoW:peer size 4096 -> [100] same block, new contentsBlock 100 is the only one that matters here. PoC below, it reads a file called peer in the current directory. The filesystem needs reflink and exchange-range, which mkfs.xfs 7.x turns on by default.
So yes, TO_EOF is screwing up the file size even if it's actually exchanging the data block correctly. The following is the intended behavior of XFS_EXCHANGE_RANGE_TO_EOF, as described by its manpage:
"Ignore the length parameter. All bytes in file1_fd from file1_offset
to EOF are moved to file2_fd, and file2's size is set to (file2_offset+(file1_length-file1_offset)). Meanwhile, all bytes in file2 from file2_offset to EOF are moved to file1 and file1's size is set to (file1_offset+(file2_length-file2_offset))."
In other words, if we only exchange a portion of the file data, then we should only exchange the portion of the file size that relates to the exchanged data. Unfortunately, the code swaps the ondisk file size and the incore file sizes, which is incorrect if the caller passes in a nonzero offset.
Having confused the file sizes, the PoC uses a second exchange-range call on what looks like a non-reflinked single-block file. Because the file size is set incorrectly, exchange-range thinks it's exchanging the full contents of two files and clears the reflink flag on the broken file. That enables an extending write of the broken file to rewrite the shared block that's just past EOF. This has become known colloquially as refluxfs.
Once the file sizes are set correctly, the second exchange-range no longer thinks that it's doing a full-contents swap, so it won't clear the reflink flag on either of its file arguments.
Norbert followed up to an earlier version of this patch with a second complaint about us not handling the i_disk_size state correctly:
Quoted 6 lines
The offsets are bounded against the incore
i_sizebut subtracted from the ondiski_disk_size, so a file that has not been written back givesxmi_isize1= 0 + (0 - 12288).For instance, you can do:
Quoted 9 lines
$ xfs_io -f -c "pwrite -q 0 4096" -c fsync file1 $ xfs_io -f -c "pwrite -q 0 12288" \ -c "exchangerange -s 0 -d 12288 file1" dirty $ stat -c %s file1 0 $ stat -c %i file1 131 $ sudo xfs_io -r -c "bulkstat_single 131" . | grep bs_size bs_size = 18446744073709539328
That's wrong, and the new file size update logic depends on the ondisk i_disk_size matching the incore i_size, so flush the pagecache as needed to push it upwards.
fs/xfs/libxfs/xfs_exchmaps.c +11 -2
@@ -931,6 +931,7 @@ xfs_exchmaps_init_intent( const struct xfs_exchmaps_req *req) {struct xfs_exchmaps_intent *xmi; +struct xfs_mount *mp = req->ip1->i_mount; xmi =kmem_cache_zalloc (xfs_exchmaps_intent_cache,GFP_NOFS | __GFP_NOFAIL);
@@ -948,10 +949,18 @@ xfs_exchmaps_init_intent(return xmi; } +/* +* If the caller wanted, set each file's size to that file's exchange +* offset + length exchanged from the other file because the ranges in +* each file might be different lengths. +*/ if (req->flags &XFS_EXCHMAPS_SET_SIZES ) { +loff_t off1 =XFS_FSB_TO_B (mp, xmi->xmi_startoff1); +loff_t off2 =XFS_FSB_TO_B (mp, xmi->xmi_startoff2); + xmi->xmi_flags |=XFS_EXCHMAPS_SET_SIZES ; - xmi->xmi_isize1 = req->ip2->i_disk_size; - xmi->xmi_isize2 = req->ip1->i_disk_size; + xmi->xmi_isize1 = off1 + (req->ip2->i_disk_size - off2); + xmi->xmi_isize2 = off2 + (req->ip1->i_disk_size - off1); } if (S_ISDIR(VFS_I(xmi->xmi_ip2)->i_mode) ||
fs/xfs/xfs_exchrange.c +37 -14
75 lines not on this page · raw message
Sasha Levin
maintainerPATCH 1/1 xfs: fix exchange-range-to-eof file size exchange
From: "Darrick J. Wong" <[email protected]>
[ Upstream commit 7dfb218c829c1acb626e0fe92c5fddb9a26a03e9 ]
Norbert Szetei posted a patch containing an incomplete description of a bug in XFS_IOC_EXCHANGE_RANGE's TO_EOF flag. The bug tricks exchange-range into modifying a file so that it has shared blocks starting beyond EOF, which is never allowed because files never have written data beyond EOF, and you can only share written data blocks. This is key to all the incorrect behavior that follows.
Eventually I got from Norbert a description of what's going wrong:
Quoted 37 lines
Fair. Here it is with physical block numbers, 4k blocks. peer is the file that gets rewritten and file1 is the one that ends up with the flag cleared.
Start, nothing shared:
peer size 4096 -> [100] file1 size 12288 -> [200] [201] [202] donor1 size 4096 -> [300] donor2 size 4096 -> [400]1. FICLONERANGE peer's block into file1's middle slot:
peer size 4096 -> [100] file1 size 12288 -> [200] [100] [202] reflink flag set ^^^^^ both files own block 1002.
XFS_IOC_EXCHANGE_RANGEfile1 against donor1,file1_offset0,file2_offset8192, length 0,TO_EOF. One block is exchanged, and the sizes are exchanged with it:file1 size 4096 -> [200] [100] [300] reflink flag set ^^^^^^^^^^^ still owned, now past the size donor1 size 12288 -> [202]file1 says it is one block long while it still owns three. Nothing was unmapped.
file2_offsetis block 2, so this exchange cannot clear a flag.3.
XFS_IOC_EXCHANGE_RANGEfile1 against donor2, both offsets 0, length 4096. Byi_disk_sizethis is two one-block files exchanging everything, soxmi_can_exchange_reflink_flags()agrees and the flag is cleared:file1 size 4096 -> [400] [100] [300] reflink flag CLEARED donor2 size 4096 -> [200]Block 100 is still shared with peer.
Quoted 8 lines
4.
pwrite(file1, 4096, 4096), which is file1's second slot, block 100.xfs_is_cow_inode(file1)is false, so no CoW:peer size 4096 -> [100] same block, new contentsBlock 100 is the only one that matters here. PoC below, it reads a file called peer in the current directory. The filesystem needs reflink and exchange-range, which mkfs.xfs 7.x turns on by default.
So yes, TO_EOF is screwing up the file size even if it's actually exchanging the data block correctly. The following is the intended behavior of XFS_EXCHANGE_RANGE_TO_EOF, as described by its manpage:
"Ignore the length parameter. All bytes in file1_fd from file1_offset
to EOF are moved to file2_fd, and file2's size is set to (file2_offset+(file1_length-file1_offset)). Meanwhile, all bytes in file2 from file2_offset to EOF are moved to file1 and file1's size is set to (file1_offset+(file2_length-file2_offset))."
In other words, if we only exchange a portion of the file data, then we should only exchange the portion of the file size that relates to the exchanged data. Unfortunately, the code swaps the ondisk file size and the incore file sizes, which is incorrect if the caller passes in a nonzero offset.
Having confused the file sizes, the PoC uses a second exchange-range call on what looks like a non-reflinked single-block file. Because the file size is set incorrectly, exchange-range thinks it's exchanging the full contents of two files and clears the reflink flag on the broken file. That enables an extending write of the broken file to rewrite the shared block that's just past EOF. This has become known colloquially as refluxfs.
Once the file sizes are set correctly, the second exchange-range no longer thinks that it's doing a full-contents swap, so it won't clear the reflink flag on either of its file arguments.
Norbert followed up to an earlier version of this patch with a second complaint about us not handling the i_disk_size state correctly:
Quoted 6 lines
The offsets are bounded against the incore
i_sizebut subtracted from the ondiski_disk_size, so a file that has not been written back givesxmi_isize1= 0 + (0 - 12288).For instance, you can do:
Quoted 9 lines
$ xfs_io -f -c "pwrite -q 0 4096" -c fsync file1 $ xfs_io -f -c "pwrite -q 0 12288" \ -c "exchangerange -s 0 -d 12288 file1" dirty $ stat -c %s file1 0 $ stat -c %i file1 131 $ sudo xfs_io -r -c "bulkstat_single 131" . | grep bs_size bs_size = 18446744073709539328
That's wrong, and the new file size update logic depends on the ondisk i_disk_size matching the incore i_size, so flush the pagecache as needed to push it upwards.
--- fs/xfs/libxfs/xfs_exchmaps.c | 13 +++++++++-- fs/xfs/xfs_exchrange.c | 45 +++++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 16 deletions(-)
fs/xfs/libxfs/xfs_exchmaps.c +11 -2
@@ -997,6 +997,7 @@ xfs_exchmaps_init_intent( const struct xfs_exchmaps_req *req) {struct xfs_exchmaps_intent *xmi; +struct xfs_mount *mp = req->ip1->i_mount;unsigned int rs =0 ; xmi = kmem_cache_zalloc(xfs_exchmaps_intent_cache,
@@ -1015,10 +1016,18 @@ xfs_exchmaps_init_intent(return xmi; } +/* +* If the caller wanted, set each file's size to that file's exchange +* offset + length exchanged from the other file because the ranges in +* each file might be different lengths. +*/ if (req->flags &XFS_EXCHMAPS_SET_SIZES ) { +loff_t off1 =XFS_FSB_TO_B (mp, xmi->xmi_startoff1); +loff_t off2 =XFS_FSB_TO_B (mp, xmi->xmi_startoff2); + xmi->xmi_flags |=XFS_EXCHMAPS_SET_SIZES ; - xmi->xmi_isize1 = req->ip2->i_disk_size; - xmi->xmi_isize2 = req->ip1->i_disk_size; + xmi->xmi_isize1 = off1 + (req->ip2->i_disk_size - off2); + xmi->xmi_isize2 = off2 + (req->ip1->i_disk_size - off1); }/* Record the state of each inode's reflink flag before the op. */
fs/xfs/xfs_exchrange.c +31 -14
63 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [PATCH 6.18.y] xfs: fix exchange-range-to-eof file size exchange
Quoted 110 lines · Sasha Levin
From: "Darrick J. Wong" <[email protected]>
[ Upstream commit
7dfb218c829c1acb626e0fe92c5fddb9a26a03e9]Norbert Szetei posted a patch containing an incomplete description of a bug in XFS_IOC_EXCHANGE_RANGE's
TO_EOFflag. The bug tricks exchange-range into modifying a file so that it has shared blocks starting beyond EOF, which is never allowed because files never have written data beyond EOF, and you can only share written data blocks. This is key to all the incorrect behavior that follows.Eventually I got from Norbert a description of what's going wrong:
Quoted 37 lines
Fair. Here it is with physical block numbers, 4k blocks. peer is the file that gets rewritten and file1 is the one that ends up with the flag cleared.
Start, nothing shared:
peer size 4096 -> [100] file1 size 12288 -> [200] [201] [202] donor1 size 4096 -> [300] donor2 size 4096 -> [400]1. FICLONERANGE peer's block into file1's middle slot:
peer size 4096 -> [100] file1 size 12288 -> [200] [100] [202] reflink flag set ^^^^^ both files own block 1002.
XFS_IOC_EXCHANGE_RANGEfile1 against donor1,file1_offset0,file2_offset8192, length 0,TO_EOF. One block is exchanged, and the sizes are exchanged with it:file1 size 4096 -> [200] [100] [300] reflink flag set ^^^^^^^^^^^ still owned, now past the size donor1 size 12288 -> [202]file1 says it is one block long while it still owns three. Nothing was unmapped.
file2_offsetis block 2, so this exchange cannot clear a flag.3.
XFS_IOC_EXCHANGE_RANGEfile1 against donor2, both offsets 0, length 4096. Byi_disk_sizethis is two one-block files exchanging everything, soxmi_can_exchange_reflink_flags()agrees and the flag is cleared:file1 size 4096 -> [400] [100] [300] reflink flag CLEARED donor2 size 4096 -> [200]Block 100 is still shared with peer.
Quoted 8 lines
4.
pwrite(file1, 4096, 4096), which is file1's second slot, block 100.xfs_is_cow_inode(file1)is false, so no CoW:peer size 4096 -> [100] same block, new contentsBlock 100 is the only one that matters here. PoC below, it reads a file called peer in the current directory. The filesystem needs reflink and exchange-range, which mkfs.xfs 7.x turns on by default.
So yes,
TO_EOFis screwing up the file size even if it's actually exchanging the data block correctly. The following is the intended behavior ofXFS_EXCHANGE_RANGE_TO_EOF, as described by its manpage:"Ignore the length parameter. All bytes in
file1_fdfromfile1_offset
to EOF are moved tofile2_fd, and file2's size is set to (file2_offset+(file1_length-file1_offset)). Meanwhile, all bytes in file2 fromfile2_offsetto EOF are moved to file1 and file1's size is set to (file1_offset+(file2_length-file2_offset))."In other words, if we only exchange a portion of the file data, then we should only exchange the portion of the file size that relates to the exchanged data. Unfortunately, the code swaps the ondisk file size and the incore file sizes, which is incorrect if the caller passes in a nonzero offset.
Having confused the file sizes, the PoC uses a second exchange-range call on what looks like a non-reflinked single-block file. Because the file size is set incorrectly, exchange-range thinks it's exchanging the full contents of two files and clears the reflink flag on the broken file. That enables an extending write of the broken file to rewrite the shared block that's just past EOF. This has become known colloquially as refluxfs.
Once the file sizes are set correctly, the second exchange-range no longer thinks that it's doing a full-contents swap, so it won't clear the reflink flag on either of its file arguments.
Norbert followed up to an earlier version of this patch with a second complaint about us not handling the
i_disk_sizestate correctly:Quoted 6 lines
The offsets are bounded against the incore
i_sizebut subtracted from the ondiski_disk_size, so a file that has not been written back givesxmi_isize1= 0 + (0 - 12288).For instance, you can do:
Quoted 9 lines
$ xfs_io -f -c "pwrite -q 0 4096" -c fsync file1 $ xfs_io -f -c "pwrite -q 0 12288" \ -c "exchangerange -s 0 -d 12288 file1" dirty $ stat -c %s file1 0 $ stat -c %i file1 131 $ sudo xfs_io -r -c "bulkstat_single 131" . | grep bs_size bs_size = 18446744073709539328That's wrong, and the new file size update logic depends on the ondisk
i_disk_sizematching the incorei_size, so flush the pagecache as needed to push it upwards.
Quoted 8 lines
Reported-by Norbert Szetei <[email protected]>Cc [email protected] # v6.10Fixes 966ceafc7a4371 ("xfs: create deferred log items for file mapping exchanges")Signed-off-by Darrick J. Wong <[email protected]>Reviewed-by Dave Chinner <[email protected]>Signed-off-by Carlos Maiolino <[email protected]>[ sashal: retained the rs variable alongside the new mp declaration for existing reflink-flag handling. ]
You might want to pick up "xfs: stop exchanging reflink flags when exchanging mappings" for 6.18 as well. Though email's being weird today, so for all I know you already did and I simply haven't seen it yet.
Quoted 1 line
Signed-off-by Sasha Levin <[email protected]>
However, this part looks good, so
--D
Quoted 110 lines
--- fs/xfs/libxfs/xfs_exchmaps.c | 13 +++++++++-- fs/xfs/xfs_exchrange.c | 45 +++++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 16 deletions(-)fs/xfs/libxfs/xfs_exchmaps.c +11
-2@@ -997,6 +997,7 @@ xfs_exchmaps_init_intent( const struct xfs_exchmaps_req *req) {struct xfs_exchmaps_intent *xmi; +struct xfs_mount *mp = req->ip1->i_mount;unsigned int rs =0 ; xmi = kmem_cache_zalloc(xfs_exchmaps_intent_cache,@@ -1015,10 +1016,18 @@ xfs_exchmaps_init_intent(return xmi; } +/* +* If the caller wanted, set each file's size to that file's exchange +* offset + length exchanged from the other file because the ranges in +* each file might be different lengths. +*/ if (req->flags &XFS_EXCHMAPS_SET_SIZES ) { +loff_t off1 =XFS_FSB_TO_B (mp, xmi->xmi_startoff1); +loff_t off2 =XFS_FSB_TO_B (mp, xmi->xmi_startoff2); + xmi->xmi_flags |=XFS_EXCHMAPS_SET_SIZES ; - xmi->xmi_isize1 = req->ip2->i_disk_size; - xmi->xmi_isize2 = req->ip1->i_disk_size; + xmi->xmi_isize1 = off1 + (req->ip2->i_disk_size - off2); + xmi->xmi_isize2 = off2 + (req->ip1->i_disk_size - off1); }/* Record the state of each inode's reflink flag before the op. */ fs/xfs/xfs_exchrange.c +31
-14@@ -290,17 +290,20 @@ xfs_exchrange_mappings( goto out_unlock;/* -* If the caller wanted us to exchange the contents of two complete -* files of unequal length, exchange the incore sizes now. This should -* be safe because we flushed both files' page caches, exchanged all -* the mappings, and updated the ondisk sizes. +* If the caller wanted, set each file's size to that file's exchange +* offset + length exchanged from the other file because the ranges in +* each file might be different lengths. This should be safe because +* we flushed both files' page caches, exchanged all the mappings, and +* updated the ondisk sizes. */ if (fxr->flags &XFS_EXCHANGE_RANGE_TO_EOF ) { -loff_t temp; +loff_t old_ip1_size =i_size_read (VFS_I (ip1)); +loff_t old_ip2_size =i_size_read (VFS_I (ip2)); - temp =i_size_read (VFS_I (ip2)); -i_size_write (VFS_I (ip2),i_size_read (VFS_I (ip1))); -i_size_write (VFS_I (ip1), temp); +i_size_write (VFS_I (ip2), fxr->file2_offset + + (old_ip1_size - fxr->file1_offset)); +i_size_write (VFS_I (ip1), fxr->file1_offset + + (old_ip2_size - fxr->file2_offset)); } out_unlock:@@ -470,15 +473,29 @@ xfs_exchange_range_prep(if (!same_inode)inode_dio_wait (inode2); - error =filemap_write_and_wait_range (inode1->i_mapping, - fxr->file1_offset, - fxr->file1_offset + fxr->length -1 ); +/* +* If TO_EOF is set, the ondisk file size update logic depends on the +* ondisk file size matching the incore file size. Flush everything. +* +* Otherwise, flush all dirty data between the ondisk size and the +* exchange offset to reduce the chance of zeroed file contents in +* that gap after a crash. +*/ +if (fxr->flags &XFS_EXCHANGE_RANGE_TO_EOF ) + error =filemap_write_and_wait (inode1->i_mapping); +else + error =filemap_write_and_wait_range (inode1->i_mapping, +min (fxr->file1_offset,XFS_I (inode1)->i_disk_size), + fxr->file1_offset + fxr->length -1 );if (error)return error; - error =filemap_write_and_wait_range (inode2->i_mapping, - fxr->file2_offset, - fxr->file2_offset + fxr->length -1 ); +if (fxr->flags &XFS_EXCHANGE_RANGE_TO_EOF ) + error =filemap_write_and_wait (inode2->i_mapping); +else + error =filemap_write_and_wait_range (inode2->i_mapping, +min (fxr->file2_offset,XFS_I (inode2)->i_disk_size), + fxr->file2_offset + fxr->length -1 );if (error)return error;Signature · 1 line
2.53.0
Re: [PATCH 6.18.y] xfs: fix exchange-range-to-eof file size exchange
Quoted 2 lines
You might want to pick up "xfs: stop exchanging reflink flags when exchanging mappings" for 6.18 as well.
Queued both for 6.18, thanks.
Signature · 2 lines
Thanks, Sasha