btrfs: small improvement to leaf dump
cover btrfs: small improvement to leaf dump
The first patch is just constify the tree dump infrastructure, exposed during the development.
The second patch is the main dish, inspired by a report that turns out to be bitflip in extent tree.
However the leaf dump in dmesg is pretty large (100+ slots), needs to manually search the leaf using the bytenr from the error messages.
Thus if we can output the slot number, it would be much easier to locate the problem, just like what we did in tree-checker.
Qu Wenruo (2):
btrfs: print-tree: accept const extent buffer pointer
btrfs: improve leaf dump and error handling
fs/btrfs/ctree.c | 8 +-- fs/btrfs/ctree.h | 2 +- fs/btrfs/extent-tree.c | 125 +++++++++++++++++++---------------------- fs/btrfs/print-tree.c | 16 +++--- fs/btrfs/print-tree.h | 4 +- 5 files changed, 73 insertions(+), 82 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/2 btrfs: print-tree: accept const extent buffer pointer
Since print-tree infrastructure only prints the content of a tree block, we can make them to accept const extent buffer pointer.
This removes a forced type convert in extent-tree, where we convert a const extent buffer pointer to regular one, just to avoid compiler warning.
--- fs/btrfs/ctree.c | 4 ++-- fs/btrfs/ctree.h | 2 +- fs/btrfs/extent-tree.c | 2 +- fs/btrfs/print-tree.c | 16 ++++++++-------- fs/btrfs/print-tree.h | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-)
fs/btrfs/ctree.c +2 -2
@@ -3073,7 +3073,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,* and nr indicate which items in the leaf to check. This totals up the * space used both by the item structs and the item data */ -static int leaf_space_used (struct extent_buffer *l,int start,int nr) +static int leaf_space_used (const struct extent_buffer *l,int start,int nr) {int data_len;int nritems =btrfs_header_nritems (l);
@@ -3093,7 +3093,7 @@ static int leaf_space_used(struct extent_buffer *l, int start, int nr)* the start of the leaf data. IOW, how much room * the leaf has left for both items and data */ -noinline int btrfs_leaf_free_space(struct extent_buffer *leaf) +int btrfs_leaf_free_space (const struct extent_buffer *leaf) {struct btrfs_fs_info *fs_info = leaf->fs_info;int nritems =btrfs_header_nritems (leaf);
fs/btrfs/ctree.h +1 -1
@@ -685,7 +685,7 @@ static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p) {return btrfs_next_old_item (root, p,0 ); } -int btrfs_leaf_free_space (struct extent_buffer *leaf); +int btrfs_leaf_free_space (const struct extent_buffer *leaf);static inline int is_fstree (u64 rootid) {
fs/btrfs/extent-tree.c +1 -1
@@ -402,7 +402,7 @@ int btrfs_get_extent_inline_ref_type(const struct extent_buffer *eb, } } -btrfs_print_leaf ((struct extent_buffer *)eb); +btrfs_print_leaf (eb);btrfs_err (eb->fs_info,"eb %llu iref 0x%lx invalid extent inline ref type %d" , eb->start, (unsigned long )iref, type);
fs/btrfs/print-tree.c +8 -8
@@ -49,7 +49,7 @@ const char *btrfs_root_name(const struct btrfs_key *key, char *buf)return buf; } -static void print_chunk (struct extent_buffer *eb,struct btrfs_chunk *chunk) +static void print_chunk (const struct extent_buffer *eb,struct btrfs_chunk *chunk) {int num_stripes =btrfs_chunk_num_stripes (eb, chunk);int i;
@@ -62,7 +62,7 @@ static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk) btrfs_stripe_offset_nr(eb, chunk, i)); } } -static void print_dev_item (struct extent_buffer *eb, +static void print_dev_item (const struct extent_buffer *eb,struct btrfs_dev_item *dev_item) { pr_info("\t\tdev item devid %llu total_bytes %llu bytes used %llu\n",
@@ -70,7 +70,7 @@ static void print_dev_item(struct extent_buffer *eb,btrfs_device_total_bytes (eb, dev_item), btrfs_device_bytes_used(eb, dev_item)); } -static void print_extent_data_ref (struct extent_buffer *eb, +static void print_extent_data_ref (const struct extent_buffer *eb,struct btrfs_extent_data_ref *ref) { pr_cont("extent data backref root %llu objectid %llu offset %llu count %u\n",
@@ -80,7 +80,7 @@ static void print_extent_data_ref(struct extent_buffer *eb, btrfs_extent_data_ref_count(eb, ref)); } -static void print_extent_item (struct extent_buffer *eb,int slot,int type) +static void print_extent_item (const struct extent_buffer *eb,int slot,int type) {struct btrfs_extent_item *ei;struct btrfs_extent_inline_ref *iref;
@@ -169,7 +169,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)WARN_ON (ptr > end); } -static void print_uuid_item (struct extent_buffer *l,unsigned long offset, +static void print_uuid_item (const struct extent_buffer *l,unsigned long offset,u32 item_size) {if (!IS_ALIGNED (item_size,sizeof (u64))) {
@@ -191,7 +191,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset,* Helper to output refs and locking status of extent buffer. Useful to debug * race condition related problems. */ -static void print_eb_refs_lock (struct extent_buffer *eb) +static void print_eb_refs_lock (const struct extent_buffer *eb) {#ifdef CONFIG_BTRFS_DEBUG btrfs_info(eb->fs_info, "refs %u lock_owner %u current %u",
@@ -199,7 +199,7 @@ static void print_eb_refs_lock(struct extent_buffer *eb)#endif } -void btrfs_print_leaf (struct extent_buffer *l) +void btrfs_print_leaf (const struct extent_buffer *l) {struct btrfs_fs_info *fs_info;int i;
@@ -355,7 +355,7 @@ void btrfs_print_leaf(struct extent_buffer *l) } } -void btrfs_print_tree (struct extent_buffer *c,bool follow) +void btrfs_print_tree (const struct extent_buffer *c,bool follow) {struct btrfs_fs_info *fs_info;int i;u32 nr;
fs/btrfs/print-tree.h +2 -2
@@ -9,8 +9,8 @@/* Buffer size to contain tree name and possibly additional data (offset) */ #define BTRFS_ROOT_NAME_BUF_LEN 48 -void btrfs_print_leaf (struct extent_buffer *l); -void btrfs_print_tree (struct extent_buffer *c,bool follow); +void btrfs_print_leaf (const struct extent_buffer *l); +void btrfs_print_tree (const struct extent_buffer *c,bool follow);const char *btrfs_root_name (const struct btrfs_key *key,char *buf);#endif
Signature · 1 line
2.39.2
PATCH 2/2 btrfs: improve leaf dump and error handling
In reply to Qu WenruoImprove the leaf dump behavior by:
- Always dump the leaf first, then the error message
- Output the slot number if possible
Especially in __btrfs_free_extent() the leaf dump of extent tree can be pretty large.
With an extra slot number it's much easier to locate the problem.
--- fs/btrfs/ctree.c | 4 +- fs/btrfs/extent-tree.c | 123 +++++++++++++++++++---------------------- 2 files changed, 59 insertions(+), 68 deletions(-)
fs/btrfs/ctree.c +2 -2
@@ -2633,6 +2633,7 @@ void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info,if (slot >0 ) {btrfs_item_key (eb, &disk_key, slot -1 );if (unlikely (comp_keys (&disk_key, new_key) >=0 )) { +btrfs_print_leaf (eb); btrfs_crit(fs_info, "slot %u key (%llu %u %llu) new key (%llu %u %llu)", slot, btrfs_disk_key_objectid(&disk_key),
@@ -2640,13 +2641,13 @@ void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info,btrfs_disk_key_offset (&disk_key), new_key->objectid, new_key->type, new_key->offset); -btrfs_print_leaf (eb);BUG (); } }if (slot <btrfs_header_nritems (eb) -1 ) {btrfs_item_key (eb, &disk_key, slot +1 );if (unlikely (comp_keys (&disk_key, new_key) <=0 )) { +btrfs_print_leaf (eb); btrfs_crit(fs_info, "slot %u key (%llu %u %llu) new key (%llu %u %llu)", slot, btrfs_disk_key_objectid(&disk_key),
@@ -2654,7 +2655,6 @@ void btrfs_set_item_key_safe(struct btrfs_fs_info *fs_info,btrfs_disk_key_offset (&disk_key), new_key->objectid, new_key->type, new_key->offset); -btrfs_print_leaf (eb);BUG (); } }
fs/btrfs/extent-tree.c +57 -66
196 lines not on this page · raw message
Signature · 1 line
2.39.2
Quoted 8 lines · Qu Wenruo
The first patch is just constify the tree dump infrastructure, exposed during the development.
The second patch is the main dish, inspired by a report that turns out to be bitflip in extent tree.
However the leaf dump in dmesg is pretty large (100+ slots), needs to manually search the leaf using the bytenr from the error messages.
Quoted 6 lines
Thus if we can output the slot number, it would be much easier to locate the problem, just like what we did in tree-checker.
Qu Wenruo (2):
btrfs: print-tree: accept const extent buffer pointer
btrfs: improve leaf dump and error handling
Added to misc-next, thanks.