* [PATCH] Btrfs: don't BUG() during drop snapshot
@ 2016-09-22 15:08 David Sterba
2016-09-22 18:03 ` Liu Bo
2016-09-23 11:23 ` [PATCH v2] " David Sterba
0 siblings, 2 replies; 4+ messages in thread
From: David Sterba @ 2016-09-22 15:08 UTC (permalink / raw)
To: linux-btrfs; +Cc: Josef Bacik, David Sterba
From: Josef Bacik <jbacik@fb.com>
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.
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.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 c95f85c292a4..37aba7d00c8f 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8884,12 +8884,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;
@@ -8941,7 +8944,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)) {
+ btrfs_err("mismatched level");
+ 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;
@@ -8956,8 +8965,14 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
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])) {
+ btrfs_err("mismatched block owner");
+ btrfs_tree_unlock(next);
+ free_extent_buffer(next);
+ }
parent = 0;
}
@@ -8972,7 +8987,11 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
}
ret = btrfs_free_extent(trans, root, bytenr, blocksize, parent,
root->root_key.objectid, level - 1, 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.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Btrfs: don't BUG() during drop snapshot
2016-09-22 15:08 [PATCH] Btrfs: don't BUG() during drop snapshot David Sterba
@ 2016-09-22 18:03 ` Liu Bo
2016-09-23 11:23 ` [PATCH v2] " David Sterba
1 sibling, 0 replies; 4+ messages in thread
From: Liu Bo @ 2016-09-22 18:03 UTC (permalink / raw)
To: David Sterba; +Cc: linux-btrfs, Josef Bacik
On Thu, Sep 22, 2016 at 05:08:24PM +0200, David Sterba wrote:
> From: Josef Bacik <jbacik@fb.com>
>
> 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.
>
> Signed-off-by: Josef Bacik <jbacik@fb.com>
> Signed-off-by: David Sterba <dsterba@suse.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 c95f85c292a4..37aba7d00c8f 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -8884,12 +8884,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;
>
> @@ -8941,7 +8944,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)) {
> + btrfs_err("mismatched level");
> + 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;
> @@ -8956,8 +8965,14 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
> 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])) {
> + btrfs_err("mismatched block owner");
> + btrfs_tree_unlock(next);
> + free_extent_buffer(next);
We need a 'return' here, otherwise the next 'if (need_account)' may use
@next after free.
> + }
> parent = 0;
> }
>
> @@ -8972,7 +8987,11 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
> }
> ret = btrfs_free_extent(trans, root, bytenr, blocksize, parent,
> root->root_key.objectid, level - 1, 0);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret) {
> + btrfs_tree_unlock(next);
> + free_extent_buffer(next);
> + return ret;
> + }
> }
Can we put a label of "out" here since most of the above cleanups use
the same way to bail out?
Thanks,
-liubo
> btrfs_tree_unlock(next);
> free_extent_buffer(next);
> --
> 2.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] Btrfs: don't BUG() during drop snapshot
2016-09-22 15:08 [PATCH] Btrfs: don't BUG() during drop snapshot David Sterba
2016-09-22 18:03 ` Liu Bo
@ 2016-09-23 11:23 ` David Sterba
2016-09-23 18:01 ` Liu Bo
1 sibling, 1 reply; 4+ messages in thread
From: David Sterba @ 2016-09-23 11:23 UTC (permalink / raw)
To: linux-btrfs; +Cc: bo.li.liu, jbacik, David Sterba
From: Josef Bacik <jbacik@fb.com>
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.
Signed-off-by: Josef Bacik <jbacik@fb.com>
[ switched to btrfs_err, errors go to common label ]
Signed-off-by: David Sterba <dsterba@suse.com>
---
- added missing return to one branch
- merge common exit code to a label, minor reordering
fs/btrfs/extent-tree.c | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index b6e8b58f05e4..7a0b09fb18e2 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8922,15 +8922,13 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
ret = btrfs_lookup_extent_info(trans, root, bytenr, level - 1, 1,
&wc->refs[level - 1],
&wc->flags[level - 1]);
- if (ret < 0) {
- btrfs_tree_unlock(next);
- free_extent_buffer(next);
- return ret;
- }
+ if (ret < 0)
+ goto out_unlock;
if (unlikely(wc->refs[level - 1] == 0)) {
btrfs_err(root->fs_info, "Missing references.");
- BUG();
+ ret = -EIO;
+ goto out_unlock;
}
*lookup_info = 0;
@@ -8982,7 +8980,12 @@ 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)) {
+ btrfs_err(root->fs_info, "mismatched level");
+ ret = -EIO;
+ goto out_unlock;
+ }
path->nodes[level] = next;
path->slots[level] = 0;
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
@@ -8997,8 +9000,15 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
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])) {
+ btrfs_err(root->fs_info,
+ "mismatched block owner");
+ ret = -EIO;
+ goto out_unlock;
+ }
parent = 0;
}
@@ -9013,12 +9023,18 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
}
ret = btrfs_free_extent(trans, root, bytenr, blocksize, parent,
root->root_key.objectid, level - 1, 0);
- BUG_ON(ret); /* -ENOMEM */
+ if (ret)
+ goto out_unlock;
}
+
+ *lookup_info = 1;
+ ret = 1;
+
+out_unlock:
btrfs_tree_unlock(next);
free_extent_buffer(next);
- *lookup_info = 1;
- return 1;
+
+ return ret;
}
/*
--
2.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Btrfs: don't BUG() during drop snapshot
2016-09-23 11:23 ` [PATCH v2] " David Sterba
@ 2016-09-23 18:01 ` Liu Bo
0 siblings, 0 replies; 4+ messages in thread
From: Liu Bo @ 2016-09-23 18:01 UTC (permalink / raw)
To: David Sterba; +Cc: linux-btrfs, jbacik
On Fri, Sep 23, 2016 at 01:23:28PM +0200, David Sterba wrote:
> From: Josef Bacik <jbacik@fb.com>
>
> 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.
>
> Signed-off-by: Josef Bacik <jbacik@fb.com>
> [ switched to btrfs_err, errors go to common label ]
> Signed-off-by: David Sterba <dsterba@suse.com>
> ---
>
> - added missing return to one branch
> - merge common exit code to a label, minor reordering
>
> fs/btrfs/extent-tree.c | 38 +++++++++++++++++++++++++++-----------
> 1 file changed, 27 insertions(+), 11 deletions(-)
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index b6e8b58f05e4..7a0b09fb18e2 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -8922,15 +8922,13 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
> ret = btrfs_lookup_extent_info(trans, root, bytenr, level - 1, 1,
> &wc->refs[level - 1],
> &wc->flags[level - 1]);
> - if (ret < 0) {
> - btrfs_tree_unlock(next);
> - free_extent_buffer(next);
> - return ret;
> - }
> + if (ret < 0)
> + goto out_unlock;
>
> if (unlikely(wc->refs[level - 1] == 0)) {
> btrfs_err(root->fs_info, "Missing references.");
> - BUG();
> + ret = -EIO;
> + goto out_unlock;
> }
> *lookup_info = 0;
>
> @@ -8982,7 +8980,12 @@ 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)) {
> + btrfs_err(root->fs_info, "mismatched level");
> + ret = -EIO;
> + goto out_unlock;
> + }
> path->nodes[level] = next;
> path->slots[level] = 0;
> path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
> @@ -8997,8 +9000,15 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
> 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])) {
> + btrfs_err(root->fs_info,
> + "mismatched block owner");
> + ret = -EIO;
> + goto out_unlock;
> + }
> parent = 0;
> }
>
> @@ -9013,12 +9023,18 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
> }
> ret = btrfs_free_extent(trans, root, bytenr, blocksize, parent,
> root->root_key.objectid, level - 1, 0);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret)
> + goto out_unlock;
> }
> +
> + *lookup_info = 1;
> + ret = 1;
> +
> +out_unlock:
> btrfs_tree_unlock(next);
> free_extent_buffer(next);
> - *lookup_info = 1;
> - return 1;
> +
> + return ret;
> }
>
> /*
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Thanks,
-liubo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-23 18:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-22 15:08 [PATCH] Btrfs: don't BUG() during drop snapshot David Sterba
2016-09-22 18:03 ` Liu Bo
2016-09-23 11:23 ` [PATCH v2] " David Sterba
2016-09-23 18:01 ` Liu Bo
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).