From: David Sterba <dsterba@suse.cz>
To: Qu Wenruo <wqu@suse.com>
Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>,
Josef Bacik <josef@toxicpanda.com>
Subject: Re: [PATCH v4 2/4] btrfs: extent-tree: Kill BUG_ON() in __btrfs_free_extent() and do better comment
Date: Thu, 13 Aug 2020 16:10:19 +0200 [thread overview]
Message-ID: <20200813141019.GI2026@twin.jikos.cz> (raw)
In-Reply-To: <20200812060509.71590-3-wqu@suse.com>
On Wed, Aug 12, 2020 at 02:05:07PM +0800, Qu Wenruo wrote:
> @@ -2987,13 +3049,20 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
> found_extent = 1;
> break;
> }
> +
> + /* Quick path didn't find the EXTEMT/METADATA_ITEM */
> if (path->slots[0] - extent_slot > 5)
> break;
> extent_slot--;
> }
>
> if (!found_extent) {
> - BUG_ON(iref);
> + if (unlikely(iref)) {
> + btrfs_crit(info,
> +"invalid iref, no EXTENT/METADATA_ITEM found but has inline extent ref");
> + goto err_dump_abort;
This is not calling transaction abort at the place where it happens,
here and several other places too.
> @@ -3164,6 +3267,21 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
> out:
> btrfs_free_path(path);
> return ret;
> +err_dump_abort:
> + /*
> + * Leaf dump can take up a lot of dmesg buffer since default nodesize
> + * is already 16K.
> + * So we only do full leaf dump for debug build.
> + */
> + if (IS_ENABLED(CONFIG_BTRFS_DEBUG)) {
> + btrfs_crit(info, "path->slots[0]=%d extent_slot=%d",
> + path->slots[0], extent_slot);
> + btrfs_print_leaf(path->nodes[0]);
Preceded by a potentially long-running action, so this will delay the
acutal abort.
> + }
> +
> + btrfs_abort_transaction(trans, -EUCLEAN);
> + btrfs_free_path(path);
> + return -EUCLEAN;
> }
next prev parent reply other threads:[~2020-08-13 14:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 6:05 [PATCH v4 0/4] btrfs: Enhanced runtime defence against fuzzed images Qu Wenruo
2020-08-12 6:05 ` [PATCH v4 1/4] btrfs: extent_io: Do extra check for extent buffer read write functions Qu Wenruo
2020-08-13 14:05 ` David Sterba
2020-08-14 0:47 ` Qu Wenruo
2020-08-14 10:29 ` David Sterba
2020-08-12 6:05 ` [PATCH v4 2/4] btrfs: extent-tree: Kill BUG_ON() in __btrfs_free_extent() and do better comment Qu Wenruo
2020-08-13 14:10 ` David Sterba [this message]
2020-08-14 0:52 ` Qu Wenruo
2020-08-14 8:01 ` David Sterba
2020-08-14 8:07 ` Qu Wenruo
2020-08-12 6:05 ` [PATCH v4 3/4] btrfs: extent-tree: Kill the BUG_ON() in insert_inline_extent_backref() Qu Wenruo
2020-08-12 6:05 ` [PATCH v4 4/4] btrfs: ctree: Checking key orders before merged tree blocks Qu Wenruo
2020-08-13 14:21 ` David Sterba
2020-08-14 0:54 ` Qu Wenruo
2020-08-14 7:58 ` David Sterba
2020-08-12 6:52 ` [PATCH v4 0/4] btrfs: Enhanced runtime defence against fuzzed images 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=20200813141019.GI2026@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
--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