From: David Sterba <dsterba@suse.cz>
To: Josef Bacik <josef@toxicpanda.com>
Cc: linux-btrfs@vger.kernel.org, kernel-team@fb.com,
Qu Wenruo <wqu@suse.com>
Subject: Re: [PATCH 04/13] btrfs: splice remaining dirty_bg's onto the transaction dirty bg list
Date: Mon, 11 Jan 2021 23:09:48 +0100 [thread overview]
Message-ID: <20210111220948.GJ6430@twin.jikos.cz> (raw)
In-Reply-To: <92c0de2de1f65b71393307dba17d2cc48f183992.1608135557.git.josef@toxicpanda.com>
On Wed, Dec 16, 2020 at 11:22:08AM -0500, Josef Bacik wrote:
> While doing error injection testing with my relocation patches I hit the
> following ASSERT()
>
> assertion failed: list_empty(&block_group->dirty_list), in fs/btrfs/block-group.c:3356
> ------------[ cut here ]------------
> kernel BUG at fs/btrfs/ctree.h:3357!
> invalid opcode: 0000 [#1] SMP NOPTI
> CPU: 0 PID: 24351 Comm: umount Tainted: G W 5.10.0-rc3+ #193
> Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-2.fc32 04/01/2014
> RIP: 0010:assertfail.constprop.0+0x18/0x1a
> RSP: 0018:ffffa09b019c7e00 EFLAGS: 00010282
> RAX: 0000000000000056 RBX: ffff8f6492c18000 RCX: 0000000000000000
> RDX: ffff8f64fbc27c60 RSI: ffff8f64fbc19050 RDI: ffff8f64fbc19050
> RBP: ffff8f6483bbdc00 R08: 0000000000000000 R09: 0000000000000000
> R10: ffffa09b019c7c38 R11: ffffffff85d70928 R12: ffff8f6492c18100
> R13: ffff8f6492c18148 R14: ffff8f6483bbdd70 R15: dead000000000100
> FS: 00007fbfda4cdc40(0000) GS:ffff8f64fbc00000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 00007fbfda666fd0 CR3: 000000013cf66002 CR4: 0000000000370ef0
> Call Trace:
> btrfs_free_block_groups.cold+0x55/0x55
> close_ctree+0x2c5/0x306
> ? fsnotify_destroy_marks+0x14/0x100
> generic_shutdown_super+0x6c/0x100
> kill_anon_super+0x14/0x30
> btrfs_kill_super+0x12/0x20
> deactivate_locked_super+0x36/0xa0
> cleanup_mnt+0x12d/0x190
> task_work_run+0x5c/0xa0
> exit_to_user_mode_prepare+0x1b1/0x1d0
> syscall_exit_to_user_mode+0x54/0x280
> entry_SYSCALL_64_after_hwframe+0x44/0xa9
>
> This happened because I injected an error in btrfs_cow_block() while
> running the dirty block groups. When we run the dirty block groups, we
> splice the list onto a local list to process. However if an error
> occurs, we only cleanup the transactions dirty block group list, not any
> pending block groups we have on our locally spliced list. Fix this by
> splicing the list back onto the transactions dirty block group list, so
> any remaining block groups are cleaned up.
>
> Reviewed-by: Qu Wenruo <wqu@suse.com>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/block-group.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
> index 52f2198d44c9..69f8a306d70d 100644
> --- a/fs/btrfs/block-group.c
> +++ b/fs/btrfs/block-group.c
> @@ -2684,6 +2684,9 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans)
> }
> spin_unlock(&cur_trans->dirty_bgs_lock);
> } else if (ret < 0) {
> + spin_lock(&cur_trans->dirty_bgs_lock);
> + list_splice_init(&dirty, &cur_trans->dirty_bgs);
> + spin_unlock(&cur_trans->dirty_bgs_lock);
> btrfs_cleanup_dirty_bgs(cur_trans, fs_info);
> }
There seem to be another error path that should un-splice the remaining
block groups:
2554 spin_lock(&cur_trans->dirty_bgs_lock);
2555 if (list_empty(&cur_trans->dirty_bgs)) {
2556 spin_unlock(&cur_trans->dirty_bgs_lock);
2557 return 0;
2558 }
2559 list_splice_init(&cur_trans->dirty_bgs, &dirty);
2560 spin_unlock(&cur_trans->dirty_bgs_lock);
2561
2562 again:
2563 /* Make sure all the block groups on our dirty list actually exist */
2564 btrfs_create_pending_block_groups(trans);
2565
2566 if (!path) {
2567 path = btrfs_alloc_path();
2568 if (!path)
2569 return -ENOMEM;
2570 }
Initially the splice happens on line 2559. First error is on the !path
condition on line 2568, so that would need to be un-spliced.
On the 2nd iteration (looop == 1) we can't hit the error as path was
initialized before and it's only reused.
next prev parent reply other threads:[~2021-01-11 22:12 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 16:22 [PATCH 00/13] Serious fixes for different error paths Josef Bacik
2020-12-16 16:22 ` [PATCH 01/13] btrfs: don't get an EINTR during drop_snapshot for reloc Josef Bacik
2021-01-11 21:56 ` David Sterba
2020-12-16 16:22 ` [PATCH 02/13] btrfs: initialize test inodes location Josef Bacik
2020-12-18 10:30 ` Nikolay Borisov
2020-12-21 16:58 ` David Sterba
2020-12-16 16:22 ` [PATCH 03/13] btrfs: fix reloc root leak with 0 ref reloc roots on recovery Josef Bacik
2020-12-16 16:22 ` [PATCH 04/13] btrfs: splice remaining dirty_bg's onto the transaction dirty bg list Josef Bacik
2021-01-11 22:09 ` David Sterba [this message]
2020-12-16 16:22 ` [PATCH 05/13] btrfs: do not WARN_ON() if we can't find the reloc root Josef Bacik
2021-01-11 22:14 ` David Sterba
2020-12-16 16:22 ` [PATCH 06/13] btrfs: add ASSERT()'s for deleting backref cache nodes Josef Bacik
2021-01-11 22:18 ` David Sterba
2020-12-16 16:22 ` [PATCH 07/13] btrfs: do not double free backref nodes on error Josef Bacik
2020-12-16 16:22 ` [PATCH 08/13] btrfs: abort the transaction if we fail to inc ref in btrfs_copy_root Josef Bacik
2021-01-11 22:20 ` David Sterba
2020-12-16 16:22 ` [PATCH 09/13] btrfs: modify the new_root highest_objectid under a ref count Josef Bacik
2020-12-18 11:18 ` Nikolay Borisov
2020-12-16 16:22 ` [PATCH 10/13] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-12-16 16:22 ` [PATCH 11/13] btrfs: keep track of the root owner for relocation reads Josef Bacik
2021-01-11 22:23 ` David Sterba
2021-01-14 18:03 ` David Sterba
2020-12-16 16:22 ` [PATCH 12/13] btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node Josef Bacik
2020-12-16 16:22 ` [PATCH 13/13] btrfs: don't clear ret in btrfs_start_dirty_block_groups Josef Bacik
2021-01-08 16:44 ` [PATCH 00/13] Serious fixes for different error paths David Sterba
2021-01-14 18:20 ` 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=20210111220948.GJ6430@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.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).