From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v6 47/52] btrfs: do proper error handling in merge_reloc_roots
Date: Tue, 8 Dec 2020 11:23:54 -0500 [thread overview]
Message-ID: <e1ac662997d4e2c238bbc6c463216b2aa696a0be.1607444471.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1607444471.git.josef@toxicpanda.com>
We have a BUG_ON() if we get an error back from btrfs_get_fs_root().
This honestly should never fail, as at this point we have a solid
coordination of fs root to reloc root, and these roots will all be in
memory. But in the name of killing BUG_ON()'s remove these and handle
the error condition properly, ASSERT()'ing for developers.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/relocation.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 9a59adaf178c..066d06575dbc 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1950,8 +1950,29 @@ void merge_reloc_roots(struct reloc_control *rc)
root = btrfs_get_fs_root(fs_info, reloc_root->root_key.offset,
false);
if (btrfs_root_refs(&reloc_root->root_item) > 0) {
- BUG_ON(IS_ERR(root));
- BUG_ON(root->reloc_root != reloc_root);
+ if (IS_ERR(root)) {
+ /*
+ * For recovery we read the fs roots on mount,
+ * and if we didn't find the root then we marked
+ * the reloc root as a garbage root. For normal
+ * relocation obviously the root should exist in
+ * memory. However there's no reason we can't
+ * handle the error properly here just in case.
+ */
+ ASSERT(0);
+ ret = PTR_ERR(root);
+ goto out;
+ }
+ if (root->reloc_root != reloc_root) {
+ /*
+ * This is actually impossible without something
+ * going really wrong (like weird race condition
+ * or cosmic rays).
+ */
+ ASSERT(0);
+ ret = -EINVAL;
+ goto out;
+ }
ret = merge_reloc_root(rc, root);
btrfs_put_root(root);
if (ret) {
--
2.26.2
next prev parent reply other threads:[~2020-12-08 16:26 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 16:23 [PATCH v6 00/52] Josef Bacik
2020-12-08 16:23 ` [PATCH v6 01/52] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block Josef Bacik
2020-12-08 16:23 ` [PATCH v6 02/52] btrfs: modify the new_root highest_objectid under a ref count Josef Bacik
2020-12-08 16:23 ` [PATCH v6 03/52] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-12-08 16:23 ` [PATCH v6 04/52] btrfs: keep track of the root owner for relocation reads Josef Bacik
2020-12-08 16:23 ` [PATCH v6 05/52] btrfs: noinline btrfs_should_cancel_balance Josef Bacik
2020-12-08 16:23 ` [PATCH v6 06/52] btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node Josef Bacik
2020-12-08 16:23 ` [PATCH v6 07/52] btrfs: pass down the tree block level through ref-verify Josef Bacik
2020-12-08 16:23 ` [PATCH v6 08/52] btrfs: make sure owner is set in ref-verify Josef Bacik
2020-12-08 16:23 ` [PATCH v6 09/52] btrfs: don't clear ret in btrfs_start_dirty_block_groups Josef Bacik
2020-12-08 16:23 ` [PATCH v6 10/52] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation Josef Bacik
2020-12-08 16:23 ` [PATCH v6 11/52] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-12-08 16:23 ` [PATCH v6 12/52] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2020-12-08 16:23 ` [PATCH v6 13/52] btrfs: handle errors from select_reloc_root() Josef Bacik
2020-12-08 16:23 ` [PATCH v6 14/52] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-12-08 16:23 ` [PATCH v6 15/52] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-12-08 16:23 ` [PATCH v6 16/52] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-12-08 16:23 ` [PATCH v6 17/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-12-08 16:23 ` [PATCH v6 18/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-12-08 16:23 ` [PATCH v6 19/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-12-08 16:23 ` [PATCH v6 20/52] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-12-08 16:23 ` [PATCH v6 21/52] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-12-08 16:23 ` [PATCH v6 22/52] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-12-08 16:23 ` [PATCH v6 23/52] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-12-08 16:23 ` [PATCH v6 24/52] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-12-08 16:23 ` [PATCH v6 25/52] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-12-08 16:23 ` [PATCH v6 26/52] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-12-08 16:23 ` [PATCH v6 27/52] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-12-08 16:23 ` [PATCH v6 28/52] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-12-08 16:23 ` [PATCH v6 29/52] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-12-08 16:23 ` [PATCH v6 30/52] btrfs: validate ->reloc_root after recording root in trans Josef Bacik
2020-12-08 16:23 ` [PATCH v6 31/52] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-12-08 16:23 ` [PATCH v6 32/52] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-12-08 16:23 ` [PATCH v6 33/52] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-12-08 16:23 ` [PATCH v6 34/52] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-12-08 16:23 ` [PATCH v6 35/52] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-12-08 16:23 ` [PATCH v6 36/52] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-12-08 16:23 ` [PATCH v6 37/52] btrfs: handle btrfs_cow_block errors in replace_path Josef Bacik
2020-12-08 16:23 ` [PATCH v6 38/52] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-12-08 16:23 ` [PATCH v6 39/52] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-12-08 16:23 ` [PATCH v6 40/52] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-12-08 16:23 ` [PATCH v6 41/52] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-12-08 16:23 ` [PATCH v6 42/52] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-12-08 16:23 ` [PATCH v6 43/52] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-12-08 16:23 ` [PATCH v6 44/52] btrfs: handle __add_reloc_root failures in btrfs_recover_relocation Josef Bacik
2020-12-08 16:23 ` [PATCH v6 45/52] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-12-08 16:23 ` [PATCH v6 46/52] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-12-08 16:23 ` Josef Bacik [this message]
2020-12-08 16:23 ` [PATCH v6 48/52] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
2020-12-08 16:23 ` [PATCH v6 49/52] btrfs: do not WARN_ON() if we can't find the reloc root Josef Bacik
2020-12-08 16:23 ` [PATCH v6 50/52] btrfs: print the actual offset in btrfs_root_name Josef Bacik
2020-12-08 16:23 ` [PATCH v6 51/52] btrfs: fix reloc root leak with 0 ref reloc roots on recovery Josef Bacik
2020-12-08 16:23 ` [PATCH v6 52/52] btrfs: splice remaining dirty_bg's onto the transaction dirty bg list Josef Bacik
2020-12-08 19:46 ` [PATCH v6 00/52] Zygo Blaxell
2020-12-13 22:26 ` Zygo Blaxell
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=e1ac662997d4e2c238bbc6c463216b2aa696a0be.1607444471.git.josef@toxicpanda.com \
--to=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