Btrfs: teach tree-checker to detect file extent items with overlapping ranges
PATCH 2/2 Btrfs: teach tree-checker to detect file extent items with overlapping ranges
From: Filipe Manana <[email protected]>
Having file extent items with ranges that overlap each other is a serious issue that leads to all sorts of corruptions and crashes (like a BUG_ON() during the course of __btrfs_drop_extents() when it traims file extent items). Therefore teach the tree checker to detect such cases. This is motivated by a recently fixed bug (race between ranged full fsync and writeback or adjacent ranges).
--- fs/btrfs/tree-checker.c | 51 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-)
fs/btrfs/tree-checker.c +47 -4
@@ -104,9 +104,27 @@ static void file_extent_err(const struct btrfs_fs_info *fs_info, (!IS_ALIGNED(btrfs_file_extent_##name((leaf), (fi)), (alignment))); \ }) +static u64 file_extent_end (struct extent_buffer *leaf, +struct btrfs_key *key, +struct btrfs_file_extent_item *extent) +{ +u64 end; +u64 len; + +if (btrfs_file_extent_type (leaf, extent) ==BTRFS_FILE_EXTENT_INLINE ) { + len =btrfs_file_extent_ram_bytes (leaf, extent); + end =ALIGN (key->offset + len, leaf->fs_info->sectorsize); + }else { + len =btrfs_file_extent_num_bytes (leaf, extent); + end = key->offset + len; + } +return end; +} +static int check_extent_data_item (struct btrfs_fs_info *fs_info,struct extent_buffer *leaf, -struct btrfs_key *key,int slot) +struct btrfs_key *key,int slot, +struct btrfs_key *prev_key) {struct btrfs_file_extent_item *fi;u32 sectorsize = fs_info->sectorsize;
@@ -185,6 +203,28 @@ static int check_extent_data_item(struct btrfs_fs_info *fs_info,CHECK_FE_ALIGNED (fs_info, leaf, slot, fi, offset, sectorsize) || CHECK_FE_ALIGNED(fs_info, leaf, slot, fi, num_bytes, sectorsize)) return -EUCLEAN; + +/* +* Check that no two consecutive file extent items, in the same leaf, +* present ranges that overlap each other. +*/ +if (slot >0 && + prev_key->objectid == key->objectid && + prev_key->type ==BTRFS_EXTENT_DATA_KEY ) { +struct btrfs_file_extent_item *prev_fi; +u64 prev_end; + + prev_fi =btrfs_item_ptr (leaf, slot -1 , + struct btrfs_file_extent_item); + prev_end =file_extent_end (leaf, prev_key, prev_fi); +if (prev_end > key->offset) { +file_extent_err (fs_info, leaf, slot -1 , +"file extent end range (%llu) goes beyond start offset (%llu) of the next file extent" , + prev_end, key->offset); +return -EUCLEAN ; + } + } +return 0 ; }
@@ -453,13 +493,15 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info,*/ static int check_leaf_item (struct btrfs_fs_info *fs_info,struct extent_buffer *leaf, -struct btrfs_key *key,int slot) +struct btrfs_key *key,int slot, +struct btrfs_key *prev_key) {int ret =0 ;switch (key->type) {case BTRFS_EXTENT_DATA_KEY : - ret =check_extent_data_item (fs_info, leaf, key, slot); + ret =check_extent_data_item (fs_info, leaf, key, slot, + prev_key);break ;case BTRFS_EXTENT_CSUM_KEY : ret =check_csum_item (fs_info, leaf, key, slot);
@@ -620,7 +662,8 @@ static int check_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf,* Check if the item size and content meet other * criteria */ - ret =check_leaf_item (fs_info, leaf, &key, slot); + ret =check_leaf_item (fs_info, leaf, &key, slot, + &prev_key);if (ret <0 )return ret; }
Signature · 1 line
2.11.0
Quoted 10 lines · On Mon, May 06, 2019 at 04:44:12PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
Having file extent items with ranges that overlap each other is a serious issue that leads to all sorts of corruptions and crashes (like a
BUG_ON()during the course of__btrfs_drop_extents()when it traims file extent items). Therefore teach the tree checker to detect such cases. This is motivated by a recently fixed bug (race between ranged full fsync and writeback or adjacent ranges).Signed-off-by Filipe Manana <[email protected]>
Thanks,
Josef
Quoted 10 lines · On 2019/5/6 下午11:44, [email protected] wrote:
From: Filipe Manana <[email protected]>
Having file extent items with ranges that overlap each other is a serious issue that leads to all sorts of corruptions and crashes (like a
BUG_ON()during the course of__btrfs_drop_extents()when it traims file extent items). Therefore teach the tree checker to detect such cases. This is motivated by a recently fixed bug (race between ranged full fsync and writeback or adjacent ranges).Signed-off-by Filipe Manana <[email protected]>
It's better than my previous patch which only checks overflow.
This one also compare with previous extent.
Thanks,
Qu
Quoted 95 lines
--- fs/btrfs/tree-checker.c | 51 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-)fs/btrfs/tree-checker.c +47
-4@@ -104,9 +104,27 @@ static void file_extent_err(const struct btrfs_fs_info *fs_info, (!IS_ALIGNED(btrfs_file_extent_##name((leaf), (fi)), (alignment))); \ }) +static u64 file_extent_end (struct extent_buffer *leaf, +struct btrfs_key *key, +struct btrfs_file_extent_item *extent) +{ +u64 end; +u64 len; + +if (btrfs_file_extent_type (leaf, extent) ==BTRFS_FILE_EXTENT_INLINE ) { + len =btrfs_file_extent_ram_bytes (leaf, extent); + end =ALIGN (key->offset + len, leaf->fs_info->sectorsize); + }else { + len =btrfs_file_extent_num_bytes (leaf, extent); + end = key->offset + len; + } +return end; +} +static int check_extent_data_item (struct btrfs_fs_info *fs_info,struct extent_buffer *leaf, -struct btrfs_key *key,int slot) +struct btrfs_key *key,int slot, +struct btrfs_key *prev_key) {struct btrfs_file_extent_item *fi;u32 sectorsize = fs_info->sectorsize;@@ -185,6 +203,28 @@ static int check_extent_data_item(struct btrfs_fs_info *fs_info,CHECK_FE_ALIGNED (fs_info, leaf, slot, fi, offset, sectorsize) || CHECK_FE_ALIGNED(fs_info, leaf, slot, fi, num_bytes, sectorsize)) return -EUCLEAN; + +/* +* Check that no two consecutive file extent items, in the same leaf, +* present ranges that overlap each other. +*/ +if (slot >0 && + prev_key->objectid == key->objectid && + prev_key->type ==BTRFS_EXTENT_DATA_KEY ) { +struct btrfs_file_extent_item *prev_fi; +u64 prev_end; + + prev_fi =btrfs_item_ptr (leaf, slot -1 , + struct btrfs_file_extent_item); + prev_end =file_extent_end (leaf, prev_key, prev_fi); +if (prev_end > key->offset) { +file_extent_err (fs_info, leaf, slot -1 , +"file extent end range (%llu) goes beyond start offset (%llu) of the next file extent" , + prev_end, key->offset); +return -EUCLEAN ; + } + } +return 0 ; }@@ -453,13 +493,15 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info,*/ static int check_leaf_item (struct btrfs_fs_info *fs_info,struct extent_buffer *leaf, -struct btrfs_key *key,int slot) +struct btrfs_key *key,int slot, +struct btrfs_key *prev_key) {int ret =0 ;switch (key->type) {case BTRFS_EXTENT_DATA_KEY : - ret =check_extent_data_item (fs_info, leaf, key, slot); + ret =check_extent_data_item (fs_info, leaf, key, slot, + prev_key);break ;case BTRFS_EXTENT_CSUM_KEY : ret =check_csum_item (fs_info, leaf, key, slot);@@ -620,7 +662,8 @@ static int check_leaf(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf,* Check if the item size and content meet other * criteria */ - ret =check_leaf_item (fs_info, leaf, &key, slot); + ret =check_leaf_item (fs_info, leaf, &key, slot, + &prev_key);if (ret <0 )return ret; }