Skip to content

relocation error handling fixes

Josef Bacik linux-btrfs 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest8 patches 3 repliesIn review
  2. v28 patches 14 repliesSuperseded
  3. v17 patches 18 repliesSuperseded

Changes in v3 from the cover letter

- Updated the free reloc control to use the rbtree postorder thing.
- Updated the changelog for patch 6.
- Fixed the error goto in patch 5.
- Added the reviewed-bys.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8btrfs: drop block from cache on error in relocationfs/btrfs/relocation.c+1 -10 replies
2/8btrfs: do not init a reloc root if we aren't relocatingfs/btrfs/relocation.c+4 -40 replies
3/8btrfs: unset reloc control if we fail to recoverfs/btrfs/relocation.c+5 -40 replies
4/8btrfs: free the reloc_control in a consistent wayfs/btrfs/relocation.c+16 -23 replies
5/8btrfs: run clean_dirty_subvols if we fail to start a transfs/btrfs/relocation.c+3 -40 replies
6/8btrfs: clear BTRFS_ROOT_DEAD_RELOC_TREE before dropping the reloc rootfs/btrfs/relocation.c+7 -60 replies
7/8btrfs: hold a ref on the root->reloc_rootfs/btrfs/relocation.c+48 -110 replies
8/8btrfs: remove a BUG_ON() from merge_reloc_roots()fs/btrfs/relocation.c+15 -10 replies

Reviews trailers per patch

4 of 8 patches have a Reviewed-by or Acked-by.

PatchQu Wenruo
1/8R-b
2/8R-b
3/8R-b
4/8
5/8R-b
6/8
7/8
8/8

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH 0/8][v3] relocation error handling fixes

v2->v3:
- Updated the free reloc control to use the rbtree postorder thing.
- Updated the changelog for patch 6.
- Fixed the error goto in patch 5.
- Added the reviewed-bys.

v1->v2:
- Incorporated the various feedback, tweaked some things, adjusted commit messages, added some more comments. Hopefully I got everything.
- Added "btrfs: do not init a reloc root if we aren't relocating", this is to oddress the weird handling of DEAD_ROOT and the use-after-free that Qu had originally attempted to fix.
- Reworked "btrfs: splice rc->reloc_roots onto reloc roots in recover" to simply handle cleaning up any remaining bigs on the reloc_control, since errors can mean we'll have some things left pending on the reloc_control.

------------------------------ Original email --------------------------------- My root ref patches have uncovered weird failures in some of our xfstests, particularly those that do balance while having errors.

I ran relocation through my eio-stress bpf script and loads of things fell out, these are the fixes required to make the stress test run to completion.

Dave this is just based on my master, I assume it'll apply cleanly to what you have, but if not let me know which branch you want me to rebase onto to get it to work right.

Most of these are straightforward, the only tricky/subtle one is 7/7, and I've added a lot of explanation there around my reasoning. 6/7 is also a little bit more complicated as it changes the rules slightly for reference holding for roots. Before we just sort of hoped and prayed we go the right reference dropped when we dropped root->reloc_root. Now we hold one ref for the list of reloc roots and one ref for root->reloc_root, so it's more clear when we need to be dropping references. Everything else is relatively straightforward. Thanks,

Josef