On Mon, Oct 17, 2016 at 05:35:14PM -0700, Divya Indi wrote: > Add a new subcommand to btrfs inspect-internal > > btrfs inspect-internal bg_analysis <path> > Gives information about all the block groups.
The sample output from the cover letter should also go here (or just here). Below are some comments, but overall, I think the block group dumping should be more advanced than just what this patch does. It's a good start, but given the rich structure of the blockgroups and chunks, I'd rather see the basics done right from the beginning. The blockgroups and chunks can be viewed in a logical or physical way. I've sent a patch some time agou, that dumps the physical structure, but got reminded that the balance analysis is more interesting on the logical level. Ideally I'd like to keep both ways to show the information. The physical way is easier, just iterate the device extents and print start, lenght etc. The logical is more tricky as it's a tree structure, when one logical chunk could comprised of several physical chunks. And this must reflect all current raid profiles, where we're mixing mirorring and striping, and chunks of special kind (parity). Now, I'm not asking you to implement all of that, but I want to make sure that code that touches the area of interest does not block further extensions. I understand that you want to add the ability to optimize the balance. > Signed-off-by: Divya Indi <divya.i...@oracle.com> > Reviewed-by: Ashish Samant <ashish.sam...@oracle.com> > Reviewed-by: Liu Bo <bo.li....@oracle.com> > --- > cmds-inspect.c | 114 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 114 insertions(+), 0 deletions(-) > > diff --git a/cmds-inspect.c b/cmds-inspect.c > index f435ea9..0e2f15a 100644 > --- a/cmds-inspect.c > +++ b/cmds-inspect.c > @@ -147,6 +147,118 @@ static int get_bg_info(int fd, struct > btrfs_ioctl_search_args *bg_args, > } > return ret; > } > + > +static const char * const cmd_inspect_bg_analysis_usage[] = { > + "btrfs inspect-internal bg_analysis <path> ", > + "Get information about all block groups", > + "", > + "", > + NULL > +}; > + > +static int cmd_inspect_bg_analysis(int argc, char **argv) > +{ > + struct btrfs_ioctl_search_args args; > + struct btrfs_ioctl_search_args bg_args; > + struct btrfs_ioctl_search_header *header; > + struct btrfs_ioctl_search_header *bg_header; > + struct btrfs_ioctl_search_key *sk; > + struct btrfs_ioctl_search_key *bg_sk; > + struct btrfs_block_group_item *bg; > + struct btrfs_chunk *chunk; > + unsigned long off = 0; > + unsigned long bg_off = 0; > + DIR *dirstream = NULL; > + int fd; > + int i; > + int ret = 0; > + u64 used; > + u64 flags; > + char bg_type[32] = {0}; > + > + if (check_argc_exact(argc, 2)) > + usage(cmd_inspect_bg_analysis_usage); > + > + fd = btrfs_open_dir(argv[optind], &dirstream, 1); > + if (fd < 0) > + return 1; > + > + memset(&args, 0, sizeof(args)); > + sk = &args.key; > + sk->min_offset = sk->min_transid = 0; > + sk->max_offset = sk->max_transid = (u64)-1; > + printf("%20s%20s%20s%20s\n", "Type", "Start", "Len", "Used"); > + while (1) { > + > + /* Walk through the chunk tree and retrieve all the chunks */ > + ret = get_chunks(fd, &args); > + if (ret < 0) > + goto out; > + > + /* > + * it should not happen. > + */ > + if (sk->nr_items == 0) > + break; So is this an error condition? If yes, then it should be handled. > + > + off = 0; > + memset(&bg_args, 0, sizeof(bg_args)); > + bg_sk = &bg_args.key; > + > + bg_sk->tree_id = BTRFS_EXTENT_TREE_OBJECTID; > + bg_sk->min_type = BTRFS_BLOCK_GROUP_ITEM_KEY; > + bg_sk->max_type = BTRFS_BLOCK_GROUP_ITEM_KEY; > + bg_sk->min_transid = 0; > + bg_sk->max_transid = (u64)-1; > + > + for (i = 0; i < sk->nr_items; i++) { > + header = (struct btrfs_ioctl_search_header *)(args.buf > + + off); > + off += sizeof(*header); > + if (header->type == BTRFS_CHUNK_ITEM_KEY) { > + chunk = (struct btrfs_chunk *) > + (args.buf + off); > + > + /* For every chunk lookup an exact match(bg) in > + * the extent tree and read its used values */ Comment formatting > + ret = get_bg_info(fd, &bg_args, header->offset, > + chunk->length); > + if (ret < 0) > + goto out; > + > + /* > + * it should not happen. > + */ > + if (bg_sk->nr_items == 0) > + continue; > + > + bg_off = 0; > + bg_header = (struct btrfs_ioctl_search_header *) > + (bg_args.buf + bg_off); > + bg_off += sizeof(*bg_header); > + bg = (struct btrfs_block_group_item *) > + (bg_args.buf + bg_off); > + > + used = btrfs_block_group_used(bg); > + memset(&bg_type, 0, 32); This should be sizeof(bg_type), no? > + flags = btrfs_block_group_flags(bg); > + bg_flags_to_str(flags, bg_type); > + printf("%20s%20llu%20s%20s\n", > + bg_type, > + bg_header->objectid, > + pretty_size(bg_header->offset), > + pretty_size(used)); > + } > + off += header->len; > + sk->min_offset = header->offset + header->len; > + } > + sk->nr_items = 4096; Better put that right before the search ioctls. > + } > +out: > + close_file_or_dir(fd, dirstream); > + return ret; > +} > + > static const char * const cmd_inspect_inode_resolve_usage[] = { > "btrfs inspect-internal inode-resolve [-v] <inode> <path>", > "Get file system paths for the given inode", > @@ -702,6 +814,8 @@ const struct cmd_group inspect_cmd_group = { > 0 }, > { "min-dev-size", cmd_inspect_min_dev_size, > cmd_inspect_min_dev_size_usage, NULL, 0 }, > + { "bg_analysis", cmd_inspect_bg_analysis, > + cmd_inspect_bg_analysis_usage, NULL, 0 }, > { "dump-tree", cmd_inspect_dump_tree, > cmd_inspect_dump_tree_usage, NULL, 0 }, > { "dump-super", cmd_inspect_dump_super, > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html