Btrfs: use a lock to protect incompat/compat flag of the super block
PATCH 2/2 Btrfs: use a lock to protect incompat/compat flag of the super block
The following case will make the incompat/compat flag of the super block be recovered.
Task1 |Task2
flags = btrfs_super_incompat_flags(); |
|flags = btrfs_super_incompat_flags(); flags |= new_flag1; | |flags |= new_flag2; btrfs_set_super_incompat_flags(flags); | |btrfs_set_super_incompat_flags(flags);
the new_flag1 is recovered.
In order to avoid this problem, we introduce a lock named super_lock into the btrfs_fs_info structure. If we want to update incompat/compat flags of the super block, we must hold it.
--- fs/btrfs/ctree.h | 22 ++++++++++++++++++++-- fs/btrfs/disk-io.c | 5 +++++ fs/btrfs/volumes.c | 10 +--------- 3 files changed, 26 insertions(+), 11 deletions(-)
fs/btrfs/ctree.h +20 -2
@@ -1360,6 +1360,17 @@ struct btrfs_fs_info {wait_queue_head_t transaction_blocked_wait;wait_queue_head_t async_submit_wait; +/* +* Used to protect the incompat_flags, compat_flags, compat_ro_flags +* when they are updated. +* +* Because we do not clear the flags for ever, so we needn't use +* the lock on the read side. +* +* We also needn't use the lock when we mount the fs, because +* there is no other task which will update the flag. +*/ +spinlock_t super_lock;struct btrfs_super_block *super_copy;struct btrfs_super_block *super_for_commit;struct block_device *__bdev;
@@ -3663,8 +3674,15 @@ static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, disk_super = fs_info->super_copy; features =btrfs_super_incompat_flags (disk_super);if (!(features & flag)) { - features |= flag; -btrfs_set_super_incompat_flags (disk_super, features); +spin_lock (&fs_info->super_lock); + features =btrfs_super_incompat_flags (disk_super); +if (!(features & flag)) { + features |= flag; +btrfs_set_super_incompat_flags (disk_super, features); +printk (KERN_INFO "btrfs: setting %llu feature flag\n" , + flag); + } +spin_unlock (&fs_info->super_lock); } }
fs/btrfs/disk-io.c +5 -0
@@ -2060,6 +2060,7 @@ int open_ctree(struct super_block *sb,spin_lock_init (&fs_info->defrag_inodes_lock);spin_lock_init (&fs_info->free_chunk_lock);spin_lock_init (&fs_info->tree_mod_seq_lock); +spin_lock_init (&fs_info->super_lock);rwlock_init (&fs_info->tree_mod_log_lock);mutex_init (&fs_info->reloc_mutex);seqlock_init (&fs_info->profiles_lock);
@@ -2319,6 +2320,10 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } +/* +* Needn't use the lock because there is no other task which will +* update the flag. +*/ btrfs_set_super_incompat_flags (disk_super, features); features = btrfs_super_compat_ro_flags(disk_super) &
fs/btrfs/volumes.c +1 -9
@@ -3674,18 +3674,10 @@ static u32 find_raid56_stripe_len(u32 data_devices, u32 dev_stripe_target)static void check_raid56_incompat_flag (struct btrfs_fs_info *info,u64 type) { -u64 features; -if (!(type & (BTRFS_BLOCK_GROUP_RAID5 |BTRFS_BLOCK_GROUP_RAID6 )))return ; - features =btrfs_super_incompat_flags (info->super_copy); -if (features &BTRFS_FEATURE_INCOMPAT_RAID56 ) -return ; - - features |=BTRFS_FEATURE_INCOMPAT_RAID56 ; -btrfs_set_super_incompat_flags (info->super_copy, features); -printk (KERN_INFO "btrfs: setting RAID5/6 feature flag\n" ); +btrfs_set_fs_incompat (info,RAID56 ); } static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
Signature · 1 line
1.8.0.1
fs/btrfs/ctree.h struct btrfs_fs_info { · line 1373
Quoted 9 lines · Miao Xie
In order to avoid this problem, we introduce a lock named
super_lockinto thebtrfs_fs_infostructure. If we want to update incompat/compat flags of the super block, we must hold it.fs/btrfs/ctree.h +4
-0+/* +* Used to protect the incompat_flags, compat_flags, compat_ro_flags +* when they are updated. +spinlock_t super_lock;
The lock name is too general for protecting just *_flags, do you have plans to add more items from superblock under this lock? If no, I suggest to pick a different name.
fs/btrfs/ctree.h static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, · line 3683
Quoted 13 lines
fs/btrfs/ctree.h +7
-2@@ -3663,8 +3674,15 @@ static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, disk_super = fs_info->super_copy; features =btrfs_super_incompat_flags (disk_super);if (!(features & flag)) { - features |= flag; -btrfs_set_super_incompat_flags (disk_super, features); +spin_lock (&fs_info->super_lock); + features =btrfs_super_incompat_flags (disk_super); +if (!(features & flag)) { + features |= flag; +btrfs_set_super_incompat_flags (disk_super, features); +printk (KERN_INFO "btrfs: setting %llu feature flag\n" , + flag);
flag is u64, please use (unsigned long long)flag and possibly the new btrfs_info replacement of printks.
fs/btrfs/ctree.h static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, · line 3687
Quoted 4 lines
fs/btrfs/ctree.h +2
-0+ } +spin_unlock (&fs_info->super_lock); } }
otherwise ok.
Quoted 9 lines · David Sterba
Quoted 7 lines · Miao Xie
In order to avoid this problem, we introduce a lock named
super_lockinto thebtrfs_fs_infostructure. If we want to update incompat/compat flags of the super block, we must hold it.fs/btrfs/ctree.h +3
-0+/* +* Used to protect the incompat_flags, compat_flags, compat_ro_flags +* when they are updated.
Quoted 5 lines
fs/btrfs/ctree.h struct btrfs_fs_info { · line 1373
Quoted 1 line
fs/btrfs/ctree.h +1
-0+spinlock_t super_lock;The lock name is too general for protecting just
*_flags, do you have plans to add more items from superblock under this lock? If no, I suggest to pick a different name.
Yes, I want to add more items from super block under this lock.
Quoted 17 lines
Quoted 4 lines
fs/btrfs/ctree.h +0
-0@@ -3663,8 +3674,15 @@ static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, disk_super = fs_info->super_copy; features =btrfs_super_incompat_flags (disk_super);fs/btrfs/ctree.h static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, · line 3683
Quoted 10 lines
fs/btrfs/ctree.h +7
-2if (!(features & flag)) { - features |= flag; -btrfs_set_super_incompat_flags (disk_super, features); +spin_lock (&fs_info->super_lock); + features =btrfs_super_incompat_flags (disk_super); +if (!(features & flag)) { + features |= flag; +btrfs_set_super_incompat_flags (disk_super, features); +printk (KERN_INFO "btrfs: setting %llu feature flag\n" , + flag);flag is u64, please use (unsigned long long)flag and possibly the new
btrfs_inforeplacement of printks.
OK, I'll modify my patch.
Thanks for your view.
Miao
Quoted 14 lines
fs/btrfs/ctree.h static inline void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, · line 3687
Quoted 5 lines
fs/btrfs/ctree.h +2
-0+ } +spin_unlock (&fs_info->super_lock); } }otherwise ok.
Reviewed-by David Sterba <[email protected]>--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html