From: David Sterba <dsterba@suse.cz>
To: fdmanana@kernel.org
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] Btrfs: prevent send failures and crashes due to concurrent relocation
Date: Mon, 13 May 2019 18:32:16 +0200 [thread overview]
Message-ID: <20190513163216.GF3138@twin.jikos.cz> (raw)
In-Reply-To: <20190422154409.16323-1-fdmanana@kernel.org>
On Mon, Apr 22, 2019 at 04:44:09PM +0100, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> --- a/fs/btrfs/send.c
> +++ b/fs/btrfs/send.c
> @@ -6869,9 +6869,23 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
> if (ret)
> goto out;
>
> + mutex_lock(&fs_info->balance_mutex);
> + if (test_bit(BTRFS_FS_BALANCE_RUNNING, &fs_info->flags)) {
> + mutex_unlock(&fs_info->balance_mutex);
> + btrfs_warn_rl(fs_info,
> + "Can not run send because a balance operation is in progress");
> + ret = -EAGAIN;
> + goto out;
> + }
> + fs_info->send_in_progress++;
> + mutex_unlock(&fs_info->balance_mutex);
This would be better in a helper that hides that the balance mutex from
send.
eg.
if (!btrfs_send_can_start(fs_info)
return -EAGAIN;
> +
> current->journal_info = BTRFS_SEND_TRANS_STUB;
> ret = send_subvol(sctx);
> current->journal_info = NULL;
> + mutex_lock(&fs_info->balance_mutex);
> + fs_info->send_in_progress--;
> + mutex_unlock(&fs_info->balance_mutex);
btrfs_send_end();
> if (ret < 0)
> goto out;
>
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index db934ceae9c1..8145b62e3912 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -4203,6 +4203,14 @@ int btrfs_balance(struct btrfs_fs_info *fs_info,
> get_raid_name(meta_index), get_raid_name(data_index));
> }
>
> + if (fs_info->send_in_progress) {
> + btrfs_warn_rl(fs_info,
> +"Can not run balance while send operations are in progress (%d in progress)",
> + fs_info->send_in_progress);
> + ret = -EAGAIN;
> + goto out;
> + }
Similar here.
As the operation compatibility is done on the filesystem level, it would
be better to hide all the logic in helpers, now that there's more than
the per-subvolume send_in_progress.
next prev parent reply other threads:[~2019-05-13 16:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 15:44 [PATCH] Btrfs: prevent send failures and crashes due to concurrent relocation fdmanana
2019-04-24 8:56 ` Nikolay Borisov
2019-04-24 9:13 ` Filipe Manana
2019-05-13 14:04 ` Filipe Manana
2019-05-13 15:45 ` David Sterba
2019-05-13 16:32 ` David Sterba [this message]
2019-05-13 16:43 ` Filipe Manana
2019-05-13 18:00 ` David Sterba
2019-06-06 13:24 ` Filipe Manana
2019-06-13 9:24 ` Filipe Manana
2019-06-13 17:14 ` 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=20190513163216.GF3138@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=fdmanana@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).