All of lore.kernel.org
 help / color / mirror / Atom feed
From: Josef Bacik <jbacik@fb.com>
To: Marc MERLIN <marc@merlins.org>
Cc: <dsterba@suse.com>, <clm@fb.com>, <linux-btrfs@vger.kernel.org>
Subject: Re: kernel BUG at fs/btrfs/extent-tree.c:8113! (4.1.3 kernel)
Date: Wed, 12 Aug 2015 11:15:39 -0400	[thread overview]
Message-ID: <55CB631B.2080404@fb.com> (raw)
In-Reply-To: <20150812144749.GY24824@merlins.org>

On 08/12/2015 10:47 AM, Marc MERLIN wrote:
> On Tue, Aug 11, 2015 at 11:40:45AM -0400, Josef Bacik wrote:
>>  From a48cf7a9ae44a17d927df5542c8b0be287aee9ed Mon Sep 17 00:00:00 2001
>> From: Josef Bacik <jbacik@fb.com>
>> Date: Tue, 11 Aug 2015 11:39:37 -0400
>> Subject: [PATCH] Btrfs: kill BUG_ON() in btrfs_lookup_extent_info()
>>
>> Replace it with an ASSERT(0) for the developers and an error for not the
>> developers.
>
> Thanks. We knocked one down and now another BUG has been triggered :)
>
> 	if (unlikely(wc->refs[level - 1] == 0)) {
> 		btrfs_err(root->fs_info, "Missing references.");
> 		BUG();
> 	}
>

This is why you got your own branch, it's never just one.  Here's the 
next bit


 From 07214b5294d2772682aba893de15ef8020994598 Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fb.com>
Date: Wed, 12 Aug 2015 11:06:42 -0400
Subject: [PATCH] Btrfs: don't BUG() during drop snapshot

Really there's lots of things that can go wrong here, kill all the 
BUG_ON()'s
and replace the logic ones with ASSERT()'s and return EIO instead.  Also 
fix the
leak of next in one of the error conditions while we're at it.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
  fs/btrfs/extent-tree.c | 27 +++++++++++++++++++++++----
  1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index f7fb120..6671faf 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8196,12 +8196,15 @@ static noinline int do_walk_down(struct 
btrfs_trans_handle *trans,
  				       &wc->flags[level - 1]);
  	if (ret < 0) {
  		btrfs_tree_unlock(next);
+		free_extent_buffer(next);
  		return ret;
  	}

  	if (unlikely(wc->refs[level - 1] == 0)) {
  		btrfs_err(root->fs_info, "Missing references.");
-		BUG();
+		btrfs_tree_unlock(next);
+		free_extent_buffer(next);
+		return -EIO;
  	}
  	*lookup_info = 0;

@@ -8253,7 +8256,13 @@ static noinline int do_walk_down(struct 
btrfs_trans_handle *trans,
  	}

  	level--;
-	BUG_ON(level != btrfs_header_level(next));
+	ASSERT(level == btrfs_header_level(next));
+	if (level != btrfs_header_level(next)) {
+		printk(KERN_ERR "Mismatched level\n");
+		btrfs_tree_unlock(next);
+		free_extent_buffer(next);
+		return -EIO;
+	}
  	path->nodes[level] = next;
  	path->slots[level] = 0;
  	path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
@@ -8268,8 +8277,14 @@ skip:
  		if (wc->flags[level] & BTRFS_BLOCK_FLAG_FULL_BACKREF) {
  			parent = path->nodes[level]->start;
  		} else {
-			BUG_ON(root->root_key.objectid !=
+			ASSERT(root->root_key.objectid ==
  			       btrfs_header_owner(path->nodes[level]));
+			if (root->root_key.objectid !=
+			    btrfs_header_owner(path->nodes[level])) {
+				printk(KERN_ERR "Mismatched block owner\n");
+				btrfs_tree_unlock(next);
+				free_extent_buffer(next);
+			}
  			parent = 0;
  		}

@@ -8285,7 +8300,11 @@ skip:
  		}
  		ret = btrfs_free_extent(trans, root, bytenr, blocksize, parent,
  				root->root_key.objectid, level - 1, 0, 0);
-		BUG_ON(ret); /* -ENOMEM */
+		if (ret) {
+			btrfs_tree_unlock(next);
+			free_extent_buffer(next);
+			return ret;
+		}
  	}
  	btrfs_tree_unlock(next);
  	free_extent_buffer(next);
-- 
2.1.0


  reply	other threads:[~2015-08-12 15:16 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-06 21:21 btrfs check --repair crash, and btrfs-cleaner crash Marc MERLIN
2015-07-10 13:43 ` Btrfs progs release 4.1.1 David Sterba
2015-07-12  1:02   ` Marc MERLIN
2015-07-23 11:55     ` David Sterba
2015-07-24 16:24       ` Marc MERLIN
2015-08-03  3:51         ` kernel BUG at fs/btrfs/extent-tree.c:8113! (4.1.3 kernel) Marc MERLIN
2015-08-11  5:07           ` Marc MERLIN
2015-08-11 15:40             ` Josef Bacik
2015-08-12 14:47               ` Marc MERLIN
2015-08-12 15:15                 ` Josef Bacik [this message]
2015-08-12 16:09                   ` Marc MERLIN
2015-08-12 16:18                     ` Josef Bacik
2015-08-12 17:19                       ` Marc MERLIN
2015-08-17  2:01                         ` Qu Wenruo
2015-08-17 14:49                           ` Marc MERLIN
2015-08-22 14:37                             ` Marc MERLIN
2015-08-24  1:10                               ` Qu Wenruo
2015-08-24  4:28                                 ` Marc MERLIN
2015-08-24  5:11                                   ` Qu Wenruo
2015-08-24 14:10                                     ` Marc MERLIN
2015-08-25  0:26                                       ` Qu Wenruo
2015-08-25  2:51                                       ` Qu Wenruo
2015-08-25  5:28                                         ` Marc MERLIN
2015-08-25  6:00                                           ` Qu Wenruo
2015-08-25  6:50                                             ` Marc MERLIN

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=55CB631B.2080404@fb.com \
    --to=jbacik@fb.com \
    --cc=clm@fb.com \
    --cc=dsterba@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=marc@merlins.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.