From: Nikolay Borisov <nborisov@suse.com>
To: David Sterba <dsterba@suse.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH v2 07/16] btrfs: add proper safety check before resuming dev-replace
Date: Fri, 20 Apr 2018 10:04:10 +0300 [thread overview]
Message-ID: <02eb6206-c08e-8f69-42da-651c2c9b365c@suse.com> (raw)
In-Reply-To: <4ebe1fce5a33a3698619e58912418f53b121a131.1524146556.git.dsterba@suse.com>
On 19.04.2018 19:33, David Sterba wrote:
> The device replace is paused by unmount or read only remount, and
> resumed on next mount or write remount.
>
> The exclusive status should be checked properly as it's a global
> invariant and we must not allow 2 operations run. In this case, the
> balance can be also paused and resumed under same conditions. It's
> always checked first so dev-replace could see the EXCL_OP already taken,
> BUT, the ioctl would never let start both at the same time.
>
> Replace the WARN_ON with message and return 0, indicating no error as
> this is purely theoretical and the user will be informed. Resolving that
> manually should be possible by waiting for the other operation to finish
> or cancel the paused state.
>
> Signed-off-by: David Sterba <dsterba@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
> ---
> fs/btrfs/dev-replace.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index 7a87ffad041e..346bd460f8e7 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -908,7 +908,17 @@ int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info)
> }
> btrfs_dev_replace_write_unlock(dev_replace);
>
> - WARN_ON(test_and_set_bit(BTRFS_FS_EXCL_OP, &fs_info->flags));
> + /*
> + * This could collide with a paused balance, but the exclusive op logic
> + * should never allow both to start and pause. We don't want to allow
> + * dev-replace to start anyway.
> + */
> + if (test_and_set_bit(BTRFS_FS_EXCL_OP, &fs_info->flags)) {
> + btrfs_info(fs_info,
> + "cannot resume dev-replace, other exclusive operation running");
> + return 0;
> + }
> +
> task = kthread_run(btrfs_dev_replace_kthread, fs_info, "btrfs-devrepl");
> return PTR_ERR_OR_ZERO(task);
> }
>
next prev parent reply other threads:[~2018-04-20 7:04 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 16:33 [PATCH v2 00/16] Kill fs_info::volume_mutex David Sterba
2018-04-19 16:33 ` [PATCH v2 01/16] btrfs: squeeze btrfs_dev_replace_continue_on_mount to its caller David Sterba
2018-04-19 16:33 ` [PATCH v2 02/16] btrfs: make success path out of btrfs_init_dev_replace_tgtdev more clear David Sterba
2018-04-19 16:33 ` [PATCH v2 03/16] btrfs: export and rename free_device David Sterba
2018-04-19 16:33 ` [PATCH v2 04/16] btrfs: move btrfs_init_dev_replace_tgtdev to dev-replace.c and make static David Sterba
2018-04-19 16:33 ` [PATCH v2 05/16] btrfs: move volume_mutex to callers of btrfs_rm_device David Sterba
2018-04-19 16:33 ` [PATCH v2 06/16] btrfs: move clearing of EXCL_OP out of __cancel_balance David Sterba
2018-04-20 7:02 ` Nikolay Borisov
2018-04-20 7:35 ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 07/16] btrfs: add proper safety check before resuming dev-replace David Sterba
2018-04-20 7:04 ` Nikolay Borisov [this message]
2018-04-20 7:36 ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 08/16] btrfs: add sanity check when resuming balance after mount David Sterba
2018-04-20 7:38 ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 09/16] btrfs: cleanup helpers that reset balance state David Sterba
2018-04-20 7:07 ` Nikolay Borisov
2018-04-20 11:28 ` David Sterba
2018-04-20 9:04 ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 10/16] btrfs: remove wrong use of volume_mutex from btrfs_dev_replace_start David Sterba
2018-04-19 16:33 ` [PATCH v2 11/16] btrfs: kill btrfs_fs_info::volume_mutex David Sterba
2018-04-19 16:33 ` [PATCH v2 12/16] btrfs: track running balance in a simpler way David Sterba
2018-04-20 7:52 ` Anand Jain
2018-04-20 11:58 ` David Sterba
2018-04-20 12:19 ` David Sterba
2018-04-20 13:32 ` Anand Jain
2018-04-27 2:10 ` Anand Jain
2018-04-27 16:10 ` David Sterba
2018-04-19 16:33 ` [PATCH v2 13/16] btrfs: move and comment read-only check in btrfs_cancel_balance David Sterba
2018-04-20 9:13 ` Anand Jain
2018-04-20 11:59 ` David Sterba
2018-04-20 12:06 ` [PATCH v2.1 " David Sterba
2018-04-27 2:02 ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 14/16] btrfs: drop lock parameter from update_ioctl_balance_args and rename David Sterba
2018-04-20 9:21 ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 15/16] btrfs: use mutex in btrfs_resume_balance_async David Sterba
2018-04-20 9:25 ` Anand Jain
2018-04-19 16:33 ` [PATCH v2 16/16] btrfs: open code set_balance_control David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=02eb6206-c08e-8f69-42da-651c2c9b365c@suse.com \
--to=nborisov@suse.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox