Some leaked root fixes
v3 cover Some leaked root fixes
v2->v3:
- Reworked the pretty print for roots so it's a little cleaner, also made it so only reloc roots spit out the offset, since that's the only time we care.
- Added Nikolay's reviewed-by for the first patch.
--- Original email ---
Hello,
These are two fixes for a leaked root problem I noticed a while ago. One is the actual leaked root fix, the other is to add a pretty print for the leaked root message, as figuring out that some giant %llu number was the data reloc root is not a feat meant for humans. Thanks,
Josef
Josef Bacik (2):
btrfs: free fs roots on failed mount
btrfs: pretty print leaked root name
fs/btrfs/disk-io.c | 8 ++++++-- fs/btrfs/print-tree.c | 39 +++++++++++++++++++++++++++++++++++++++ fs/btrfs/print-tree.h | 3 +++ 3 files changed, 48 insertions(+), 2 deletions(-)
Signature · 1 line
2.24.1
PATCH v3 1/2 btrfs: free fs roots on failed mount
While testing a weird problem with -o degraded, I noticed I was getting leaked root errors
BTRFS warning (device loop0): writable mount is not allowed due to too many missing devices BTRFS error (device loop0): open_ctree failed
BTRFS error (device loop0): leaked root -9-0 refcount 1
This is the DATA_RELOC root, which gets read before the other fs roots, but is included in the fs roots radix tree. Handle this by adding a btrfs_drop_and_free_fs_root() on the data reloc root if it exists. This is ok to do here if we fail further up because we will only drop the ref if we delete the root from the radix tree, and all other cleanup won't be duplicated.
--- fs/btrfs/disk-io.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/disk-io.c +2 -0
@@ -3415,6 +3415,8 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devicebtrfs_put_block_group_cache (fs_info); fail_tree_roots: +if (fs_info->data_reloc_root) +btrfs_drop_and_free_fs_root (fs_info, fs_info->data_reloc_root);free_root_pointers (fs_info, true);invalidate_inode_pages2 (fs_info->btree_inode->i_mapping);
Signature · 1 line
2.24.1
Re: [PATCH 1/2] btrfs: free fs roots on failed mount
Quoted 14 lines · Josef Bacik
While testing a weird problem with -o degraded, I noticed I was getting leaked root errors
BTRFS warning (device loop0): writable mount is not allowed due to too many missing devices BTRFS error (device loop0):
open_ctreefailed
BTRFS error (device loop0): leaked root -9-0 refcount 1This is the
DATA_RELOCroot, which gets read before the other fs roots, but is included in the fs roots radix tree. Handle this by adding abtrfs_drop_and_free_fs_root()on the data reloc root if it exists. This is ok to do here if we fail further up because we will only drop the ref if we delete the root from the radix tree, and all other cleanup won't be duplicated.
Quoted 2 lines
Reviewed-by Nikolay Borisov <[email protected]>Signed-off-by Josef Bacik <[email protected]>
I'll add this to misc-next as this is the fix and does not need to wait on the root pretty printing.
PATCH v3 2/2 btrfs: pretty print leaked root name
In reply to Josef BacikI'm a actual human being so am incapable of converting u64 to s64 in my head, so add a helper to get the pretty name of a root objectid and use that helper to spit out the name for any special roots for leaked roots, so I don't have to scratch my head and figure out which root I messed up the refs for.
--- fs/btrfs/disk-io.c | 6 ++++-- fs/btrfs/print-tree.c | 39 +++++++++++++++++++++++++++++++++++++++ fs/btrfs/print-tree.h | 3 +++ 3 files changed, 46 insertions(+), 2 deletions(-)
fs/btrfs/disk-io.c +4 -2
@@ -1504,10 +1504,12 @@ void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info)struct btrfs_root *root;while (!list_empty (&fs_info->allocated_roots)) { +char buf[BTRFS_ROOT_NAME_BUF_LEN ]; + root =list_first_entry (&fs_info->allocated_roots, struct btrfs_root, leak_list); -btrfs_err (fs_info,"leaked root %llu-%llu refcount %d" , - root->root_key.objectid, root->root_key.offset, +btrfs_err (fs_info,"leaked root %s refcount %d" , +btrfs_root_name (root->root_key.objectid, buf),refcount_read (&root->refs));while (refcount_read (&root->refs) >1 )btrfs_put_root (root);
fs/btrfs/print-tree.c +39 -0
@@ -7,6 +7,45 @@#include "disk-io.h" #include "print-tree.h" +struct name_map { +u64 id; +char *name; +}; + +static const struct name_map root_map[] = { + {BTRFS_ROOT_TREE_OBJECTID ,"ROOT_TREE" }, + {BTRFS_EXTENT_TREE_OBJECTID ,"EXTENT_TREE" }, + {BTRFS_CHUNK_TREE_OBJECTID ,"CHUNK_TREE" }, + {BTRFS_DEV_TREE_OBJECTID ,"DEV_TREE" }, + {BTRFS_FS_TREE_OBJECTID ,"FS_TREE" }, + {BTRFS_ROOT_TREE_DIR_OBJECTID ,"ROOT_TREE_DIR" }, + {BTRFS_CSUM_TREE_OBJECTID ,"CSUM_TREE" }, + {BTRFS_TREE_LOG_OBJECTID ,"TREE_LOG" }, + {BTRFS_QUOTA_TREE_OBJECTID ,"QUOTA_TREE" }, + {BTRFS_UUID_TREE_OBJECTID ,"UUID_TREE" }, + {BTRFS_FREE_SPACE_TREE_OBJECTID ,"FREE_SPACE_TREE" }, + {BTRFS_DATA_RELOC_TREE_OBJECTID ,"DATA_RELOC_TREE" }, +}; + +char *btrfs_root_name (u64 objectid,char *buf) +{ +int i; + +if (objectid ==BTRFS_TREE_RELOC_OBJECTID ) { +snprintf (buf,BTRFS_ROOT_NAME_BUF_LEN , +"TREE_RELOC offset=%llu" , objectid); +return buf; + } + +for (i =0 ; i <ARRAY_SIZE (root_map); i++) { +if (root_map[i].id == objectid) +return root_map[i].name; + } + +snprintf (buf,BTRFS_ROOT_NAME_BUF_LEN ,"%llu" , objectid); +return buf; +} +static void print_chunk (struct extent_buffer *eb,struct btrfs_chunk *chunk) {int num_stripes =btrfs_chunk_num_stripes (eb, chunk);
fs/btrfs/print-tree.h +3 -0
@@ -6,7 +6,10 @@#ifndef BTRFS_PRINT_TREE_H #define BTRFS_PRINT_TREE_H +#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); +char *btrfs_root_name (u64 objectid,char *buf);#endif
Signature · 1 line
2.24.1
Re: [PATCH 2/2] btrfs: pretty print leaked root name
Quoted 37 lines · Josef Bacik
I'm a actual human being so am incapable of converting u64 to s64 in my head, so add a helper to get the pretty name of a root objectid and use that helper to spit out the name for any special roots for leaked roots, so I don't have to scratch my head and figure out which root I messed up the refs for.
Signed-off-by Josef Bacik <[email protected]>--- fs/btrfs/disk-io.c | 6 ++++-- fs/btrfs/print-tree.c | 39 +++++++++++++++++++++++++++++++++++++++ fs/btrfs/print-tree.h | 3 +++ 3 files changed, 46 insertions(+), 2 deletions(-)fs/btrfs/disk-io.c +4
-2@@ -1504,10 +1504,12 @@ void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info)struct btrfs_root *root;while (!list_empty (&fs_info->allocated_roots)) { +char buf[BTRFS_ROOT_NAME_BUF_LEN ]; + root =list_first_entry (&fs_info->allocated_roots, struct btrfs_root, leak_list); -btrfs_err (fs_info,"leaked root %llu-%llu refcount %d" , - root->root_key.objectid, root->root_key.offset, +btrfs_err (fs_info,"leaked root %s refcount %d" , +btrfs_root_name (root->root_key.objectid, buf),refcount_read (&root->refs));while (refcount_read (&root->refs) >1 )btrfs_put_root (root);fs/btrfs/print-tree.c +0
-0
fs/btrfs/print-tree.c line 12
Quoted 6 lines
fs/btrfs/print-tree.c +3
-0@@ -7,6 +7,45 @@#include "disk-io.h" #include "print-tree.h" +struct name_map { +u64 id; +char *name;
const char* or maybe even a fixed length string, removing the _TREE suffix
fs/btrfs/print-tree.c line 21
Quoted 9 lines
fs/btrfs/print-tree.c +9
-0+}; + +static const struct name_map root_map[] = { + {BTRFS_ROOT_TREE_OBJECTID ,"ROOT_TREE" }, + {BTRFS_EXTENT_TREE_OBJECTID ,"EXTENT_TREE" }, + {BTRFS_CHUNK_TREE_OBJECTID ,"CHUNK_TREE" }, + {BTRFS_DEV_TREE_OBJECTID ,"DEV_TREE" }, + {BTRFS_FS_TREE_OBJECTID ,"FS_TREE" }, + {BTRFS_ROOT_TREE_DIR_OBJECTID ,"ROOT_TREE_DIR" },
This is not a tree id
fs/btrfs/print-tree.c line 27
Quoted 6 lines
fs/btrfs/print-tree.c +6
-0+ { BTRFS_CSUM_TREE_OBJECTID, "CSUM_TREE" }, + { BTRFS_TREE_LOG_OBJECTID, "TREE_LOG" }, + { BTRFS_QUOTA_TREE_OBJECTID, "QUOTA_TREE" }, + { BTRFS_UUID_TREE_OBJECTID, "UUID_TREE" }, + { BTRFS_FREE_SPACE_TREE_OBJECTID, "FREE_SPACE_TREE" }, + { BTRFS_DATA_RELOC_TREE_OBJECTID, "DATA_RELOC_TREE" },
I've noticed we have the id -> str mapping already in btrfs_lockdep_keysets, so there could be just one such structure and we'd add wrappers around that.
Also the C99 initializers should be used.
fs/btrfs/print-tree.c line 36
Quoted 9 lines
fs/btrfs/print-tree.c +9
-0+}; + +char *btrfs_root_name (u64 objectid,char *buf) +{ +int i; + +if (objectid ==BTRFS_TREE_RELOC_OBJECTID ) { +snprintf (buf,BTRFS_ROOT_NAME_BUF_LEN , +"TREE_RELOC offset=%llu" , objectid);
The reloc tree is an outlier here so I wonder if we'd rather have a nice pretty printer of the tree root name and deal with the oddities where required rather than inside the helper. In this case there would have to be some conditionals in btrfs_check_leaked_roots, as we can't do that in the format string.
Re: [PATCH 2/2] btrfs: pretty print leaked root name
Quoted 39 lines · David Sterba
fs/btrfs/print-tree.c line 12
Quoted 9 lines · Josef Bacik
fs/btrfs/print-tree.c +3
-0@@ -7,6 +7,45 @@#include "disk-io.h" #include "print-tree.h" +struct name_map { +u64 id; +char *name;const char* or maybe even a fixed length string, removing the
_TREEsuffixfs/btrfs/print-tree.c line 21
Quoted 9 lines
fs/btrfs/print-tree.c +9
-0+}; + +static const struct name_map root_map[] = { + {BTRFS_ROOT_TREE_OBJECTID ,"ROOT_TREE" }, + {BTRFS_EXTENT_TREE_OBJECTID ,"EXTENT_TREE" }, + {BTRFS_CHUNK_TREE_OBJECTID ,"CHUNK_TREE" }, + {BTRFS_DEV_TREE_OBJECTID ,"DEV_TREE" }, + {BTRFS_FS_TREE_OBJECTID ,"FS_TREE" }, + {BTRFS_ROOT_TREE_DIR_OBJECTID ,"ROOT_TREE_DIR" },This is not a tree id
fs/btrfs/print-tree.c line 27
Quoted 6 lines
fs/btrfs/print-tree.c +6
-0+ { BTRFS_CSUM_TREE_OBJECTID, "CSUM_TREE" }, + { BTRFS_TREE_LOG_OBJECTID, "TREE_LOG" }, + { BTRFS_QUOTA_TREE_OBJECTID, "QUOTA_TREE" }, + { BTRFS_UUID_TREE_OBJECTID, "UUID_TREE" }, + { BTRFS_FREE_SPACE_TREE_OBJECTID, "FREE_SPACE_TREE" }, + { BTRFS_DATA_RELOC_TREE_OBJECTID, "DATA_RELOC_TREE" },I've noticed we have the id -> str mapping already in
btrfs_lockdep_keysets, so there could be just one such structure and we'd add wrappers around that.Also the C99 initializers should be used.
Quoted 15 lines
fs/btrfs/print-tree.c line 36
Quoted 9 lines
fs/btrfs/print-tree.c +9
-0+}; + +char *btrfs_root_name (u64 objectid,char *buf) +{ +int i; + +if (objectid ==BTRFS_TREE_RELOC_OBJECTID ) { +snprintf (buf,BTRFS_ROOT_NAME_BUF_LEN , +"TREE_RELOC offset=%llu" , objectid);The reloc tree is an outlier here so I wonder if we'd rather have a nice pretty printer of the tree root name and deal with the oddities where required rather than inside the helper. In this case there would have to be some conditionals in
btrfs_check_leaked_roots, as we can't do that in the format string.
I had another thought, we want a pretty printer, the above still holds but needs more restructuring so let's take this. I'll do the fixups and add it to misc-next.