Skip to contentSkip to conversation

btrfs: rescue: allow ibadroots to skip bad extent tree when reading block group items

PATCH In review Qu Wenruo 4 participants 4 messages Jul 19, 2021 – Jul 21, 2021 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH v4 1/1 btrfs: rescue: allow ibadroots to skip bad extent tree when reading block group items

When extent tree gets corrupted, normally it's not extent tree root, but one toasted tree leaf/node.

In that case, rescue=ibadroots mount option won't help as it can only handle the extent tree root corruption.

This patch will enhance the behavior by:

- Allow fill_dummy_bgs() to ignore -EEXIST error

This means we may have some block group items read from disk, but then hit some error halfway.

- Fallback to fill_dummy_bgs() if any error gets hit in btrfs_read_block_groups()

Of course, this still needs rescue=ibadroots mount option.

With that, rescue=ibadroots can handle extent tree corruption more gracefully and allow a better recover chance.

---
Changelog:
v2:
- Don't try to fill with dummy block groups when we hit ENOMEM v3:
- Remove a dead condition
The empty fs_info->extent_root case has already been handled.
v4:
- Skip to next block group if we hit EEXIST when inserting the block group cache

---
 fs/btrfs/block-group.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
fs/btrfs/block-group.c +19 -0
index 5bd76a45037e..758ba856f8c6 100644
@@ -2105,11 +2105,22 @@ static int fill_dummy_bgs(struct btrfs_fs_info *fs_info)
 		bg->used = em->len;
 		bg->flags = map->type;
 		ret = btrfs_add_block_group_cache(fs_info, bg);
+		/*
+		 * We may have some valid block group cache added already, in
+		 * that case we skip to next bg.
+		 */
+		if (ret == -EEXIST) {
+			ret = 0;
+			btrfs_put_block_group(bg);
+			continue;
+		}
+
 		if (ret) {
 			btrfs_remove_free_space_cache(bg);
 			btrfs_put_block_group(bg);
 			break;
 		}
+
 		btrfs_update_space_info(fs_info, bg->flags, em->len, em->len,
 					0, 0, &space_info);
 		bg->space_info = space_info;
@@ -2212,6 +2223,14 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
 	ret = check_chunk_block_group_mappings(info);
 error:
 	btrfs_free_path(path);
+	/*
+	 * We hit some error reading the extent tree, and have rescue=ibadroots
+	 * mount option.
+	 * Try to fill using dummy block groups so that the user can continue
+	 * to mount and grab their data.
+	 */
+	if (ret && btrfs_test_opt(info, IGNOREBADROOTS))
+		ret = fill_dummy_bgs(info);
 	return ret;
 }
 
Signature · 1 line
2.32.0
Reviewed-by on v4 1/1
#1 lore raw
Quoted 17 lines · Qu Wenruo

When extent tree gets corrupted, normally it's not extent tree root, but one toasted tree leaf/node.

In that case, rescue=ibadroots mount option won't help as it can only handle the extent tree root corruption.

This patch will enhance the behavior by:

- Allow fill_dummy_bgs() to ignore -EEXIST error

This means we may have some block group items read from disk, but
then hit some error halfway.

- Fallback to fill_dummy_bgs() if any error gets hit in btrfs_read_block_groups()

Quoted 9 lines

Of course, this still needs rescue=ibadroots mount option.

With that, rescue=ibadroots can handle extent tree corruption more gracefully and allow a better recover chance.

LGTM.

--
Su

Quoted 62 lines

---
Changelog:
v2:
- Don't try to fill with dummy block groups when we hit ENOMEM v3:
- Remove a dead condition
The empty fs_info->extent_root case has already been handled.
v4:
- Skip to next block group if we hit EEXIST when inserting the block
group cache

---
 fs/btrfs/block-group.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
fs/btrfs/block-group.c +2 -0
index 5bd76a45037e..758ba856f8c6 100644
@@ -2105,11 +2105,22 @@ static int fill_dummy_bgs(struct 
 btrfs_fs_info *fs_info)
 		bg->used = em->len;
 		bg->flags = map->type;
 		ret = btrfs_add_block_group_cache(fs_info, bg);
+		/*
+		 * We may have some valid block group cache added already, 

in

fs/btrfs/block-group.c +11 -0
+		 * that case we skip to next bg.
+		 */
+		if (ret == -EEXIST) {
+			ret = 0;
+			btrfs_put_block_group(bg);
+			continue;
+		}
+
 		if (ret) {
 			btrfs_remove_free_space_cache(bg);
 			btrfs_put_block_group(bg);
 			break;
 		}
+
 		btrfs_update_space_info(fs_info, bg->flags, em->len, 
 em->len,
 					0, 0, &space_info);
 		bg->space_info = space_info;
@@ -2212,6 +2223,14 @@ int btrfs_read_block_groups(struct 
 btrfs_fs_info *info)
 	ret = check_chunk_block_group_mappings(info);
 error:
 	btrfs_free_path(path);
+	/*
+	 * We hit some error reading the extent tree, and have 

rescue=ibadroots

fs/btrfs/block-group.c +2 -0
+	 * mount option.
+	 * Try to fill using dummy block groups so that the user can 

continue

fs/btrfs/block-group.c +4 -0
+	 * to mount and grab their data.
+	 */
+	if (ret && btrfs_test_opt(info, IGNOREBADROOTS))
+		ret = fill_dummy_bgs(info);
 	return ret;
 }
Reviewed-by on v4 1/1
#2 lore raw
In reply to Qu Wenruo
Quoted 44 lines · Qu Wenruo

When extent tree gets corrupted, normally it's not extent tree root, but one toasted tree leaf/node.

In that case, rescue=ibadroots mount option won't help as it can only handle the extent tree root corruption.

This patch will enhance the behavior by:

- Allow fill_dummy_bgs() to ignore -EEXIST error

This means we may have some block group items read from disk, but then hit some error halfway.

- Fallback to fill_dummy_bgs() if any error gets hit in btrfs_read_block_groups()

Of course, this still needs rescue=ibadroots mount option.

With that, rescue=ibadroots can handle extent tree corruption more gracefully and allow a better recover chance.

---
Changelog:
v2:
- Don't try to fill with dummy block groups when we hit ENOMEM v3:
- Remove a dead condition
The empty fs_info->extent_root case has already been handled.
v4:
- Skip to next block group if we hit EEXIST when inserting the block group cache

---
  fs/btrfs/block-group.c | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
fs/btrfs/block-group.c +0 -0
index 5bd76a45037e..758ba856f8c6 100644
@@ -2105,11 +2105,22 @@ static int fill_dummy_bgs(struct btrfs_fs_info *fs_info)
  		bg->used = em->len;

fs/btrfs/block-group.c static int fill_dummy_bgs(struct btrfs_fs_info *fs_info) · line 2115

Quoted 10 lines
fs/btrfs/block-group.c +8 -0
  		bg->flags = map->type;
  		ret = btrfs_add_block_group_cache(fs_info, bg);
+		/*
+		 * We may have some valid block group cache added already, in
+		 * that case we skip to next bg.
+		 */
+		if (ret == -EEXIST) {
+			ret = 0;
+			btrfs_put_block_group(bg);
+			continue;

Looks good.

Thanks.

Quoted 27 lines
fs/btrfs/block-group.c +11 -0
+		}
+
  		if (ret) {
  			btrfs_remove_free_space_cache(bg);
  			btrfs_put_block_group(bg);
  			break;
  		}
+
  		btrfs_update_space_info(fs_info, bg->flags, em->len, em->len,
  					0, 0, &space_info);
  		bg->space_info = space_info;
@@ -2212,6 +2223,14 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
  	ret = check_chunk_block_group_mappings(info);
  error:
  	btrfs_free_path(path);
+	/*
+	 * We hit some error reading the extent tree, and have rescue=ibadroots
+	 * mount option.
+	 * Try to fill using dummy block groups so that the user can continue
+	 * to mount and grab their data.
+	 */
+	if (ret && btrfs_test_opt(info, IGNOREBADROOTS))
+		ret = fill_dummy_bgs(info);
  	return ret;
  }
 
#3 lore raw
In reply to Qu Wenruo
Quoted 24 lines · Qu Wenruo

When extent tree gets corrupted, normally it's not extent tree root, but one toasted tree leaf/node.

In that case, rescue=ibadroots mount option won't help as it can only handle the extent tree root corruption.

This patch will enhance the behavior by:

- Allow fill_dummy_bgs() to ignore -EEXIST error

This means we may have some block group items read from disk, but then hit some error halfway.

- Fallback to fill_dummy_bgs() if any error gets hit in btrfs_read_block_groups()

Of course, this still needs rescue=ibadroots mount option.

With that, rescue=ibadroots can handle extent tree corruption more gracefully and allow a better recover chance.

Quoted 10 lines

---
Changelog:
v2:
- Don't try to fill with dummy block groups when we hit ENOMEM v3:
- Remove a dead condition
The empty fs_info->extent_root case has already been handled.
v4:
- Skip to next block group if we hit EEXIST when inserting the block group cache

Added to misc-next, thanks.