From: David Sterba <dsterba@suse.cz>
To: Josef Bacik <josef@toxicpanda.com>
Cc: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH v7 03/38] btrfs: handle errors from select_reloc_root()
Date: Fri, 26 Feb 2021 19:30:59 +0100 [thread overview]
Message-ID: <20210226183059.GP7604@twin.jikos.cz> (raw)
In-Reply-To: <aa44497f5c2b8c96ca1229daa4dfdb6503971f31.1608135849.git.josef@toxicpanda.com>
On Wed, Dec 16, 2020 at 11:26:19AM -0500, Josef Bacik wrote:
> Currently select_reloc_root() doesn't return an error, but followup
> patches will make it possible for it to return an error. We do have
> proper error recovery in do_relocation however, so handle the
> possibility of select_reloc_root() having an error properly instead of
> BUG_ON(!root). I've also adjusted select_reloc_root() to return
> ERR_PTR(-ENOENT) if we don't find a root, instead of NULL, to make the
> error case easier to deal with. I've replaced the BUG_ON(!root) with an
> ASSERT(0) for this case as it indicates we messed up the backref walking
> code, but it could also indicate corruption.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/relocation.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index 08ffaa93b78f..741068580455 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -2024,8 +2024,14 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans,
> if (!next || next->level <= node->level)
> break;
> }
> - if (!root)
> - return NULL;
> + if (!root) {
> + /*
> + * This can happen if there's fs corruption or if there's a bug
> + * in the backref lookup code.
> + */
> + ASSERT(0);
You've added these assert(0) to several patches and I think it's wrong.
The asserts are supposed to verify invariants, you can hardly say that
we're expecting 0 to be true, so the construct serves as "please crash
here", which is no better than BUG(). It's been spreading, there are
like 25 now.
> + return ERR_PTR(-ENOENT);
The caller that does expect ENOENT because that would be a logical error
should do the assert.
> + }
>
> next = node;
> /* setup backref node path for btrfs_reloc_cow_block */
> @@ -2196,7 +2202,10 @@ static int do_relocation(struct btrfs_trans_handle *trans,
>
> upper = edge->node[UPPER];
> root = select_reloc_root(trans, rc, upper, edges);
> - BUG_ON(!root);
> + if (IS_ERR(root)) {
> + ret = PTR_ERR(root);
> + goto next;
> + }
>
> if (upper->eb && !upper->locked) {
> if (!lowest) {
> --
> 2.26.2
next prev parent reply other threads:[~2021-02-26 18:34 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 16:26 [PATCH v7 00/38] Cleanup error handling in relocation Josef Bacik
2020-12-16 16:26 ` [PATCH v7 01/38] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-12-16 16:26 ` [PATCH v7 02/38] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2021-02-26 19:03 ` David Sterba
2020-12-16 16:26 ` [PATCH v7 03/38] btrfs: handle errors from select_reloc_root() Josef Bacik
2021-02-26 18:30 ` David Sterba [this message]
2021-03-11 18:10 ` Josef Bacik
2021-04-09 19:24 ` David Sterba
2020-12-16 16:26 ` [PATCH v7 04/38] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-12-16 16:26 ` [PATCH v7 05/38] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 06/38] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-12-16 16:26 ` [PATCH v7 07/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-12-16 16:26 ` [PATCH v7 08/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-12-16 16:26 ` [PATCH v7 09/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-12-16 16:26 ` [PATCH v7 10/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-12-16 16:26 ` [PATCH v7 11/38] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-12-16 16:26 ` [PATCH v7 12/38] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-12-16 16:26 ` [PATCH v7 13/38] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-12-16 16:26 ` [PATCH v7 14/38] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-12-16 16:26 ` [PATCH v7 15/38] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-12-16 16:26 ` [PATCH v7 16/38] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-12-16 16:26 ` [PATCH v7 17/38] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 18/38] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 19/38] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 20/38] btrfs: validate ->reloc_root after recording root in trans Josef Bacik
2020-12-16 16:26 ` [PATCH v7 21/38] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-12-16 16:26 ` [PATCH v7 22/38] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-12-16 16:26 ` [PATCH v7 23/38] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-12-16 16:26 ` [PATCH v7 24/38] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-12-16 16:26 ` [PATCH v7 25/38] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 26/38] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-12-16 16:26 ` [PATCH v7 27/38] btrfs: handle btrfs_cow_block errors in replace_path Josef Bacik
2020-12-16 16:26 ` [PATCH v7 28/38] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-12-16 16:26 ` [PATCH v7 29/38] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-12-16 16:26 ` [PATCH v7 30/38] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-12-16 16:26 ` [PATCH v7 31/38] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-12-16 16:26 ` [PATCH v7 32/38] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-12-16 16:26 ` [PATCH v7 33/38] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-12-16 16:26 ` [PATCH v7 34/38] btrfs: handle __add_reloc_root failures in btrfs_recover_relocation Josef Bacik
2020-12-16 16:26 ` [PATCH v7 35/38] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-12-16 16:26 ` [PATCH v7 36/38] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-12-16 16:26 ` [PATCH v7 37/38] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-12-16 16:26 ` [PATCH v7 38/38] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
2020-12-16 19:56 ` [PATCH v7 00/38] Cleanup error handling " Zygo Blaxell
2020-12-18 16:25 ` 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=20210226183059.GP7604@twin.jikos.cz \
--to=dsterba@suse.cz \
--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;
as well as URLs for NNTP newsgroup(s).