Skip to content

Commit 716e743

Browse files
zhangyi089gregkh
authored andcommitted
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
commit feaf2a8 upstream. When allocating blocks during within-EOF DIO and writeback with dioread_nolock enabled, EXT4_GET_BLOCKS_PRE_IO was set to split an existing large unwritten extent. However, EXT4_GET_BLOCKS_CONVERT was set when calling ext4_split_convert_extents(), which may potentially result in stale data issues. Assume we have an unwritten extent, and then DIO writes the second half. [UUUUUUUUUUUUUUUU] on-disk extent U: unwritten extent [UUUUUUUUUUUUUUUU] extent status tree |<- ->| ----> dio write this range First, ext4_iomap_alloc() call ext4_map_blocks() with EXT4_GET_BLOCKS_PRE_IO, EXT4_GET_BLOCKS_UNWRIT_EXT and EXT4_GET_BLOCKS_CREATE flags set. ext4_map_blocks() find this extent and call ext4_split_convert_extents() with EXT4_GET_BLOCKS_CONVERT and the above flags set. Then, ext4_split_convert_extents() calls ext4_split_extent() with EXT4_EXT_MAY_ZEROOUT, EXT4_EXT_MARK_UNWRIT2 and EXT4_EXT_DATA_VALID2 flags set, and it calls ext4_split_extent_at() to split the second half with EXT4_EXT_DATA_VALID2, EXT4_EXT_MARK_UNWRIT1, EXT4_EXT_MAY_ZEROOUT and EXT4_EXT_MARK_UNWRIT2 flags set. However, ext4_split_extent_at() failed to insert extent since a temporary lack -ENOSPC. It zeroes out the first half but convert the entire on-disk extent to written since the EXT4_EXT_DATA_VALID2 flag set, but left the second half as unwritten in the extent status tree. [0000000000SSSSSS] data S: stale data, 0: zeroed [WWWWWWWWWWWWWWWW] on-disk extent W: written extent [WWWWWWWWWWUUUUUU] extent status tree Finally, if the DIO failed to write data to the disk, the stale data in the second half will be exposed once the cached extent entry is gone. Fix this issue by not passing EXT4_GET_BLOCKS_CONVERT when splitting an unwritten extent before submitting I/O, and make ext4_split_convert_extents() to zero out the entire extent range to zero for this case, and also mark the extent in the extent status tree for consistency. Fixes: b8a8684 ("ext4: Introduce FALLOC_FL_ZERO_RANGE flag for fallocate") Signed-off-by: Zhang Yi <yi.zhang@huawei.com> Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Reviewed-by: Baokun Li <libaokun1@huawei.com> Cc: stable@kernel.org Message-ID: <20251129103247.686136-4-yi.zhang@huaweicloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ce0a2b8 commit 716e743

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

fs/ext4/extents.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3735,15 +3735,19 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle,
37353735
/* Convert to unwritten */
37363736
if (flags & EXT4_GET_BLOCKS_CONVERT_UNWRITTEN) {
37373737
split_flag |= EXT4_EXT_DATA_ENTIRE_VALID1;
3738-
/* Convert to initialized */
3739-
} else if (flags & EXT4_GET_BLOCKS_CONVERT) {
3738+
/* Split the existing unwritten extent */
3739+
} else if (flags & (EXT4_GET_BLOCKS_UNWRIT_EXT |
3740+
EXT4_GET_BLOCKS_CONVERT)) {
37403741
/*
37413742
* It is safe to convert extent to initialized via explicit
37423743
* zeroout only if extent is fully inside i_size or new_size.
37433744
*/
37443745
split_flag |= ee_block + ee_len <= eof_block ?
37453746
EXT4_EXT_MAY_ZEROOUT : 0;
3746-
split_flag |= (EXT4_EXT_MARK_UNWRIT2 | EXT4_EXT_DATA_VALID2);
3747+
split_flag |= EXT4_EXT_MARK_UNWRIT2;
3748+
/* Convert to initialized */
3749+
if (flags & EXT4_GET_BLOCKS_CONVERT)
3750+
split_flag |= EXT4_EXT_DATA_VALID2;
37473751
}
37483752
flags |= EXT4_GET_BLOCKS_SPLIT_NOMERGE;
37493753
return ext4_split_extent(handle, inode, path, map, split_flag, flags,
@@ -3919,7 +3923,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
39193923
/* get_block() before submitting IO, split the extent */
39203924
if (flags & EXT4_GET_BLOCKS_SPLIT_NOMERGE) {
39213925
path = ext4_split_convert_extents(handle, inode, map, path,
3922-
flags | EXT4_GET_BLOCKS_CONVERT, allocated);
3926+
flags, allocated);
39233927
if (IS_ERR(path))
39243928
return path;
39253929
/*

0 commit comments

Comments
 (0)