Skip to content

btrfs: seed fix null ptr, use only main device_list_mutex, and cleanups

Anand Jain fstests linux-btrfs 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest posting 2/216 patches 10 repliesIn review
  2. v3 posting 1/22 of 15 patches 1 replySuperseded
  3. v215 patches 16 repliesSuperseded

Changes in v3 from the cover letter

Makes bug fixing patches suitable for the backports. They are patch 1-2. patch 1 fix the put of kobject null issue, fixed by checking the
state_initalized.
patch 2 fixes the replacement of seed device in a sprout filesystem.

Patches in v3 posting 2/2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/16btrfs: fix put of uninitialized kobject after seed device deletefs/btrfs/sysfs.c+10 -66 replies
2/16btrfs: fix replace of seed devicefs/btrfs/dev-replace.c+1 -10 replies
3/16btrfs: add btrfs_sysfs_add_device helperfs/btrfs/sysfs.c+53 -260 replies
4/16btrfs: add btrfs_sysfs_remove_device helperfs/btrfs/sysfs.c+27 -341 reply
5/16btrfs: btrfs_sysfs_remove_devices_dir drop return valuefs/btrfs/sysfs.c fs/btrfs/sysfs.h+5 -70 replies
6/16btrfs: refactor btrfs_sysfs_add_devices_dirfs/btrfs/dev-replace.c fs/btrfs/sysfs.c fs/btrfs/sysfs.h +1 more+9 -130 replies
7/16btrfs: refactor btrfs_sysfs_remove_devices_dirfs/btrfs/dev-replace.c fs/btrfs/sysfs.c fs/btrfs/sysfs.h +1 more+17 -230 replies
8/16btrfs: initialize sysfs devid and device link for seed devicefs/btrfs/sysfs.c+15 -00 replies
9/16btrfs: handle fail path for btrfs_sysfs_add_fs_devicesfs/btrfs/sysfs.c+6 -20 replies
10/16btrfs: reada: use sprout device_list_mutexfs/btrfs/reada.c+3 -20 replies
11/16btrfs: btrfs_init_devices_late: use sprout device_list_mutexfs/btrfs/volumes.c+1 -30 replies
12/16btrfs: open code list_head pointer in btrfs_init_dev_replace_tgtdevfs/btrfs/dev-replace.c+1 -30 replies
13/16btrfs: cleanup btrfs_remove_chunkfs/btrfs/volumes.c+4 -52 replies
14/16btrfs: cleanup btrfs_assign_next_active_device()fs/btrfs/volumes.c+3 -60 replies
15/16btrfs: cleanup unnecessary goto in open_seed_devicefs/btrfs/volumes.c+3 -50 replies
16/16btrfs: btrfs_dev_replace_update_device_in_mapping_tree drop file global declarefs/btrfs/dev-replace.c+26 -300 replies

Reviews trailers per patch

12 of 16 patches have a Reviewed-by or Acked-by.

PatchNikolay BorisovJosef BacikJohannes Thumshirn
1/16
2/16
3/16R-b
4/16R-b R-b R-b
5/16R-b R-b
6/16R-b R-b
7/16R-b
8/16
9/16R-b
10/16R-b
11/16
12/16R-b
13/16R-b
14/16R-b
15/16R-b
16/16R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/16] btrfs: seed fix null ptr, use only main device_list_mutex, and cleanups

v3:
Makes bug fixing patches suitable for the backports. They are patch 1-2. patch 1 fix the put of kobject null issue, fixed by checking the
state_initalized.
patch 2 fixes the replacement of seed device in a sprout filesystem.

The rest of the patches remains the same, except for a conflict fix in patch 4.

The patch set has passed xfstests -g volume and seed
The new patch (seed delete testing) btrfs/219 has been modified to suit the older kernels. Which is also attached to this thread.

-------- v2 cover-letter -------
v2:
patch 1-3 are cleanups and is a split from the v1-patch-1/11. patch 4-5 are from v1 with conflict fix.
patch 6 is the core bug fix, which fixes the null sysfs obj being freed
which was in v1 also but together with other required preparatory.
patch 7 fixes a new bug found that we leaked sysfs object in the fail
exit path.
patch 8,9,10,11,12,13,14,15 were in v1 as well. 8,9 consolidates
device_list_mutex to use the main fs_info->fs_devices. 10-14 are cleanups. 15 fixes bug exposed after replacing of seed and trying to mount without the seed.

v2 has been tested with xfstests -g volume

------ v1 cover-letter ------------
In this patch set:
Rebased on latest misc-next which contains the seed_list from Nicolas. This patchset has been sent before as two sets, here it is been merged.

Patches 1/11 fix the null kobject being put, which is observed with kernel compiled with memory poisoning.
Patches 2/11 and 3/11 are cleanups to maintain better flow in the functions btrfs_sysfs_add_devices_dir() and btrfs_sysfs_remove_devices_dir(). Patches 4/11 and 5/11 drops the last two users of seed device_list_mutex, so now they hold main filesystem device_list_mutex.
Patches [6-10]/11 are cleanups.
Patches 11/11 block the replacement of seed device in a sprouted FS, we already block replacing a seed device on a non-sprouted device.

This set has passed through fstests/volume.

---- original cover-letter ---------
In a sprouted file system, the seed's fs_devices are cloned and listed under the sprout's fs_devices. The fs_info::fs_devices points to the sprout::fs_devices and various critical operations like device-delete holds the top-level main device_list_mutex which is sprout::fs_devices::device_list_mutex and _not_ the seed level mutex such as sprout::fs_devices::seed::fs_devices::device_list_mutex.

Also all related readers (except for two threads- reada and init_devices_late) hold the sprout::fs_devices::device_list_mutex too. And those two threads which are missing to hold the correct lock are being fixed here.

I take the approach to fix the read end instead of fixing the writer end which are not holding the seed level mutex because to keep things simple and there isn't much benefit burning extra CPU cycles in going through the lock/unlock process as we traverse through the fs_devices::seed fs_devices (for example as in reada and init_devices_late threads).

The first two patches (1/7, 2/7) fixes the threads using the seed::device_list_mutex.

And rest of the patches ([3-7]/7) are cleanups and these patches are independent by themself.

These patchset has been tested with full xfstests btrfs test cases.

*** BLURB HERE ***

Anand Jain (16):
btrfs: fix put of uninitialized kobject after seed device delete
btrfs: fix replace of seed device
btrfs: add btrfs_sysfs_add_device helper
btrfs: add btrfs_sysfs_remove_device helper
btrfs: btrfs_sysfs_remove_devices_dir drop return value
btrfs: refactor btrfs_sysfs_add_devices_dir
btrfs: refactor btrfs_sysfs_remove_devices_dir
btrfs: initialize sysfs devid and device link for seed device
btrfs: handle fail path for btrfs_sysfs_add_fs_devices
btrfs: reada: use sprout device_list_mutex
btrfs: btrfs_init_devices_late: use sprout device_list_mutex
btrfs: open code list_head pointer in btrfs_init_dev_replace_tgtdev
btrfs: cleanup btrfs_remove_chunk
btrfs: cleanup btrfs_assign_next_active_device()
btrfs: cleanup unnecessary goto in open_seed_device
btrfs: btrfs_dev_replace_update_device_in_mapping_tree drop file
global declare

 fs/btrfs/dev-replace.c |  66 ++++++++---------
 fs/btrfs/reada.c       |   5 +-
 fs/btrfs/sysfs.c       | 159 +++++++++++++++++++++++++----------------
 fs/btrfs/sysfs.h       |   6 +-
 fs/btrfs/volumes.c     |  40 +++++------
 5 files changed, 147 insertions(+), 129 deletions(-)
Signature · 1 line
2.25.1