From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: Josef Bacik <josef@toxicpanda.com>,
linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH v3 04/54] btrfs: keep track of the root owner for relocation reads
Date: Thu, 3 Dec 2020 10:04:33 +0800 [thread overview]
Message-ID: <487bcc51-3d99-2592-4168-8b8bbf7d5017@gmx.com> (raw)
In-Reply-To: <6d95a4747f99af7b1ce4cdd249998c821de2515a.1606938211.git.josef@toxicpanda.com>
[-- Attachment #1.1: Type: text/plain, Size: 7878 bytes --]
On 2020/12/3 上午3:50, Josef Bacik wrote:
> While testing the error paths in relocation, I hit the following lockdep
> splat
>
> ======================================================
> WARNING: possible circular locking dependency detected
> 5.10.0-rc3+ #206 Not tainted
> ------------------------------------------------------
> btrfs-balance/1571 is trying to acquire lock:
> ffff8cdbcc8f77d0 (&head_ref->mutex){+.+.}-{3:3}, at: btrfs_lookup_extent_info+0x156/0x3b0
>
> but task is already holding lock:
> ffff8cdbc54adbf8 (btrfs-tree-00){++++}-{3:3}, at: __btrfs_tree_lock+0x27/0x100
>
> which lock already depends on the new lock.
>
> the existing dependency chain (in reverse order) is:
>
> -> #2 (btrfs-tree-00){++++}-{3:3}:
> down_write_nested+0x43/0x80
> __btrfs_tree_lock+0x27/0x100
> btrfs_search_slot+0x248/0x890
> relocate_tree_blocks+0x490/0x650
> relocate_block_group+0x1ba/0x5d0
> kretprobe_trampoline+0x0/0x50
>
> -> #1 (btrfs-csum-01){++++}-{3:3}:
> down_read_nested+0x43/0x130
> __btrfs_tree_read_lock+0x27/0x100
> btrfs_read_lock_root_node+0x31/0x40
> btrfs_search_slot+0x5ab/0x890
> btrfs_del_csums+0x10b/0x3c0
> __btrfs_free_extent+0x49d/0x8e0
> __btrfs_run_delayed_refs+0x283/0x11f0
> btrfs_run_delayed_refs+0x86/0x220
> btrfs_start_dirty_block_groups+0x2ba/0x520
> kretprobe_trampoline+0x0/0x50
>
> -> #0 (&head_ref->mutex){+.+.}-{3:3}:
> __lock_acquire+0x1167/0x2150
> lock_acquire+0x116/0x3e0
> __mutex_lock+0x7e/0x7b0
> btrfs_lookup_extent_info+0x156/0x3b0
> walk_down_proc+0x1c3/0x280
> walk_down_tree+0x64/0xe0
> btrfs_drop_subtree+0x182/0x260
> do_relocation+0x52e/0x660
> relocate_tree_blocks+0x2ae/0x650
> relocate_block_group+0x1ba/0x5d0
> kretprobe_trampoline+0x0/0x50
>
> other info that might help us debug this:
>
> Chain exists of:
> &head_ref->mutex --> btrfs-csum-01 --> btrfs-tree-00
>
> Possible unsafe locking scenario:
>
> CPU0 CPU1
> ---- ----
> lock(btrfs-tree-00);
> lock(btrfs-csum-01);
> lock(btrfs-tree-00);
I found it a little confusing that, subv trees got the name "tree".
Maybe another patch to rename it to something like "fs" or "subv" would
be better?
[...]
>
> As you can see this is bogus, we never take another tree's lock under
> the csum lock. This happens because sometimes we have to read tree
> blocks from disk without knowing which root they belong to during
> relocation. We defaulted to an owner of 0, which translates to an fs
> tree. This is fine as all fs trees have the same class, but obviously
> isn't fine if the block belongs to a cow only tree.
>
> Thankfully cow only trees only have their owners root as a reference to
> them, and since we already look up the extent information during
> relocation, go ahead and check and see if this block might belong to a
> cow only tree, and if so save the owner in the struct tree_block. This
> allows us to read_tree_block with the proper owner, which gets rid of
> this lockdep splat.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
The fix is OK, although some extra comment inlined below.
> ---
> fs/btrfs/relocation.c | 47 ++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 44 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index 19b7db8b2117..2b30e39e922a 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -98,6 +98,7 @@ struct tree_block {
> u64 bytenr;
> }; /* Use rb_simple_node for search/insert */
> struct btrfs_key key;
> + u64 owner;
> unsigned int level:8;
> unsigned int key_ready:1;
> };
> @@ -2393,8 +2394,8 @@ static int get_tree_block_key(struct btrfs_fs_info *fs_info,
> {
> struct extent_buffer *eb;
>
> - eb = read_tree_block(fs_info, block->bytenr, 0, block->key.offset,
> - block->level, NULL);
> + eb = read_tree_block(fs_info, block->bytenr, block->owner,
> + block->key.offset, block->level, NULL);
> if (IS_ERR(eb)) {
> return PTR_ERR(eb);
> } else if (!extent_buffer_uptodate(eb)) {
> @@ -2493,7 +2494,8 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,
> /* Kick in readahead for tree blocks with missing keys */
> rbtree_postorder_for_each_entry_safe(block, next, blocks, rb_node) {
> if (!block->key_ready)
> - btrfs_readahead_tree_block(fs_info, block->bytenr, 0, 0,
> + btrfs_readahead_tree_block(fs_info, block->bytenr,
> + block->owner, 0,
> block->level);
> }
>
> @@ -2801,21 +2803,59 @@ static int add_tree_block(struct reloc_control *rc,
> u32 item_size;
> int level = -1;
> u64 generation;
> + u64 owner = 0;
>
> eb = path->nodes[0];
> item_size = btrfs_item_size_nr(eb, path->slots[0]);
>
> if (extent_key->type == BTRFS_METADATA_ITEM_KEY ||
> item_size >= sizeof(*ei) + sizeof(*bi)) {
> + unsigned long ptr = 0, end;
Do we really need that end to iterate through the extent item?
For cow-only trees, we only cow them to do the balance, which means
metadata/extent item for them should only contain one inline item and no
way to have keyed item.
If the metadata/extent item has more than one inline ref, it must not be
for COW trees.
Can't we use extent item size as a quick check?
Also this inspires me to add tree-checker for extent item size.
Thanks,
Qu
> ei = btrfs_item_ptr(eb, path->slots[0],
> struct btrfs_extent_item);
> + end = (unsigned long)ei + item_size;
> if (extent_key->type == BTRFS_EXTENT_ITEM_KEY) {
> bi = (struct btrfs_tree_block_info *)(ei + 1);
> level = btrfs_tree_block_level(eb, bi);
> + ptr = (unsigned long)(bi + 1);
> } else {
> level = (int)extent_key->offset;
> + ptr = (unsigned long)(ei + 1);
> }
> generation = btrfs_extent_generation(eb, ei);
> +
> + /*
> + * We're reading random blocks without knowing their owner ahead
> + * of time. This is ok most of the time, as all reloc roots and
> + * fs roots have the same lock type. However normal trees do
> + * not, and the only way to know ahead of time is to read the
> + * inline ref offset. We know it's an fs root if
> + *
> + * 1. There's more than one ref.
> + * 2. There's a SHARED_DATA_REF_KEY set.
> + * 3. FULL_BACKREF is set on the flags.
> + *
> + * Otherwise it's safe to assume that the ref offset == the
> + * owner of this block, so we can use that when calling
> + * read_tree_block.
> + */
> + if (btrfs_extent_refs(eb, ei) == 1 &&
> + !(btrfs_extent_flags(eb, ei) &
> + BTRFS_BLOCK_FLAG_FULL_BACKREF) &&
> + ptr < end) {
> + struct btrfs_extent_inline_ref *iref;
> + int type;
> +
> + iref = (struct btrfs_extent_inline_ref *)ptr;
> + type = btrfs_get_extent_inline_ref_type(eb, iref,
> + BTRFS_REF_TYPE_BLOCK);
> + if (type == BTRFS_REF_TYPE_INVALID)
> + return -EINVAL;
> + if (type == BTRFS_TREE_BLOCK_REF_KEY)
> + owner = btrfs_extent_inline_ref_offset(eb,
> + iref);
> + }
> } else if (unlikely(item_size == sizeof(struct btrfs_extent_item_v0))) {
> btrfs_print_v0_err(eb->fs_info);
> btrfs_handle_fs_error(eb->fs_info, -EINVAL, NULL);
> @@ -2837,6 +2877,7 @@ static int add_tree_block(struct reloc_control *rc,
> block->key.offset = generation;
> block->level = level;
> block->key_ready = 0;
> + block->owner = owner;
>
> rb_node = rb_simple_insert(blocks, block->bytenr, &block->rb_node);
> if (rb_node)
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-03 2:06 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 19:50 [PATCH v3 00/54] Cleanup error handling in relocation Josef Bacik
2020-12-02 19:50 ` [PATCH v3 01/54] btrfs: fix error handling in commit_fs_roots Josef Bacik
2020-12-03 1:45 ` Qu Wenruo
2020-12-03 8:09 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 02/54] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block Josef Bacik
2020-12-03 1:48 ` Qu Wenruo
2020-12-03 8:21 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 03/54] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-12-03 1:49 ` Qu Wenruo
2020-12-03 8:44 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 04/54] btrfs: keep track of the root owner for relocation reads Josef Bacik
2020-12-03 2:04 ` Qu Wenruo [this message]
2020-12-03 15:55 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 05/54] btrfs: noinline btrfs_should_cancel_balance Josef Bacik
2020-12-03 2:06 ` Qu Wenruo
2020-12-03 8:44 ` Johannes Thumshirn
2020-12-03 9:00 ` Nikolay Borisov
2020-12-03 17:04 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 06/54] btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node Josef Bacik
2020-12-03 2:08 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 07/54] btrfs: pass down the tree block level through ref-verify Josef Bacik
2020-12-02 19:50 ` [PATCH v3 08/54] btrfs: make sure owner is set in ref-verify Josef Bacik
2020-12-02 19:50 ` [PATCH v3 09/54] btrfs: don't clear ret in btrfs_start_dirty_block_groups Josef Bacik
2020-12-03 2:13 ` Qu Wenruo
2020-12-03 8:58 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 10/54] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation Josef Bacik
2020-12-03 2:14 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 11/54] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-12-03 2:15 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 12/54] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2020-12-03 2:20 ` Qu Wenruo
2020-12-03 13:50 ` Johannes Thumshirn
2020-12-02 19:50 ` [PATCH v3 13/54] btrfs: handle errors from select_reloc_root() Josef Bacik
2020-12-03 2:23 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 14/54] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-12-03 2:29 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 15/54] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-12-03 2:33 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 16/54] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-12-03 2:39 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 17/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-12-03 2:40 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 18/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-12-02 19:50 ` [PATCH v3 19/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-12-03 2:41 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 20/54] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-12-03 2:42 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 21/54] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-12-03 2:43 ` Qu Wenruo
2020-12-03 16:06 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 22/54] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-12-03 2:44 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 23/54] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-12-03 2:47 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 24/54] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-12-03 2:48 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 25/54] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-12-02 19:50 ` [PATCH v3 26/54] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-12-03 2:56 ` Qu Wenruo
2020-12-03 16:14 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 27/54] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-12-03 3:00 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 28/54] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-12-02 19:50 ` [PATCH v3 29/54] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-12-03 3:29 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 30/54] btrfs: validate ->reloc_root after recording root in trans Josef Bacik
2020-12-03 4:49 ` Qu Wenruo
2020-12-03 16:18 ` Josef Bacik
2020-12-02 19:50 ` [PATCH v3 31/54] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-12-03 4:51 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 32/54] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-12-02 19:50 ` [PATCH v3 33/54] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-12-02 19:50 ` [PATCH v3 34/54] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-12-02 19:50 ` [PATCH v3 35/54] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-12-03 4:54 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 36/54] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-12-03 4:55 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 37/54] btrfs: handle initial btrfs_cow_block error in replace_path Josef Bacik
2020-12-03 5:05 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 38/54] btrfs: handle the loop " Josef Bacik
2020-12-03 5:11 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 39/54] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-12-03 5:13 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 40/54] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-12-03 5:14 ` Qu Wenruo
2020-12-02 19:50 ` [PATCH v3 41/54] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-12-03 5:15 ` Qu Wenruo
2020-12-03 16:26 ` Josef Bacik
2020-12-02 19:51 ` [PATCH v3 42/54] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-12-03 5:19 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 43/54] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-12-03 5:20 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 44/54] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-12-03 5:25 ` Qu Wenruo
2020-12-03 16:34 ` Josef Bacik
2020-12-02 19:51 ` [PATCH v3 45/54] btrfs: handle __add_reloc_root failure in btrfs_recover_relocation Josef Bacik
2020-12-03 5:32 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 46/54] btrfs: handle __add_reloc_root failure in btrfs_reloc_post_snapshot Josef Bacik
2020-12-03 5:34 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 47/54] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-12-03 5:39 ` Qu Wenruo
2020-12-03 16:53 ` Josef Bacik
2020-12-02 19:51 ` [PATCH v3 48/54] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-12-03 5:40 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 49/54] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-12-03 5:42 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 50/54] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
2020-12-03 5:42 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 51/54] btrfs: do not WARN_ON() if we can't find the reloc root Josef Bacik
2020-12-02 19:51 ` [PATCH v3 52/54] btrfs: print the actual offset in btrfs_root_name Josef Bacik
2020-12-03 5:44 ` Qu Wenruo
2020-12-02 19:51 ` [PATCH v3 53/54] btrfs: fix reloc root leak with 0 ref reloc roots on recovery Josef Bacik
2020-12-02 19:51 ` [PATCH v3 54/54] btrfs: splice remaining dirty_bg's onto the transaction dirty bg list Josef Bacik
2020-12-03 5:47 ` Qu Wenruo
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=487bcc51-3d99-2592-4168-8b8bbf7d5017@gmx.com \
--to=quwenruo.btrfs@gmx.com \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.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