Skip to contentSkip to conversation

btrfs: ctree: Dump the leaf before BUG_ON()

PATCH Superseded Qu Wenruo 2 participants 2 messages Apr 24, 2019 Btrfs file system

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH v2 1/1 btrfs: ctree: Dump the leaf before BUG_ON()

We have a user reporting BUG_ON() triggered in
btrfs_set_item_key_safe().

Let's dump the leaf content before triggering BUG_ON() so that we can have some clue on what's going wrong.
The output of tree locks should help us to debug such problem.

---
changelog:
v2:
- Also dump the slot/disk_key/new_key.

---
 fs/btrfs/ctree.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +22 -2
index f52eb952597b..61e6e2a23a8a 100644
@@ -3185,11 +3185,31 @@ void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info,
 	slot = path->slots[0];
 	if (slot > 0) {
 		btrfs_item_key(eb, &disk_key, slot - 1);
-		BUG_ON(comp_keys(&disk_key, new_key) >= 0);
+		if (unlikely(comp_keys(&disk_key, new_key) >= 0)) {
+			btrfs_crit(fs_info,
+		"on-disk slot %u key (%llu, %u, %llu) new key (%llu %u %llu)",
+				   slot, btrfs_disk_key_objectid(&disk_key),
+				   btrfs_disk_key_type(&disk_key),
+				   btrfs_disk_key_offset(&disk_key),
+				   new_key->objectid, new_key->type,
+				   new_key->offset);
+			btrfs_print_leaf(eb);
+			BUG_ON(1);
+		}
 	}
 	if (slot < btrfs_header_nritems(eb) - 1) {
 		btrfs_item_key(eb, &disk_key, slot + 1);
-		BUG_ON(comp_keys(&disk_key, new_key) <= 0);
+		if (unlikely(comp_keys(&disk_key, new_key) <= 0)) {
+			btrfs_crit(fs_info,
+		"on-disk slot %u key (%llu, %u, %llu) new key (%llu %u %llu)",
+				   slot, btrfs_disk_key_objectid(&disk_key),
+				   btrfs_disk_key_type(&disk_key),
+				   btrfs_disk_key_offset(&disk_key),
+				   new_key->objectid, new_key->type,
+				   new_key->offset);
+			btrfs_print_leaf(eb);
+			BUG_ON(1);
+		}
 	}
 
 	btrfs_cpu_key_to_disk(&disk_key, new_key);
Signature · 1 line
2.21.0
#1 lore raw
Quoted 22 lines · Qu Wenruo

We have a user reporting BUG_ON() triggered in
btrfs_set_item_key_safe().

Let's dump the leaf content before triggering BUG_ON() so that we can have some clue on what's going wrong.
The output of tree locks should help us to debug such problem.

---
changelog:
v2:
- Also dump the slot/disk_key/new_key.

---
 fs/btrfs/ctree.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +0 -0
index f52eb952597b..61e6e2a23a8a 100644

fs/btrfs/ctree.c void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info, · line 3190

Quoted 7 lines
fs/btrfs/ctree.c +3 -1
@@ -3185,11 +3185,31 @@ void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info,
        slot = path->slots[0];
        if (slot > 0) {
                btrfs_item_key(eb, &disk_key, slot - 1);
-               BUG_ON(comp_keys(&disk_key, new_key) >= 0);
+               if (unlikely(comp_keys(&disk_key, new_key) >= 0)) {
+                       btrfs_crit(fs_info,
+               "on-disk slot %u key (%llu, %u, %llu) new key (%llu %u %llu)",

On-disk? Not necessarily, the leaf might have been changed multiple times after the last time it was persisted to disk.
I would remove that.

Also remove the commas after each element of key, just like you do for new key (which is the prevalent style we have).

fs/btrfs/ctree.c void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info, · line 3197

Quoted 7 lines
fs/btrfs/ctree.c +7 -0
+                                  slot, btrfs_disk_key_objectid(&disk_key),
+                                  btrfs_disk_key_type(&disk_key),
+                                  btrfs_disk_key_offset(&disk_key),
+                                  new_key->objectid, new_key->type,
+                                  new_key->offset);
+                       btrfs_print_leaf(eb);
+                       BUG_ON(1);

Use BUG(); instead please, see
https://lore.kernel.org/linux-btrfs/[email protected]/

fs/btrfs/ctree.c void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info, · line 3204

Quoted 8 lines
fs/btrfs/ctree.c +4 -1
+               }
        }
        if (slot < btrfs_header_nritems(eb) - 1) {
                btrfs_item_key(eb, &disk_key, slot + 1);
-               BUG_ON(comp_keys(&disk_key, new_key) <= 0);
+               if (unlikely(comp_keys(&disk_key, new_key) <= 0)) {
+                       btrfs_crit(fs_info,
+               "on-disk slot %u key (%llu, %u, %llu) new key (%llu %u %llu)",

Same here.

fs/btrfs/ctree.c void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info, · line 3197

Quoted 7 lines
fs/btrfs/ctree.c +7 -0
+                                  slot, btrfs_disk_key_objectid(&disk_key),
+                                  btrfs_disk_key_type(&disk_key),
+                                  btrfs_disk_key_offset(&disk_key),
+                                  new_key->objectid, new_key->type,
+                                  new_key->offset);
+                       btrfs_print_leaf(eb);
+                       BUG_ON(1);

Same here.

Other then that, it looks ok to me and you can add Reviewed-by:
[email protected]

Thanks.

Quoted 7 lines
fs/btrfs/ctree.c +1 -1
+               }
        }
 
        btrfs_cpu_key_to_disk(&disk_key, new_key);
--

2.21.0

Signature · 3 lines
Filipe David Manana,

“Whether you think you can, or you think you can't — you're right.”