Skip to content

Fix lockdep issues around device removal

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. v4 Latest6 patches 12 repliesIn review
  2. v36 patches 4 repliesSuperseded
  3. v16 patches 3 repliesSuperseded

Changes in v4 from the cover letter

- I had a fixup for assinging devid that I mis-merged into the wrong patch, fixed this up by putting it in the correct patch.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6btrfs: use num_device to check for the last surviving seed devicefs/btrfs/volumes.c+1 -10 replies
2/6btrfs: add comments for device counts in struct btrfs_fs_devicesfs/btrfs/volumes.h+19 -00 replies
3/6btrfs: do not call close_fs_devices in btrfs_rm_devicefs/btrfs/volumes.c+8 -13 replies
4/6btrfs: handle device lookup with btrfs_dev_lookup_argsfs/btrfs/dev-replace.c fs/btrfs/ioctl.c fs/btrfs/scrub.c +2 more+108 -643 replies
5/6btrfs: add a btrfs_get_dev_args_from_path helperfs/btrfs/volumes.c fs/btrfs/volumes.h+67 -322 replies
6/6btrfs: use btrfs_get_dev_args_from_path in dev removal ioctlsfs/btrfs/ioctl.c fs/btrfs/volumes.c fs/btrfs/volumes.h+48 -363 replies

Reviews trailers per patch

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

PatchNikolay BorisovAnand Jain
1/6
2/6
3/6R-b
4/6R-b R-b
5/6R-b R-b
6/6R-b

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

Read the v4 thread

Cover letter [PATCH v4 0/6] Fix lockdep issues around device removal

v3->v4:
- I had a fixup for assinging devid that I mis-merged into the wrong patch, fixed this up by putting it in the correct patch.

v2->v3:
- Dropped the patches that kdave already merged.
- Added some prep patches that Anand had that I need for my fixes.
- Reworked device lookup to take an args struct since we were getting a complicated mixture of function arguments.
- Reworked device removal to generate this args struct so we can pass it into device_remove in order to find the correct device to remove.

v1->v2:
- Rework the first patch as it was wrong because we need it for seed devices.
- Fix another lockdep splat I uncovered while testing against seed devices to make sure I hadn't broken anything.

--- Original email ---

Hello,

The commit 87579e9b7d8d ("loop: use worker per cgroup instead of kworker") enabled the use of workqueues for loopback devices, which brought with it lockdep annotations for the workqueues for loopback devices. This uncovered a cascade of lockdep warnings because of how we mess with the block_device while under the sb writers lock while doing the device removal.

The first patch seems innocuous but we have a lockdep_assert_held(&uuid_mutex) in one of the helpers, which is why I have it first. The code should never be called which is why it is removed, but I'm removing it specifically to remove confusion about the role of the uuid_mutex here.

The next 4 patches are to resolve the lockdep messages as they occur. There are several issues and I address them one at a time until we're no longer getting lockdep warnings.

The final patch doesn't necessarily have to go in right away, it's just a cleanup as I noticed we have a lot of duplicated code between the v1 and v2 device removal handling. Thanks,

Josef

Anand Jain (2):
btrfs: use num_device to check for the last surviving seed device
btrfs: add comments for device counts in struct btrfs_fs_devices

Josef Bacik (4):
btrfs: do not call close_fs_devices in btrfs_rm_device
btrfs: handle device lookup with btrfs_dev_lookup_args
btrfs: add a btrfs_get_dev_args_from_path helper
btrfs: use btrfs_get_dev_args_from_path in dev removal ioctls

 fs/btrfs/dev-replace.c |  18 ++--
 fs/btrfs/ioctl.c       |  80 ++++++++-------
 fs/btrfs/scrub.c       |   6 +-
 fs/btrfs/volumes.c     | 215 +++++++++++++++++++++++++++--------------
 fs/btrfs/volumes.h     |  40 +++++++-
 5 files changed, 238 insertions(+), 121 deletions(-)
Signature · 1 line
2.26.3