Skip to content

Commit d75d72a

Browse files
josefbacikkdave
authored andcommitted
btrfs: fix improper generation check in snapshot delete
We have been using the following check if (generation <= root->root_key.offset) to make decisions about whether or not to visit a node during snapshot delete. This is because for normal subvolumes this is set to 0, and for snapshots it's set to the creation generation. The idea being that if the generation of the node is less than or equal to our creation generation then we don't need to visit that node, because it doesn't belong to us, we can simply drop our reference and move on. However reloc roots don't have their generation stored in root->root_key.offset, instead that is the objectid of their corresponding fs root. This means we can incorrectly not walk into nodes that need to be dropped when deleting a reloc root. There are a variety of consequences to making the wrong choice in two distinct areas. visit_node_for_delete() 1. False positive. We think we are newer than the block when we really aren't. We don't visit the node and drop our reference to the node and carry on. This would result in leaked space. 2. False negative. We do decide to walk down into a block that we should have just dropped our reference to. However this means that the child node will have refs > 1, so we will switch to UPDATE_BACKREF, and then the subsequent walk_down_proc() will notice that btrfs_header_owner(node) != root->root_key.objectid and it'll break out of the loop, and then walk_up_proc() will drop our reference, so this appears to be ok. do_walk_down() 1. False positive. We are in UPDATE_BACKREF and incorrectly decide that we are done and don't need to update the backref for our lower nodes. This is another case that simply won't happen with relocation, as we only have to do UPDATE_BACKREF if the node below us was shared and didn't have FULL_BACKREF set, and since we don't own that node because we're a reloc root we actually won't end up in this case. 2. False negative. Again this is tricky because as described above, we simply wouldn't be here from relocation, because we don't own any of the nodes because we never set btrfs_header_owner() to the reloc root objectid, and we always use FULL_BACKREF, we never actually need to set FULL_BACKREF on any children. Having spent a lot of time stressing relocation/snapshot delete recently I've not seen this pop in practice. But this is objectively incorrect, so fix this to get the correct starting generation based on the root we're dropping to keep me from thinking there's a problem here. CC: [email protected] Reviewed-by: Filipe Manana <[email protected]> Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 40384c8 commit d75d72a

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

fs/btrfs/ctree.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,25 @@ static inline void btrfs_set_root_last_trans(struct btrfs_root *root, u64 transi
370370
WRITE_ONCE(root->last_trans, transid);
371371
}
372372

373+
/*
374+
* Return the generation this root started with.
375+
*
376+
* Every normal root that is created with root->root_key.offset set to it's
377+
* originating generation. If it is a snapshot it is the generation when the
378+
* snapshot was created.
379+
*
380+
* However for TREE_RELOC roots root_key.offset is the objectid of the owning
381+
* tree root. Thankfully we copy the root item of the owning tree root, which
382+
* has it's last_snapshot set to what we would have root_key.offset set to, so
383+
* return that if this is a TREE_RELOC root.
384+
*/
385+
static inline u64 btrfs_root_origin_generation(const struct btrfs_root *root)
386+
{
387+
if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)
388+
return btrfs_root_last_snapshot(&root->root_item);
389+
return root->root_key.offset;
390+
}
391+
373392
/*
374393
* Structure that conveys information about an extent that is going to replace
375394
* all the extents in a file range.

fs/btrfs/extent-tree.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5285,7 +5285,7 @@ static bool visit_node_for_delete(struct btrfs_root *root, struct walk_control *
52855285
* reference to it.
52865286
*/
52875287
generation = btrfs_node_ptr_generation(eb, slot);
5288-
if (!wc->update_ref || generation <= root->root_key.offset)
5288+
if (!wc->update_ref || generation <= btrfs_root_origin_generation(root))
52895289
return false;
52905290

52915291
/*
@@ -5340,7 +5340,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans,
53405340
goto reada;
53415341

53425342
if (wc->stage == UPDATE_BACKREF &&
5343-
generation <= root->root_key.offset)
5343+
generation <= btrfs_root_origin_generation(root))
53445344
continue;
53455345

53465346
/* We don't lock the tree block, it's OK to be racy here */
@@ -5683,7 +5683,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
56835683
* for the subtree
56845684
*/
56855685
if (wc->stage == UPDATE_BACKREF &&
5686-
generation <= root->root_key.offset) {
5686+
generation <= btrfs_root_origin_generation(root)) {
56875687
wc->lookup_info = 1;
56885688
return 1;
56895689
}

0 commit comments

Comments
 (0)