btrf_show_devname related fixes
cover btrf_show_devname related fixes
Related to the bug/fix posted to the mailing list as below
btrfs: traverse seed devices if fs_devices::devices is empty in show_devname
Anand Jain (3):
btrfs: fix comment about the btrfs_show_devname
btrfs: consolidate device_list_mutex in prepare_sprout to its parent
btrfs: use latest_bdev in btrfs_show_devname
fs/btrfs/super.c | 25 +++---------------------- fs/btrfs/volumes.c | 11 ++++------- 2 files changed, 7 insertions(+), 29 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/3 btrfs: fix comment about the btrfs_show_devname
There were few lock dep warnings because btrfs_show_devname() was using device_list_mutex as recorded in the commits
ccd05285e7f (btrfs: fix a possible umount deadlock) 779bf3fefa8 (btrfs: fix lock dep warning, move scratch dev out of device_list_mutex and uuid_mutex)
And finally, commit 88c14590cdd6 (btrfs: use RCU in btrfs_show_devname for device list traversal) removed the device_list_mutex from btrfs_show_devname for performance reasons.
This patch fixes a stale comment about the function btrfs_show_devname.
--- fs/btrfs/volumes.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
fs/btrfs/volumes.c +1 -4
@@ -2278,10 +2278,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev)/* * The update_dev_time() with in btrfs_scratch_superblocks() -* may lead to a call to btrfs_show_devname() which will try -* to hold device_list_mutex. And here this device -* is already out of device list, so we don't have to hold -* the device_list_mutex lock. +* may lead to a call to btrfs_show_devname(). */ btrfs_scratch_superblocks (tgtdev->fs_info, tgtdev->bdev, tgtdev->name->str);
Signature · 1 line
2.31.1
RFC PATCH 2/3 btrfs: consolidate device_list_mutex in prepare_sprout to its parent
In reply to Anand Jainbtrfs_prepare_sprout() moves seed devices into its own struct fs_devices, so that its parent function btrfs_init_new_device() can add the new sprout device to fs_info->fs_devices.
Both btrfs_prepare_sprout() and btrfs_init_new_device() needs device_list_mutex. But they are holding it sequentially, thus creates a small window to an opportunity to race. Close this opportunity and hold device_list_mutex common to both btrfs_init_new_device() and btrfs_prepare_sprout().
---
RFC because I haven't identified the other thread which could race with this, but still does this cleanup makes sense?
fs/btrfs/volumes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/volumes.c +3 -3
@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info)u64 super_flags;lockdep_assert_held (&uuid_mutex); +lockdep_assert_held (&fs_devices->device_list_mutex); +if (!fs_devices->seeding)return -EINVAL ;
@@ -2397,7 +2399,6 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info)INIT_LIST_HEAD (&seed_devices->alloc_list);mutex_init (&seed_devices->device_list_mutex); -mutex_lock (&fs_devices->device_list_mutex);list_splice_init_rcu (&fs_devices->devices, &seed_devices->devices, synchronize_rcu);list_for_each_entry (device, &seed_devices->devices, dev_list)
@@ -2413,7 +2414,6 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info)generate_random_uuid (fs_devices->fsid);memcpy (fs_devices->metadata_uuid, fs_devices->fsid,BTRFS_FSID_SIZE );memcpy (disk_super->fsid, fs_devices->fsid,BTRFS_FSID_SIZE ); -mutex_unlock (&fs_devices->device_list_mutex); super_flags =btrfs_super_flags (disk_super) & ~BTRFS_SUPER_FLAG_SEEDING ;
@@ -2588,6 +2588,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path device->dev_stats_valid =1 ;set_blocksize (device->bdev,BTRFS_BDEV_BLOCKSIZE ); +mutex_lock (&fs_devices->device_list_mutex);if (seeding_dev) {btrfs_clear_sb_rdonly (sb); ret =btrfs_prepare_sprout (fs_info);
@@ -2599,7 +2600,6 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path device->fs_devices = fs_devices; -mutex_lock (&fs_devices->device_list_mutex);mutex_lock (&fs_info->chunk_mutex);list_add_rcu (&device->dev_list, &fs_devices->devices);list_add (&device->dev_alloc_list, &fs_devices->alloc_list);
Signature · 1 line
2.31.1
Re: [PATCH RFC 2/3] btrfs: consolidate device_list_mutex in prepare_sprout to its parent
Quoted 23 lines · Anand Jain
btrfs_prepare_sprout()moves seed devices into its own structfs_devices, so that its parent functionbtrfs_init_new_device()can add the new sprout device tofs_info->fs_devices.Both
btrfs_prepare_sprout()andbtrfs_init_new_device()needsdevice_list_mutex. But they are holding it sequentially, thus creates a small window to an opportunity to race. Close this opportunity and holddevice_list_mutexcommon to bothbtrfs_init_new_device()andbtrfs_prepare_sprout().Signed-off-by Anand Jain <[email protected]>---
RFC because I haven't identified the other thread which could race with this, but still does this cleanup makes sense?fs/btrfs/volumes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/btrfs/volumes.c +0
-0
fs/btrfs/volumes.c static int btrfs_prepare_sprout(struct · line 2372
Quoted 7 lines
fs/btrfs/volumes.c +2
-0@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags;lockdep_assert_held (&uuid_mutex); +lockdep_assert_held (&fs_devices->device_list_mutex); +
Just a reminder: clone_fs_devices() still takes the mutex in misc-next.
Quoted 26 lines
fs/btrfs/volumes.c +0
-0if (!fs_devices->seeding)fs/btrfs/volumes.c +0
-1return -EINVAL ;@@ -2397,7 +2399,6 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) INIT_LIST_HEAD(&seed_devices->alloc_list);mutex_init (&seed_devices->device_list_mutex); -mutex_lock (&fs_devices->device_list_mutex); list_splice_init_rcu(&fs_devices->devices, &seed_devices->devices,fs/btrfs/volumes.c +0
-1synchronize_rcu);list_for_each_entry (device, &seed_devices->devices, dev_list)@@ -2413,7 +2414,6 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) generate_random_uuid(fs_devices->fsid);memcpy (fs_devices->metadata_uuid, fs_devices->fsid,BTRFS_FSID_SIZE );memcpy (disk_super->fsid, fs_devices->fsid,BTRFS_FSID_SIZE ); -mutex_unlock (&fs_devices->device_list_mutex);fs/btrfs/volumes.c +0
-0super_flags =btrfs_super_flags (disk_super) & ~BTRFS_SUPER_FLAG_SEEDING ;@@ -2588,6 +2588,7 @@ int btrfs_init_new_device(struct
btrfs_fs_info*fs_info, const char*device_path
fs/btrfs/volumes.c int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path · line 2594
Quoted 7 lines
fs/btrfs/volumes.c +1
-0device->dev_stats_valid =1 ;set_blocksize (device->bdev,BTRFS_BDEV_BLOCKSIZE ); +mutex_lock (&fs_devices->device_list_mutex);if (seeding_dev) {btrfs_clear_sb_rdonly (sb); ret =btrfs_prepare_sprout (fs_info);
the erorr case:
if (ret) {
mutex_unlock(&fs_devices->device_list_mutex);
...
}
Thanks.
--
Su
Quoted 9 lines
fs/btrfs/volumes.c +0
-0@@ -2599,7 +2600,6 @@ int btrfs_init_new_device(struct
btrfs_fs_info*fs_info, const char*device_pathfs/btrfs/volumes.c +0
-1device->fs_devices = fs_devices; -mutex_lock (&fs_devices->device_list_mutex);mutex_lock (&fs_info->chunk_mutex);list_add_rcu (&device->dev_list, &fs_devices->devices);list_add (&device->dev_alloc_list, &fs_devices->alloc_list);
Re: [PATCH RFC 2/3] btrfs: consolidate device_list_mutex in prepare_sprout to its parent
Quoted 11 lines
fs/btrfs/volumes.c static int btrfs_prepare_sprout(struct · line 2372
Quoted 10 lines
fs/btrfs/volumes.c +2
-0@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags; lockdep_assert_held(&uuid_mutex); + lockdep_assert_held(&fs_devices->device_list_mutex); +Just a reminder:
clone_fs_devices()still takes the mutex in misc-next.
As I am checking clone_fs_devices() does not take any lock.
Could you pls recheck?
Quoted 5 lines
Quoted 5 lines
fs/btrfs/volumes.c +0
-0@@ -2588,6 +2588,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path device->dev_stats_valid = 1; set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);
Quoted 10 lines
Quoted 5 lines
fs/btrfs/volumes.c +1
-0+ mutex_lock(&fs_devices->device_list_mutex); if (seeding_dev) { btrfs_clear_sb_rdonly(sb);ret =
btrfs_prepare_sprout(fs_info);the erorr case:
if (ret) {
mutex_unlock(&fs_devices->device_list_mutex);
...
}
Right. I missed it will fix.
Thanks.
Re: [PATCH RFC 2/3] btrfs: consolidate device_list_mutex in prepare_sprout to its parent
Quoted 4 lines · Anand Jain
Quoted 4 lines
Quoted 4 lines
fs/btrfs/volumes.c +0
-0@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags;
Quoted 8 lines
Quoted 5 lines
fs/btrfs/volumes.c static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) · line 2373
Quoted 4 lines
fs/btrfs/volumes.c +2
-0lockdep_assert_held (&uuid_mutex); +lockdep_assert_held (&fs_devices->device_list_mutex); +Just a reminder:
clone_fs_devices()still takes the mutex in misc-next.As I am checking
clone_fs_devices()does not take any lock.
Could you pls recheck?
Hmmmm... misc-next:
--
Su
Quoted 21 lines
Quoted 13 lines
Quoted 4 lines
(quoted diff) +0
-0@@ -2588,6 +2588,7 @@ int btrfs_init_new_device(struct
btrfs_fs_info*fs_info, const char*device_pathQuoted 8 lines
device->dev_stats_valid = 1; set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);+ mutex_lock(&fs_devices->device_list_mutex); if (seeding_dev) { btrfs_clear_sb_rdonly(sb); ret = btrfs_prepare_sprout(fs_info);the erorr case:
Quoted 4 lines
if (ret) { mutex_unlock(&fs_devices->device_list_mutex); ... }Right. I missed it will fix.
Thanks.
Re: [PATCH RFC 2/3] btrfs: consolidate device_list_mutex in prepare_sprout to its parent
Quoted 13 lines · Su Yue
Quoted 10 lines · Anand Jain
Quoted 10 lines
fs/btrfs/volumes.c static int btrfs_prepare_sprout(struct · line 2372
Quoted 8 lines
fs/btrfs/volumes.c +2
-0@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags;lockdep_assert_held (&uuid_mutex); +lockdep_assert_held (&fs_devices->device_list_mutex); +Just a reminder:
clone_fs_devices()still takes the mutex in misc-next.
Quoted 7 lines
Quoted 3 lines
As I am checking
clone_fs_devices()does not take any lock.
Could you pls recheck?Hmmmm... misc-next:
Sorry, it should be
https://github.com/kdave/btrfs-devel/blob/misc-next/fs/btrfs/volumes.c#L995
--
Su
Re: [PATCH RFC 2/3] btrfs: consolidate device_list_mutex in prepare_sprout to its parent
Quoted 20 lines · Su Yue
Quoted 17 lines · Su Yue
Quoted 13 lines · Anand Jain
Quoted 10 lines
fs/btrfs/volumes.c static int btrfs_prepare_sprout(struct · line 2372
Quoted 8 lines
fs/btrfs/volumes.c +2
-0@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags; lockdep_assert_held(&uuid_mutex); + lockdep_assert_held(&fs_devices->device_list_mutex); +Just a reminder:
clone_fs_devices()still takes the mutex in misc-next.As I am checking
clone_fs_devices()does not take any lock. Could you pls recheck?
Quoted 8 lines
Quoted 4 lines
Hmmmm... misc-next:
Sorry, it should be
https://github.com/kdave/btrfs-devel/blob/misc-next/fs/btrfs/volumes.c#L995
Some of the Git commands stopped working. I had to run git fsck. Now I see mutex in close_fs_devices(), not sure if I was blind to it
before.
Anyway, this is a bad patch. I am working to fix it.
Thanks, Anand
Quoted 3 lines
Signature · 2 lines
-- Su
Re: [PATCH RFC 2/3] btrfs: consolidate device_list_mutex in prepare_sprout to its parent
Quoted 28 lines · Anand Jain
Quoted 27 lines · Su Yue
Quoted 13 lines · Su Yue
Quoted 10 lines · Anand Jain
Quoted 10 lines
fs/btrfs/volumes.c static int btrfs_prepare_sprout(struct · line 2372
Quoted 8 lines
fs/btrfs/volumes.c +2
-0@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags; lockdep_assert_held(&uuid_mutex); + lockdep_assert_held(&fs_devices->device_list_mutex); +Just a reminder:
clone_fs_devices()still takes the mutex in misc-next.Quoted 8 lines
Quoted 3 lines
As I am checking
clone_fs_devices()does not take any lock. Could you pls recheck?Hmmmm... misc-next:
Sorry, it should be
Quoted 9 lines
Some of the Git commands stopped working. I had to run git fsck. Now I see mutex in
close_fs_devices(), not sure if I was blind to it
before.
Anyway, this is a bad patch. I am working to fix it.
Git errors were distracting. But why I didn't see thedevice_list_mutex is because I had the following patch [1] in my workspace, which is not yet integrated to the misc-next / commented.
[1] btrfs: fix lockdep warning while mounting sprout fs
https://lore.kernel.org/linux-btrfs/[email protected]/
So as of now, I can say this patch needs the above patch.
Could you please apply the above patch before this patch for tests?
Thanks, Anand
Re: [PATCH RFC 2/3] btrfs: consolidate device_list_mutex in prepare_sprout to its parent
Quoted 45 lines · Anand Jain
Quoted 28 lines · Anand Jain
Quoted 27 lines · Su Yue
Quoted 13 lines · Su Yue
Quoted 10 lines · Anand Jain
Quoted 10 lines
Review static int btrfs_prepare_sprout(struct · line 2372
Quoted 8 lines
(quoted diff) +2
-0@@ -2366,6 +2366,8 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) u64 super_flags; lockdep_assert_held(&uuid_mutex); + lockdep_assert_held(&fs_devices->device_list_mutex); +Just a reminder:
clone_fs_devices()still takes the mutex in misc-next.Quoted 8 lines
Quoted 3 lines
As I am checking
clone_fs_devices()does not take any lock. Could you pls recheck?Hmmmm... misc-next:
Sorry, it should be
Quoted 9 lines
Some of the Git commands stopped working. I had to run git fsck. Now I see mutex in
close_fs_devices(), not sure if I was blind to it
before.
Anyway, this is a bad patch. I am working to fix it.Git errors were distracting. But why I didn't see the
device_list_mutexis because I had the following patch [1] in my workspace, which is not yet integrated to the misc-next / commented.
Quoted 7 lines
[1] btrfs: fix lockdep warning while mounting sprout fs
https://lore.kernel.org/linux-btrfs/[email protected]/
So as of now, I can say this patch needs the above patch.
Could you please apply the above patch before this patch for tests?
So if there's a dependency I'd apply the whole series.
RFC PATCH 3/3 btrfs: use latest_bdev in btrfs_show_devname
In reply to Anand Jainlatest_bdev is updated according to the changes to the device list. That means we could use the latest_bdev to show the device name in /proc/self/mounts. So this patch makes that change.
---
RFC because
1. latest_bdev might not be the lowest devid but, we showed the lowest devid in /proc/self/mount.
2. The device's path is not shown now but, previously we did. So does these break ABI? Maybe yes for 2 howabout for 1 above?
fs/btrfs/super.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)
fs/btrfs/super.c +3 -22
@@ -2464,30 +2464,11 @@ static int btrfs_unfreeze(struct super_block *sb)static int btrfs_show_devname (struct seq_file *m,struct dentry *root) {struct btrfs_fs_info *fs_info =btrfs_sb (root->d_sb); -struct btrfs_device *dev, *first_dev =NULL ; +char name[BDEVNAME_SIZE ]; -/* -* Lightweight locking of the devices. We should not need -* device_list_mutex here as we only read the device data and the list -* is protected by RCU. Even if a device is deleted during the list -* traversals, we'll get valid data, the freeing callback will wait at -* least until the rcu_read_unlock. -*/ -rcu_read_lock (); -list_for_each_entry_rcu (dev, &fs_info->fs_devices->devices, dev_list) { -if (test_bit (BTRFS_DEV_STATE_MISSING , &dev->dev_state)) -continue ; -if (!dev->name) -continue ; -if (!first_dev || dev->devid < first_dev->devid) - first_dev = dev; - } +seq_escape (m,bdevname (fs_info->fs_devices->latest_bdev, name), +" \t\n\\" ); -if (first_dev) -seq_escape (m,rcu_str_deref (first_dev->name)," \t\n\\" ); -else -WARN_ON (1 ); -rcu_read_unlock ();return 0 ; }
Signature · 1 line
2.31.1
Re: [PATCH RFC 3/3] btrfs: use latest_bdev in btrfs_show_devname
Quoted 4 lines · Anand Jain
latest_bdevis updated according to the changes to the device list. That means we could use thelatest_bdevto show the device name in/proc/self/mounts. So this patch makes that change.
Quoted 9 lines
Signed-off-by Anand Jain <[email protected]>---
RFC because
1.latest_bdevmight not be the lowest devid but, we showed the lowest devid in/proc/self/mount.
2. The device's path is not shown now but, previously we did. So does these break ABI? Maybe yes for 2 howabout for 1 above?
Mabybe a naive question but I have no time to dive into btrfs code recently. If a device which has highest devid was replaced, will the new device be the fs_devices->latest_bdev instead of the existing older one?
Thanks.
--
Su
Quoted 47 lines
fs/btrfs/super.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)fs/btrfs/super.c +1
-4@@ -2464,30 +2464,11 @@ static int btrfs_unfreeze(struct super_block *sb)static int btrfs_show_devname (struct seq_file *m,struct dentry *root) {struct btrfs_fs_info *fs_info =btrfs_sb (root->d_sb); -struct btrfs_device *dev, *first_dev =NULL ; +char name[BDEVNAME_SIZE ]; -/* -* Lightweight locking of the devices. We should not need -* device_list_mutex here as we only read the device data and the list
fs/btrfs/super.c +0
-1-* is protected by RCU. Even if a device is deleted during the list
fs/btrfs/super.c +0
-1-* traversals, we'll get valid data, the freeing callback will wait at
fs/btrfs/super.c +0
-4-* least until the rcu_read_unlock. -*/ -rcu_read_lock (); - list_for_each_entry_rcu(dev, &fs_info->fs_devices->devices,
dev_list) {fs/btrfs/super.c +1
-7-if (test_bit (BTRFS_DEV_STATE_MISSING , &dev->dev_state)) -continue ; -if (!dev->name) -continue ; -if (!first_dev || dev->devid < first_dev->devid) - first_dev = dev; - } + seq_escape(m, bdevname(fs_info->fs_devices->latest_bdev,name),
fs/btrfs/super.c +1
-5+ " \t\n\\"); -if (first_dev) -seq_escape (m,rcu_str_deref (first_dev->name)," \t\n\\" ); -else -WARN_ON (1 ); -rcu_read_unlock ();return 0 ; }
Re: [PATCH RFC 3/3] btrfs: use latest_bdev in btrfs_show_devname
Quoted 10 lines · Su Yue
Quoted 7 lines · Anand Jain
latest_bdevis updated according to the changes to the device list. That means we could use thelatest_bdevto show the device name in/proc/self/mounts. So this patch makes that change.Signed-off-by Anand Jain <[email protected]>---
Quoted 7 lines
Quoted 7 lines
RFC because
1.latest_bdevmight not be the lowest devid but, we showed the lowest devid in/proc/self/mount.2. The device's path is not shown now but, previously we did. So does these break ABI? Maybe yes for 2 howabout for 1 above?
In v2 I am fix the path part. By replacing latest_bdev to latest_dev which means it shall hold the pointer to btrfs_device instead of just to its bdev.
Quoted 4 lines
Mabybe a naive question but I have no time to dive into btrfs code recently. If a device which has highest devid was replaced, will the new device be the
fs_devices->latest_bdevinstead of the existing older one?
It is handled by btrfs_assign_next_active_device().
If the replace source device is also the latest_dev then after replace it shall point to the replace target device. So the new device path is seen in /proc/self/mounts. Which is fine and normal to expect.
Similarly btrfs_assign_next_active_device() is called during remove device as well.
There is a bug that we didn't update the latest_bdev when we sprout I am fixing this as well in v2.
Thanks.
Re: [PATCH RFC 3/3] btrfs: use latest_bdev in btrfs_show_devname
In reply to Anand JainQuoted 4 lines · Anand Jain
latest_bdevis updated according to the changes to the device list. That means we could use thelatest_bdevto show the device name in/proc/self/mounts. So this patch makes that change.
Quoted 8 lines
Signed-off-by Anand Jain <[email protected]>---
RFC because
1.latest_bdevmight not be the lowest devid but, we showed the lowest devid in/proc/self/mount.
2. The device's path is not shown now but, previously we did. So does these break ABI? Maybe yes for 2 howabout for 1 above?
The path needs to be preserved, that would break a lot of things..
Quoted 22 lines
fs/btrfs/super.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)fs/btrfs/super.c +1
-9@@ -2464,30 +2464,11 @@ static int btrfs_unfreeze(struct super_block *sb)static int btrfs_show_devname (struct seq_file *m,struct dentry *root) {struct btrfs_fs_info *fs_info =btrfs_sb (root->d_sb); -struct btrfs_device *dev, *first_dev =NULL ; +char name[BDEVNAME_SIZE ]; -/* -* Lightweight locking of the devices. We should not need -* device_list_mutex here as we only read the device data and the list -* is protected by RCU. Even if a device is deleted during the list -* traversals, we'll get valid data, the freeing callback will wait at -* least until the rcu_read_unlock. -*/ -rcu_read_lock ();
fs/btrfs/super.c static int btrfs_unfreeze(struct super_block *sb) · line 2470
Quoted 10 lines
fs/btrfs/super.c +2
-8-list_for_each_entry_rcu (dev, &fs_info->fs_devices->devices, dev_list) { -if (test_bit (BTRFS_DEV_STATE_MISSING , &dev->dev_state)) -continue ; -if (!dev->name) -continue ; -if (!first_dev || dev->devid < first_dev->devid) - first_dev = dev; - } +seq_escape (m,bdevname (fs_info->fs_devices->latest_bdev, name), +" \t\n\\" );
No protection at all? So what if latest_bdev or latest_dev gets updated in parallel with devicre remove and there's a window where the pointer is invalid but still is accessed. The whole point of RCU section here is to prevent that.
Quoted 11 lines
fs/btrfs/super.c +0
-5-if (first_dev) -seq_escape (m,rcu_str_deref (first_dev->name)," \t\n\\" ); -else -WARN_ON (1 ); -rcu_read_unlock ();return 0 ; }Signature · 1 line
2.31.1
Re: [PATCH RFC 3/3] btrfs: use latest_bdev in btrfs_show_devname
Quoted 8 lines · David Sterba
Quoted 7 lines · Anand Jain
latest_bdevis updated according to the changes to the device list. That means we could use thelatest_bdevto show the device name in/proc/self/mounts. So this patch makes that change.Signed-off-by Anand Jain <[email protected]>---
Quoted 7 lines
Quoted 5 lines
RFC because
1.latest_bdevmight not be the lowest devid but, we showed the lowest devid in/proc/self/mount.
2. The device's path is not shown now but, previously we did. So does these break ABI? Maybe yes for 2 howabout for 1 above?The path needs to be preserved, that would break a lot of things..
v2 fixed it.
Quoted 30 lines
Quoted 30 lines
fs/btrfs/super.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)fs/btrfs/super.c +1
-16@@ -2464,30 +2464,11 @@ static int btrfs_unfreeze(struct super_block *sb)static int btrfs_show_devname (struct seq_file *m,struct dentry *root) {struct btrfs_fs_info *fs_info =btrfs_sb (root->d_sb); -struct btrfs_device *dev, *first_dev =NULL ; +char name[BDEVNAME_SIZE ]; -/* -* Lightweight locking of the devices. We should not need -* device_list_mutex here as we only read the device data and the list -* is protected by RCU. Even if a device is deleted during the list -* traversals, we'll get valid data, the freeing callback will wait at -* least until the rcu_read_unlock. -*/ -rcu_read_lock (); -list_for_each_entry_rcu (dev, &fs_info->fs_devices->devices, dev_list) { -if (test_bit (BTRFS_DEV_STATE_MISSING , &dev->dev_state)) -continue ; -if (!dev->name) -continue ; -if (!first_dev || dev->devid < first_dev->devid) - first_dev = dev;
Quoted 9 lines
fs/btrfs/super.c static int btrfs_unfreeze(struct super_block *sb) · line 2470
Quoted 3 lines
fs/btrfs/super.c +2
-1- } +seq_escape (m,bdevname (fs_info->fs_devices->latest_bdev, name), +" \t\n\\" );No protection at all? So what if
latest_bdevorlatest_devgets updated in parallel with devicre remove and there's a window where the pointer is invalid but still is accessed. The whole point of RCU section here is to prevent that.
YEsh. I noticed it. I am just on it. Will fix in v3.
Quoted 11 lines
Quoted 11 lines
fs/btrfs/super.c +0
-5-if (first_dev) -seq_escape (m,rcu_str_deref (first_dev->name)," \t\n\\" ); -else -WARN_ON (1 ); -rcu_read_unlock ();return 0 ; }Signature · 1 line
2.31.1