btrfs: ioctl: fix inaccurate determination of exclusive_operation
PATCH 1/1 btrfs: ioctl: fix inaccurate determination of exclusive_operation
with fs_info->exclusive_operation == BTRFS_EXCLOP_DEV_ADD enter btrfs_ioctl_add_dev function , exclusive_operation will be classified as in paused balance operation. After return from btrfs_ioctl_add_dev, exclusive_operation will be restore to BTRFS_EXCLOP_BALANCE_PAUSED which is not its original state.
--- fs/btrfs/ioctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/btrfs/ioctl.c +3 -2
@@ -2629,7 +2629,7 @@ static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg) }if (!btrfs_exclop_start (fs_info,BTRFS_EXCLOP_DEV_ADD )) { -if (!btrfs_exclop_start_try_lock (fs_info,BTRFS_EXCLOP_DEV_ADD )) +if (fs_info->exclusive_operation !=BTRFS_EXCLOP_BALANCE_PAUSED )return BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS ;/*
@@ -2637,8 +2637,9 @@ static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg)* change the exclusive op type and remember we should bring * back the paused balance */ +spin_lock (&fs_info->super_lock); fs_info->exclusive_operation =BTRFS_EXCLOP_DEV_ADD ; -btrfs_exclop_start_unlock (fs_info); +spin_unlock (&fs_info->super_lock); restore_op = true; }
Signature · 1 line
2.20.1
Quoted 5 lines · xiaoshoukui
with
fs_info->exclusive_operation==BTRFS_EXCLOP_DEV_ADDenterbtrfs_ioctl_add_devfunction ,exclusive_operationwill be classified as in paused balance operation. After return frombtrfs_ioctl_add_dev,exclusive_operationwill be restore toBTRFS_EXCLOP_BALANCE_PAUSEDwhich is not its original state.
Sorry, I don't understand what you mean. The paused balance and 'device add' are supposed to be compatible exclusive operations (see commit a174c0a2e857 ("btrfs: allow device add if balance is paused")).
Have you found some bug with the above or is there other combination of the exclusive operations that should not work? The changes to the state values are the same, besides the wrong locking.
Quoted 10 lines
Signed-off-by xiaoshoukui <[email protected]>--- fs/btrfs/ioctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/btrfs/ioctl.c +0
-0
fs/btrfs/ioctl.c static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg) · line 2632
Quoted 5 lines
fs/btrfs/ioctl.c +1
-1@@ -2629,7 +2629,7 @@ static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg) }if (!btrfs_exclop_start (fs_info,BTRFS_EXCLOP_DEV_ADD )) { -if (!btrfs_exclop_start_try_lock (fs_info,BTRFS_EXCLOP_DEV_ADD )) +if (fs_info->exclusive_operation !=BTRFS_EXCLOP_BALANCE_PAUSED )
This is removing the atomicity of the check so it's racy and could forcibly overwrite the exclusive operation to BTRFS_EXCLOP_DEV_ADD without the protecting the whole critical section.
fs/btrfs/ioctl.c static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg) · line 2640
Quoted 8 lines
fs/btrfs/ioctl.c +1
-0return BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS ;/* @@ -2637,8 +2637,9 @@ static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg)* change the exclusive op type and remember we should bring * back the paused balance */ +spin_lock (&fs_info->super_lock);
What if there's another exclusive operation started before this lock is taken?
Quoted 5 lines
fs/btrfs/ioctl.c +1
-1fs_info->exclusive_operation =BTRFS_EXCLOP_DEV_ADD ; -btrfs_exclop_start_unlock (fs_info); +spin_unlock (&fs_info->super_lock); restore_op = true; }