linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Mason <clm@fb.com>
To: "fdmanana@kernel.org" <fdmanana@kernel.org>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
	Dennis Zhou <dennisz@fb.com>
Subject: Re: [PATCH] Btrfs: fix unwritten extent buffers and hangs on future writeback attempts
Date: Wed, 11 Sep 2019 16:04:35 +0000	[thread overview]
Message-ID: <18E989C2-3E39-4C87-907D-EA671099C4AE@fb.com> (raw)
In-Reply-To: <20190911145542.1125-1-fdmanana@kernel.org>

On 11 Sep 2019, at 15:55, fdmanana@kernel.org wrote:

> From: Filipe Manana <fdmanana@suse.com>
>
> So fix this by not overwriting the return value (ret) with the result
> from flush_write_bio(). We also need to clear the 
> EXTENT_BUFFER_WRITEBACK
> bit in case flush_write_bio() returns an error, otherwise it will hang
> any future attempts to writeback the extent buffer.
>
> This is a regression introduced in the 5.2 kernel.
>
> Fixes: 2e3c25136adfb ("btrfs: extent_io: add proper error handling to 
> lock_extent_buffer_for_io()")
> Fixes: f4340622e0226 ("btrfs: extent_io: Move the BUG_ON() in 
> flush_write_bio() one level up")
> Reported-by: Zdenek Sojka <zsojka@seznam.cz>
> Link: 
> https://lore.kernel.org/linux-btrfs/GpO.2yos.3WGDOLpx6t%7D.1TUDYM@seznam.cz/T/#u
> Reported-by: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>
> Link: 
> https://lore.kernel.org/linux-btrfs/5c4688ac-10a7-fb07-70e8-c5d31a3fbb38@profihost.ag/T/#t
> Reported-by: Drazen Kacar <drazen.kacar@oradian.com>
> Link: 
> https://lore.kernel.org/linux-btrfs/DB8PR03MB562876ECE2319B3E579590F799C80@DB8PR03MB5628.eurprd03.prod.outlook.com/
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204377
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
> ---
>  fs/btrfs/extent_io.c | 23 ++++++++++++++---------
>  1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index 1ff438fd5bc2..1311ba0fc031 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -3628,6 +3628,13 @@ void wait_on_extent_buffer_writeback(struct 
> extent_buffer *eb)
>  		       TASK_UNINTERRUPTIBLE);
>  }
>
> +static void end_extent_buffer_writeback(struct extent_buffer *eb)
> +{
> +	clear_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags);
> +	smp_mb__after_atomic();
> +	wake_up_bit(&eb->bflags, EXTENT_BUFFER_WRITEBACK);
> +}
> +
>  /*
>   * Lock eb pages and flush the bio if we can't the locks
>   *
> @@ -3699,8 +3706,11 @@ static noinline_for_stack int 
> lock_extent_buffer_for_io(struct extent_buffer *eb
>
>  		if (!trylock_page(p)) {
>  			if (!flush) {
> -				ret = flush_write_bio(epd);
> -				if (ret < 0) {
> +				int err;
> +
> +				err = flush_write_bio(epd);
> +				if (err < 0) {
> +					ret = err;
>  					failed_page_nr = i;
>  					goto err_unlock;
>  				}


Dennis (cc'd) has been trying a similar fix against this in production, 
but sending it was interrupted by plumbing conferences.  I think he 
found that it needs to undo this as well:

                 percpu_counter_add_batch(&fs_info->dirty_metadata_bytes,
                                          -eb->len,
                                          fs_info->dirty_metadata_batch);

With the IO errors, we should end up aborting the FS.  This function 
also flips the the extent buffer written and dirty flags, and his patch 
resets them as well.  Given that we're aborting anyway, it's not 
critical, but it's probably a good idea to fix things up in the goto 
err_unlock just to make future bugs less likely.

-chris

  reply	other threads:[~2019-09-11 16:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-11 14:55 [PATCH] Btrfs: fix unwritten extent buffers and hangs on future writeback attempts fdmanana
2019-09-11 16:04 ` Chris Mason [this message]
2019-09-11 16:13   ` Filipe Manana
2019-09-11 16:54     ` Dennis Zhou
2019-09-11 17:02       ` Filipe Manana
2019-09-11 17:37         ` Dennis Zhou
2019-09-11 16:42 ` [PATCH v2] " fdmanana

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=18E989C2-3E39-4C87-907D-EA671099C4AE@fb.com \
    --to=clm@fb.com \
    --cc=dennisz@fb.com \
    --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).