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 14/54] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors
Date: Thu, 3 Dec 2020 10:29:40 +0800 [thread overview]
Message-ID: <d06dad66-d597-b650-62b9-0e04d531f2e3@gmx.com> (raw)
In-Reply-To: <a9346ccd6f5de1a6cac12918ccace014b7f3bd6c.1606938211.git.josef@toxicpanda.com>
[-- Attachment #1.1: Type: text/plain, Size: 3946 bytes --]
On 2020/12/3 上午3:50, Josef Bacik wrote:
> We have several BUG_ON()'s in select_reloc_root() that can be tripped if
> you have extent tree corruption. Convert these to ASSERT()'s, because
> if we hit it during testing it really is bad, or could indicate a
> problem with the backref walking code.
>
> However if users hit these problems it generally indicates corruption,
> I've hit a few machines in the fleet that trip over these with clearly
> corrupted extent trees, so be nice and spit out an error message and
> return an error instead of bringing the whole box down.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/relocation.c | 51 +++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 47 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index 66515ccc04fe..bf4e1018356a 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -1996,8 +1996,35 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,
> cond_resched();
> next = walk_up_backref(next, edges, &index);
> root = next->root;
> - BUG_ON(!root);
> - BUG_ON(!test_bit(BTRFS_ROOT_SHAREABLE, &root->state));
> +
> + /*
> + * If there is no root, then our references for this block are
> + * incomplete, as we should be able to walk all the way up to a
> + * block that is owned by a root.
> + *
> + * This path is only for SHAREABLE roots, so if we come upon a
> + * non-SHAREABLE root then we have backrefs that resolve
> + * improperly.
> + *
> + * Both of these cases indicate file system corruption, or a bug
> + * in the backref walking code. The ASSERT() is to make sure
> + * developers get bitten as soon as possible, proper error
> + * handling is for users who may have corrupt file systems.
> + */
> + if (!root) {
> + ASSERT(root);
ASSERT(0); maybe a little less confusing.
> + btrfs_err(trans->fs_info,
> + "bytenr %llu doesn't have a backref path ending in a root",
> + node->bytenr);
> + return ERR_PTR(-EUCLEAN);
> + }
> + if (!test_bit(BTRFS_ROOT_SHAREABLE, &root->state)) {
> + ASSERT(test_bit(BTRFS_ROOT_SHAREABLE, &root->state));
Same here.
> + btrfs_err(trans->fs_info,
> +"bytenr %llu has multiple refs with one ending in a non shareable root",
> + node->bytenr);
> + return ERR_PTR(-EUCLEAN);
> + }
>
> if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
> record_reloc_root_in_trans(trans, root);
> @@ -2008,8 +2035,24 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,
> root = root->reloc_root;
>
> if (next->new_bytenr != root->node->start) {
> - BUG_ON(next->new_bytenr);
> - BUG_ON(!list_empty(&next->list));
> + /*
> + * We just created the reloc root, so we shouldn't have
> + * ->new_bytenr set and this shouldn't be in the changed
> + * list. If it is then we have multiple roots pointing
> + * at the same bytenr, or we've made a mistake in the
> + * backref walking code. ASSERT() for developers,
> + * error out for users, as it indicates corruption or a
> + * bad bug.
The ASSERT() comment mentioned everywhere seems a little overkilled.
> + */
> + ASSERT(next->new_bytenr == 0);
> + ASSERT(list_empty(&next->list));
> + if (next->new_bytenr || !list_empty(&next->list)) {
Just ASSERT(0); here would be good enough.
Despite that, the new ASSERT() for developer and do error handling
properly is really awesome behavior.
Thanks,
Qu
> + btrfs_err(trans->fs_info,
> +"bytenr %llu possibly has multiple roots pointing at the same bytenr %llu",
> + node->bytenr, next->bytenr);
> + return ERR_PTR(-EUCLEAN);
> + }
> +
> next->new_bytenr = root->node->start;
> btrfs_put_root(next->root);
> next->root = btrfs_grab_root(root);
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-03 2:31 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
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 [this message]
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=d06dad66-d597-b650-62b9-0e04d531f2e3@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