From: Anand Jain <anand.jain@oracle.com>
To: Qu Wenruo <quwenruo@cn.fujitsu.com>
Cc: linux-btrfs@vger.kernel.org, lists@colorremedies.com
Subject: Re: [PATCH v2 4/6] btrfs: Allow barrier_all_devices to do chunk level device check
Date: Tue, 7 Mar 2017 12:48:19 +0800 [thread overview]
Message-ID: <10be6a52-355d-d23f-b534-0bb279516a56@oracle.com> (raw)
In-Reply-To: <20170306085855.11403-5-quwenruo@cn.fujitsu.com>
On 03/06/2017 04:58 PM, Qu Wenruo wrote:
> The last user of num_tolerated_disk_barrier_failures is
> barrier_all_devices().
> But it's can be easily changed to new per-chunk degradable check
> framework.
>
> Now btrfs_device will have two extra members, representing send/wait
> error, set at write_dev_flush() time.
> With these 2 new members, btrfs_check_rw_degradable() can check if the
> fs is still OK when the fs is committed to disk.
This logic isn't reentrant, earlier it was. How about using
stack variable instead ?
Thanks, Anand
> Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
> ---
> fs/btrfs/disk-io.c | 15 +++++++--------
> fs/btrfs/volumes.c | 4 +++-
> fs/btrfs/volumes.h | 4 ++++
> 3 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index c26b8a0b121c..f596bd130524 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -3569,17 +3569,17 @@ static int barrier_all_devices(struct btrfs_fs_info *info)
> {
> struct list_head *head;
> struct btrfs_device *dev;
> - int errors_send = 0;
> - int errors_wait = 0;
> int ret;
>
> /* send down all the barriers */
> head = &info->fs_devices->devices;
> list_for_each_entry_rcu(dev, head, dev_list) {
> + dev->err_wait = false;
> + dev->err_send = false;
> if (dev->missing)
> continue;
> if (!dev->bdev) {
> - errors_send++;
> + dev->err_send = true;
> continue;
> }
> if (!dev->in_fs_metadata || !dev->writeable)
> @@ -3587,7 +3587,7 @@ static int barrier_all_devices(struct btrfs_fs_info *info)
>
> ret = write_dev_flush(dev, 0);
> if (ret)
> - errors_send++;
> + dev->err_send = true;
> }
>
> /* wait for all the barriers */
> @@ -3595,7 +3595,7 @@ static int barrier_all_devices(struct btrfs_fs_info *info)
> if (dev->missing)
> continue;
> if (!dev->bdev) {
> - errors_wait++;
> + dev->err_wait = true;
> continue;
> }
> if (!dev->in_fs_metadata || !dev->writeable)
> @@ -3603,10 +3603,9 @@ static int barrier_all_devices(struct btrfs_fs_info *info)
>
> ret = write_dev_flush(dev, 1);
> if (ret)
> - errors_wait++;
> + dev->err_wait = true;
> }
> - if (errors_send > info->num_tolerated_disk_barrier_failures ||
> - errors_wait > info->num_tolerated_disk_barrier_failures)
> + if (!btrfs_check_rw_degradable(info))
> return -EIO;
> return 0;
> }
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index dd9dd94d7043..729cbd0d2b60 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -6796,7 +6796,9 @@ bool btrfs_check_rw_degradable(struct btrfs_fs_info *fs_info)
> btrfs_get_num_tolerated_disk_barrier_failures(
> map->type);
> for (i = 0; i < map->num_stripes; i++) {
> - if (map->stripes[i].dev->missing)
> + if (map->stripes[i].dev->missing ||
> + map->stripes[i].dev->err_wait ||
> + map->stripes[i].dev->err_send)
> missing++;
> }
> if (missing > max_tolerated) {
> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
> index db1b5ef479cf..112fccacdabc 100644
> --- a/fs/btrfs/volumes.h
> +++ b/fs/btrfs/volumes.h
> @@ -75,6 +75,10 @@ struct btrfs_device {
> int can_discard;
> int is_tgtdev_for_dev_replace;
>
> + /* If this devices fails to send/wait dev flush */
> + bool err_send;
> + bool err_wait;
> #ifdef __BTRFS_NEED_DEVICE_DATA_ORDERED
> seqcount_t data_seqcount;
> #endif
>
next prev parent reply other threads:[~2017-03-07 10:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-06 8:58 [PATCH v2 0/6] Chunk level degradable check Qu Wenruo
2017-03-06 8:58 ` [PATCH v2 1/6] btrfs: Introduce a function to check if all chunks a OK for degraded rw mount Qu Wenruo
2017-03-07 4:48 ` Anand Jain
2017-03-08 18:26 ` Anand Jain
2017-03-09 0:31 ` Qu Wenruo
2017-03-06 8:58 ` [PATCH v2 2/6] btrfs: Do chunk level rw degrade check at mount time Qu Wenruo
2017-03-06 8:58 ` [PATCH v2 3/6] btrfs: Do chunk level degradation check for remount Qu Wenruo
2017-03-06 8:58 ` [PATCH v2 4/6] btrfs: Allow barrier_all_devices to do chunk level device check Qu Wenruo
2017-03-07 4:48 ` Anand Jain [this message]
2017-03-07 5:36 ` Qu Wenruo
2017-03-07 6:55 ` Anand Jain
2017-03-07 7:08 ` Qu Wenruo
2017-03-07 8:07 ` Qu Wenruo
2017-03-06 8:58 ` [PATCH v2 5/6] btrfs: Cleanup num_tolerated_disk_barrier_failures Qu Wenruo
2017-03-06 8:58 ` [PATCH v2 6/6] btrfs: Enhance missing device kernel message Qu Wenruo
2017-03-07 4:47 ` Anand Jain
2017-03-06 18:49 ` [PATCH v2 0/6] Chunk level degradable check Dmitrii Tcvetkov
2017-03-07 0:36 ` Adam Borowski
2017-03-07 1:35 ` Qu Wenruo
2017-03-07 2:23 ` Adam Borowski
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=10be6a52-355d-d23f-b534-0bb279516a56@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=lists@colorremedies.com \
--cc=quwenruo@cn.fujitsu.com \
/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).