mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
btrfs: zoned: fix API misuse of zone finish waiting
The commit2ce543f478
("btrfs: zoned: wait until zone is finished when allocation didn't progress") implemented a zone finish waiting mechanism to the write path of zoned mode. However, using wait_var_event()/wake_up_all() on fs_info->zone_finish_wait is wrong and wait_var_event() just hangs because no one ever wakes it up once it goes into sleep. Instead, we can simply use wait_on_bit_io() and clear_and_wake_up_bit() on fs_info->flags with a proper barrier installed. Fixes:2ce543f478
("btrfs: zoned: wait until zone is finished when allocation didn't progress") CC: stable@vger.kernel.org # 5.16+ Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
f2c3bec215
commit
d5b81ced74
4 changed files with 4 additions and 9 deletions
|
@ -1088,8 +1088,6 @@ struct btrfs_fs_info {
|
||||||
|
|
||||||
spinlock_t zone_active_bgs_lock;
|
spinlock_t zone_active_bgs_lock;
|
||||||
struct list_head zone_active_bgs;
|
struct list_head zone_active_bgs;
|
||||||
/* Waiters when BTRFS_FS_NEED_ZONE_FINISH is set */
|
|
||||||
wait_queue_head_t zone_finish_wait;
|
|
||||||
|
|
||||||
/* Updates are not protected by any lock */
|
/* Updates are not protected by any lock */
|
||||||
struct btrfs_commit_stats commit_stats;
|
struct btrfs_commit_stats commit_stats;
|
||||||
|
|
|
@ -3070,7 +3070,6 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)
|
||||||
init_waitqueue_head(&fs_info->transaction_blocked_wait);
|
init_waitqueue_head(&fs_info->transaction_blocked_wait);
|
||||||
init_waitqueue_head(&fs_info->async_submit_wait);
|
init_waitqueue_head(&fs_info->async_submit_wait);
|
||||||
init_waitqueue_head(&fs_info->delayed_iputs_wait);
|
init_waitqueue_head(&fs_info->delayed_iputs_wait);
|
||||||
init_waitqueue_head(&fs_info->zone_finish_wait);
|
|
||||||
|
|
||||||
/* Usable values until the real ones are cached from the superblock */
|
/* Usable values until the real ones are cached from the superblock */
|
||||||
fs_info->nodesize = 4096;
|
fs_info->nodesize = 4096;
|
||||||
|
|
|
@ -1644,10 +1644,9 @@ static noinline int run_delalloc_zoned(struct btrfs_inode *inode,
|
||||||
done_offset = end;
|
done_offset = end;
|
||||||
|
|
||||||
if (done_offset == start) {
|
if (done_offset == start) {
|
||||||
struct btrfs_fs_info *info = inode->root->fs_info;
|
wait_on_bit_io(&inode->root->fs_info->flags,
|
||||||
|
BTRFS_FS_NEED_ZONE_FINISH,
|
||||||
wait_var_event(&info->zone_finish_wait,
|
TASK_UNINTERRUPTIBLE);
|
||||||
!test_bit(BTRFS_FS_NEED_ZONE_FINISH, &info->flags));
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2007,8 +2007,7 @@ static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_writ
|
||||||
/* For active_bg_list */
|
/* For active_bg_list */
|
||||||
btrfs_put_block_group(block_group);
|
btrfs_put_block_group(block_group);
|
||||||
|
|
||||||
clear_bit(BTRFS_FS_NEED_ZONE_FINISH, &fs_info->flags);
|
clear_and_wake_up_bit(BTRFS_FS_NEED_ZONE_FINISH, &fs_info->flags);
|
||||||
wake_up_all(&fs_info->zone_finish_wait);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue