Skip to content

Commit b6debf1

Browse files
adam900710kdave
authored andcommitted
btrfs: qgroup: Search commit root for rescan to avoid missing extent
When doing qgroup rescan using the following script (modified from btrfs/017 test case), we can sometimes hit qgroup corruption. ------ umount $dev &> /dev/null umount $mnt &> /dev/null mkfs.btrfs -f -n 64k $dev mount $dev $mnt extent_size=8192 xfs_io -f -d -c "pwrite 0 $extent_size" $mnt/foo > /dev/null btrfs subvolume snapshot $mnt $mnt/snap xfs_io -f -c "reflink $mnt/foo" $mnt/foo-reflink > /dev/null xfs_io -f -c "reflink $mnt/foo" $mnt/snap/foo-reflink > /dev/null xfs_io -f -c "reflink $mnt/foo" $mnt/snap/foo-reflink2 > /dev/unll btrfs quota enable $mnt # -W is the new option to only wait rescan while not starting new one btrfs quota rescan -W $mnt btrfs qgroup show -prce $mnt umount $mnt # Need to patch btrfs-progs to report qgroup mismatch as error btrfs check $dev || _fail ------ For fast machine, we can hit some corruption which missed accounting tree blocks: ------ qgroupid rfer excl max_rfer max_excl parent child -------- ---- ---- -------- -------- ------ ----- 0/5 8.00KiB 0.00B none none --- --- 0/257 8.00KiB 0.00B none none --- --- ------ This is due to the fact that we're always searching commit root for btrfs_find_all_roots() at qgroup_rescan_leaf(), but the leaf we get is from current transaction, not commit root. And if our tree blocks get modified in current transaction, we won't find any owner in commit root, thus causing the corruption. Fix it by searching commit root for extent tree for qgroup_rescan_leaf(). Reported-by: Nikolay Borisov <[email protected]> Signed-off-by: Qu Wenruo <[email protected]> Reviewed-by: Nikolay Borisov <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 7a1b1e7 commit b6debf1

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

fs/btrfs/qgroup.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2590,7 +2590,6 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
25902590
struct btrfs_key found;
25912591
struct extent_buffer *scratch_leaf = NULL;
25922592
struct ulist *roots = NULL;
2593-
struct seq_list tree_mod_seq_elem = SEQ_LIST_INIT(tree_mod_seq_elem);
25942593
u64 num_bytes;
25952594
int slot;
25962595
int ret;
@@ -2625,7 +2624,6 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
26252624
btrfs_header_nritems(path->nodes[0]) - 1);
26262625
fs_info->qgroup_rescan_progress.objectid = found.objectid + 1;
26272626

2628-
btrfs_get_tree_mod_seq(fs_info, &tree_mod_seq_elem);
26292627
scratch_leaf = btrfs_clone_extent_buffer(path->nodes[0]);
26302628
if (!scratch_leaf) {
26312629
ret = -ENOMEM;
@@ -2664,7 +2662,6 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
26642662
btrfs_tree_read_unlock_blocking(scratch_leaf);
26652663
free_extent_buffer(scratch_leaf);
26662664
}
2667-
btrfs_put_tree_mod_seq(fs_info, &tree_mod_seq_elem);
26682665

26692666
return ret;
26702667
}
@@ -2681,6 +2678,12 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work)
26812678
path = btrfs_alloc_path();
26822679
if (!path)
26832680
goto out;
2681+
/*
2682+
* Rescan should only search for commit root, and any later difference
2683+
* should be recorded by qgroup
2684+
*/
2685+
path->search_commit_root = 1;
2686+
path->skip_locking = 1;
26842687

26852688
err = 0;
26862689
while (!err && !btrfs_fs_closing(fs_info)) {

0 commit comments

Comments
 (0)