Skip to content

Commit 7015fcf

Browse files
zhangyi089gregkh
authored andcommitted
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
commit 1bf6974 upstream. When allocating initialized blocks from a large unwritten extent, or when splitting an unwritten extent during end I/O and converting it to initialized, there is currently a potential issue of stale data if the extent needs to be split in the middle. 0 A B N [UUUUUUUUUUUU] U: unwritten extent [--DDDDDDDD--] D: valid data |<- ->| ----> this range needs to be initialized ext4_split_extent() first try to split this extent at B with EXT4_EXT_DATA_ENTIRE_VALID1 and EXT4_EXT_MAY_ZEROOUT flag set, but ext4_split_extent_at() failed to split this extent due to temporary lack of space. It zeroout B to N and mark the entire extent from 0 to N as written. 0 A B N [WWWWWWWWWWWW] W: written extent [SSDDDDDDDDZZ] Z: zeroed, S: stale data ext4_split_extent() then try to split this extent at A with EXT4_EXT_DATA_VALID2 flag set. This time, it split successfully and left a stale written extent from 0 to A. 0 A B N [WW|WWWWWWWWWW] [SS|DDDDDDDDZZ] Fix this by pass EXT4_EXT_DATA_PARTIAL_VALID1 to ext4_split_extent_at() when splitting at B, don't convert the entire extent to written and left it as unwritten after zeroing out B to N. The remaining work is just like the standard two-part split. ext4_split_extent() will pass the EXT4_EXT_DATA_VALID2 flag when it calls ext4_split_extent_at() for the second time, allowing it to properly handle the split. If the split is successful, it will keep extent from 0 to A as unwritten. 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-3-yi.zhang@huaweicloud.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 716e743 commit 7015fcf

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

fs/ext4/extents.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3310,6 +3310,15 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,
33103310
}
33113311

33123312
if (!err) {
3313+
/*
3314+
* The first half contains partially valid data, the
3315+
* splitting of this extent has not been completed, fix
3316+
* extent length and ext4_split_extent() split will the
3317+
* first half again.
3318+
*/
3319+
if (split_flag & EXT4_EXT_DATA_PARTIAL_VALID1)
3320+
goto fix_extent_len;
3321+
33133322
/* update the extent length and mark as initialized */
33143323
ex->ee_len = cpu_to_le16(ee_len);
33153324
ext4_ext_try_to_merge(handle, inode, path, ex);
@@ -3379,7 +3388,9 @@ static struct ext4_ext_path *ext4_split_extent(handle_t *handle,
33793388
split_flag1 |= EXT4_EXT_MARK_UNWRIT1 |
33803389
EXT4_EXT_MARK_UNWRIT2;
33813390
if (split_flag & EXT4_EXT_DATA_VALID2)
3382-
split_flag1 |= EXT4_EXT_DATA_ENTIRE_VALID1;
3391+
split_flag1 |= map->m_lblk > ee_block ?
3392+
EXT4_EXT_DATA_PARTIAL_VALID1 :
3393+
EXT4_EXT_DATA_ENTIRE_VALID1;
33833394
path = ext4_split_extent_at(handle, inode, path,
33843395
map->m_lblk + map->m_len, split_flag1, flags1);
33853396
if (IS_ERR(path))

0 commit comments

Comments
 (0)