Skip to contentSkip to conversation

btrfs-progs: Support for BG_TREE feature

PATCH Superseded Qu Wenruo 3 participants 9 messages Dec 28, 2018 – Feb 26, 2019 Btrfs file system

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

cover btrfs-progs: Support for BG_TREE feature

This patchset can be fetched from github:
https://github.com/adam900710/btrfs-progs/tree/bg_tree
The basis commit is:

commit 7d16a2b460182ee98c649533a6975b6e419c3d71

Author: Qu Wenruo <[email protected]>
Date:   Thu Dec 27 13:49:18 2018 +0800

btrfs-progs: Create uuid tree with proper contents

Which is further based on devel branch.

This patchset provides the needed user space infrastructure for BG_TREE feature.

Since it's an new exclusive feature, unlike SKINNY_METADATA, btrfs-progs is needed to convert existing fs (unmounted) to new format.

Although I have prepared the functionality, convert_to_bg_tree(), and already uses it in mkfs, I haven't decided if I should put it under btrfstune, as btrfstune isn't such offline convert tool.

If anyone has better idea on the new convert tool interface, I'm all ears.

For the performance improvement, please check the kernel patchset cover letter or the last patch.
(SPOILER ALERT: It's super fast)

Qu Wenruo (6):
btrfs-progs: Refactor excluded extent functions to use fs_info
btrfs-progs: Refactor btrfs_read_block_groups()
btrfs-progs: Enable read-write ability for 'bg_tree' feature
btrfs-progs: mkfs: Introduce -O bg-tree
btrfs-progs: dump-tree/dump-super: Introduce support for bg tree
btrfs-progs: check: Introduce support for bg-tree feature

 check/main.c              |   7 +-
 check/mode-lowmem.c       |   9 +-
 cmds-inspect-dump-super.c |   3 +-
 cmds-inspect-dump-tree.c  |   5 +
 ctree.h                   |  17 +-
 disk-io.c                 |  29 +++-
 extent-tree.c             | 326 +++++++++++++++++++++++++++-----------
 fsfeatures.c              |   6 +
 mkfs/common.c             |   7 +-
 mkfs/common.h             |   1 +
 mkfs/main.c               |  57 +++++++
 print-tree.c              |   3 +
 transaction.c             |   1 +
 13 files changed, 365 insertions(+), 106 deletions(-)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 1/6 btrfs-progs: Refactor excluded extent functions to use fs_info

The following functions are just using @root to reach fs_info:
- exclude_super_stripes
- free_excluded_extents
- add_excluded_extent

Refactor them to use fs_info directly.

---
 check/main.c  |  4 ++--
 ctree.h       |  4 ++--
 extent-tree.c | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)
check/main.c +2 -2
index eb6a4a50db98..54ab146d0d13 100644
@@ -5531,7 +5531,7 @@ static int check_space_cache(struct btrfs_root *root)
 		}
 
 		if (btrfs_fs_compat_ro(root->fs_info, FREE_SPACE_TREE)) {
-			ret = exclude_super_stripes(root, cache);
+			ret = exclude_super_stripes(root->fs_info, cache);
 			if (ret) {
 				errno = -ret;
 				fprintf(stderr,
@@ -5540,7 +5540,7 @@ static int check_space_cache(struct btrfs_root *root)
 				continue;
 			}
 			ret = load_free_space_tree(root->fs_info, cache);
-			free_excluded_extents(root, cache);
+			free_excluded_extents(root->fs_info, cache);
 			if (ret < 0) {
 				errno = -ret;
 				fprintf(stderr,
ctree.h +2 -2
index 6a10e5994a6b..7f332161de1d 100644
@@ -2557,9 +2557,9 @@ int btrfs_record_file_extent(struct btrfs_trans_handle *trans,
 			      u64 num_bytes);
 int btrfs_free_block_group(struct btrfs_trans_handle *trans,
 			   struct btrfs_fs_info *fs_info, u64 bytenr, u64 len);
-void free_excluded_extents(struct btrfs_root *root,
+void free_excluded_extents(struct btrfs_fs_info *fs_info,
 			   struct btrfs_block_group_cache *cache);
-int exclude_super_stripes(struct btrfs_root *root,
+int exclude_super_stripes(struct btrfs_fs_info *fs_info,
 			  struct btrfs_block_group_cache *cache);
 u64 add_new_free_space(struct btrfs_block_group_cache *block_group,
 		       struct btrfs_fs_info *info, u64 start, u64 end);
extent-tree.c +10 -10
index 8c9cdeff3b02..2a8b278285e8 100644
@@ -3116,7 +3116,7 @@ int btrfs_read_block_groups(struct btrfs_root *root)
 		if (btrfs_chunk_readonly(info, cache->key.objectid))
 			cache->ro = 1;
 
-		exclude_super_stripes(root, cache);
+		exclude_super_stripes(info, cache);
 
 		ret = update_space_info(info, cache->flags, found_key.offset,
 					btrfs_block_group_used(&cache->item),
@@ -3160,7 +3160,7 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
 	cache->flags = type;
 	btrfs_set_block_group_flags(&cache->item, type);
 
-	exclude_super_stripes(fs_info->extent_root, cache);
+	exclude_super_stripes(fs_info, cache);
 	ret = update_space_info(fs_info, cache->flags, size, bytes_used,
 				&cache->space_info);
 	BUG_ON(ret);
@@ -3951,16 +3951,16 @@ int btrfs_record_file_extent(struct btrfs_trans_handle *trans,
 }
 
 
-static int add_excluded_extent(struct btrfs_root *root,
+static int add_excluded_extent(struct btrfs_fs_info *fs_info,
 			       u64 start, u64 num_bytes)
 {
 	u64 end = start + num_bytes - 1;
-	set_extent_bits(&root->fs_info->pinned_extents,
+	set_extent_bits(&fs_info->pinned_extents,
 			start, end, EXTENT_UPTODATE);
 	return 0;
 }
 
-void free_excluded_extents(struct btrfs_root *root,
+void free_excluded_extents(struct btrfs_fs_info *fs_info,
 			   struct btrfs_block_group_cache *cache)
 {
 	u64 start, end;
@@ -3968,11 +3968,11 @@ void free_excluded_extents(struct btrfs_root *root,
 	start = cache->key.objectid;
 	end = start + cache->key.offset - 1;
 
-	clear_extent_bits(&root->fs_info->pinned_extents,
+	clear_extent_bits(&fs_info->pinned_extents,
 			  start, end, EXTENT_UPTODATE);
 }
 
-int exclude_super_stripes(struct btrfs_root *root,
+int exclude_super_stripes(struct btrfs_fs_info *fs_info,
 			  struct btrfs_block_group_cache *cache)
 {
 	u64 bytenr;
@@ -3983,7 +3983,7 @@ int exclude_super_stripes(struct btrfs_root *root,
 	if (cache->key.objectid < BTRFS_SUPER_INFO_OFFSET) {
 		stripe_len = BTRFS_SUPER_INFO_OFFSET - cache->key.objectid;
 		cache->bytes_super += stripe_len;
-		ret = add_excluded_extent(root, cache->key.objectid,
+		ret = add_excluded_extent(fs_info, cache->key.objectid,
 					  stripe_len);
 		if (ret)
 			return ret;
@@ -3991,7 +3991,7 @@ int exclude_super_stripes(struct btrfs_root *root,
 
 	for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
 		bytenr = btrfs_sb_offset(i);
-		ret = btrfs_rmap_block(root->fs_info,
+		ret = btrfs_rmap_block(fs_info,
 				       cache->key.objectid, bytenr,
 				       &logical, &nr, &stripe_len);
 		if (ret)
@@ -4018,7 +4018,7 @@ int exclude_super_stripes(struct btrfs_root *root,
 			}
 
 			cache->bytes_super += len;
-			ret = add_excluded_extent(root, start, len);
+			ret = add_excluded_extent(fs_info, start, len);
 			if (ret) {
 				kfree(logical);
 				return ret;
Signature · 1 line
2.20.1
author
#2 lore raw

PATCH 2/6 btrfs-progs: Refactor btrfs_read_block_groups()

In reply to Qu Wenruo

This patch does the following refactor:
- Refactor parameter from @root to @fs_info

- Refactor the large loop body into another function Now we have a helper function, read_one_block_group(), to handle block group cache and space info related routine.

- Refactor the return value
Even we have the code handling ret > 0 from find_first_block_group(), it never works, as when there is no more block group, find_first_block_group() just return -ENOENT other than 1.

This is super confusing, it's almost a mircle it even works.

---
 ctree.h       |   2 +-
 disk-io.c     |   9 ++-
 extent-tree.c | 160 ++++++++++++++++++++++++++++----------------------
 3 files changed, 97 insertions(+), 74 deletions(-)
ctree.h +1 -1
index 7f332161de1d..1288324d1afe 100644
@@ -2539,7 +2539,7 @@ int btrfs_update_extent_ref(struct btrfs_trans_handle *trans,
 			    u64 owner_objectid);
 int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans);
 int btrfs_free_block_groups(struct btrfs_fs_info *info);
-int btrfs_read_block_groups(struct btrfs_root *root);
+int btrfs_read_block_groups(struct btrfs_fs_info *info);
 struct btrfs_block_group_cache *
 btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
 		      u64 chunk_offset, u64 size);
disk-io.c +6 -3
index 89e2d9d7e1c0..34fa6a7edc50 100644
@@ -943,14 +943,17 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
 	fs_info->last_trans_committed = generation;
 	if (extent_buffer_uptodate(fs_info->extent_root->node) &&
 	    !(flags & OPEN_CTREE_NO_BLOCK_GROUPS)) {
-		ret = btrfs_read_block_groups(fs_info->tree_root);
+		ret = btrfs_read_block_groups(fs_info);
 		/*
 		 * If we don't find any blockgroups (ENOENT) we're either
 		 * restoring or creating the filesystem, where it's expected,
 		 * anything else is error
 		 */
-		if (ret != -ENOENT)
-			return -EIO;
+		if (ret < 0 && ret != -ENOENT) {
+			errno = -ret;
+			error("failed to read block groups: %m");
+			return ret;
+		}
 	}
 
 	key.objectid = BTRFS_FS_TREE_OBJECTID;
extent-tree.c +90 -70

199 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#3 lore raw

PATCH 3/6 btrfs-progs: Enable read-write ability for 'bg_tree' feature

In reply to Qu Wenruo

Allow btrfs-progs to open, read and write 'bg_tree' enabled fs.

The modification itself is not large, as block groups items are only used at 4 timing:
1) open_ctree()
We only need to populate fs_info->bg_root and read block group items from fs_info->bg_root.
The obvious change is, we don't need to do btrfs_search_slot() for each block group item, but btrfs_next_item() is enough.

This should hugely reduce open_ctree() execution duration.

2) btrfs_commit_transaction()
We need to write back dirty block group items back to bg_root.

The modification here is to insert new block group item if we can't find one existing in bg_root, and delete the old one in extent tree if we're converting to bg_tree feature.

3) btrfs_make_block_group()
Just change @root for btrfs_insert_item() from @extent_root to @bg_root for fs with that feature.

This modification needs extra handling for converting case, where block group items can be either in extent tree or bg tree.

4) free_block_group_item()
Just delete the block group item in extent tree.

---
 ctree.h       |  11 +++-
 disk-io.c     |  20 +++++++
 extent-tree.c | 152 +++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 168 insertions(+), 15 deletions(-)
ctree.h +10 -1
index 1288324d1afe..4d4da99dbfa5 100644
@@ -91,6 +91,9 @@ struct btrfs_free_space_ctl;
 /* tracks free space in block groups. */
 #define BTRFS_FREE_SPACE_TREE_OBJECTID 10ULL
 
+/* store BLOCK_GROUP_ITEMS in a seperate tree */
+#define BTRFS_BLOCK_GROUP_TREE_OBJECTID 11ULL
+
 /* device stats in the device tree */
 #define BTRFS_DEV_STATS_OBJECTID 0ULL
 
@@ -492,6 +495,7 @@ struct btrfs_super_block {
 #define BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA	(1ULL << 8)
 #define BTRFS_FEATURE_INCOMPAT_NO_HOLES		(1ULL << 9)
 #define BTRFS_FEATURE_INCOMPAT_METADATA_UUID    (1ULL << 10)
+#define BTRFS_FEATURE_INCOMPAT_BG_TREE		(1ULL << 11)
 
 #define BTRFS_FEATURE_COMPAT_SUPP		0ULL
 
@@ -515,7 +519,8 @@ struct btrfs_super_block {
 	 BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS |		\
 	 BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA |	\
 	 BTRFS_FEATURE_INCOMPAT_NO_HOLES |		\
-	 BTRFS_FEATURE_INCOMPAT_METADATA_UUID)
+	 BTRFS_FEATURE_INCOMPAT_METADATA_UUID |		\
+	 BTRFS_FEATURE_INCOMPAT_BG_TREE)
 
 /*
  * A leaf is full of items. offset and size tell us where to find
@@ -1104,6 +1109,7 @@ struct btrfs_fs_info {
 	struct btrfs_root *quota_root;
 	struct btrfs_root *free_space_root;
 	struct btrfs_root *uuid_root;
+	struct btrfs_root *bg_root;
 
 	struct rb_root fs_root_tree;
 
@@ -1156,6 +1162,9 @@ struct btrfs_fs_info {
 	unsigned int avoid_sys_chunk_alloc:1;
 	unsigned int finalize_on_close:1;
 
+	/* Converting from bg in extent tree to bg tree */
+	unsigned int convert_to_bg_tree:1;
+
 	int transaction_aborted;
 
 	int (*free_extent_hook)(struct btrfs_fs_info *fs_info,
disk-io.c +20 -0
index 34fa6a7edc50..309aa881c373 100644
@@ -686,6 +686,8 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
 	if (location->objectid == BTRFS_FREE_SPACE_TREE_OBJECTID)
 		return fs_info->free_space_root ? fs_info->free_space_root :
 						ERR_PTR(-ENOENT);
+	if (location->objectid == BTRFS_BLOCK_GROUP_TREE_OBJECTID)
+		return fs_info->bg_root ? fs_info->bg_root : ERR_PTR(-ENOENT);
 
 	BUG_ON(location->objectid == BTRFS_TREE_RELOC_OBJECTID ||
 	       location->offset != (u64)-1);
@@ -738,6 +740,7 @@ struct btrfs_fs_info *btrfs_new_fs_info(int writable, u64 sb_bytenr)
 	fs_info->csum_root = calloc(1, sizeof(struct btrfs_root));
 	fs_info->quota_root = calloc(1, sizeof(struct btrfs_root));
 	fs_info->free_space_root = calloc(1, sizeof(struct btrfs_root));
+	fs_info->bg_root = calloc(1, sizeof(struct btrfs_root));
 	fs_info->super_copy = calloc(1, BTRFS_SUPER_INFO_SIZE);
 
 	if (!fs_info->tree_root || !fs_info->extent_root ||
@@ -899,6 +902,21 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
 		return ret;
 	fs_info->extent_root->track_dirty = 1;
 
+	if (btrfs_fs_incompat(fs_info, BG_TREE)) {
+		ret = setup_root_or_create_block(fs_info, flags,
+					fs_info->bg_root,
+					BTRFS_BLOCK_GROUP_TREE_OBJECTID, "bg");
+		if (ret < 0) {
+			error("Couldn't setup bg tree");
+			return ret;
+		}
+		fs_info->bg_root->track_dirty = 1;
+		fs_info->bg_root->ref_cows = 0;
+	} else {
+		free(fs_info->bg_root);
+		fs_info->bg_root = NULL;
+	}
+
 	ret = find_and_setup_root(root, fs_info, BTRFS_DEV_TREE_OBJECTID,
 				  fs_info->dev_root);
 	if (ret) {
@@ -972,6 +990,8 @@ void btrfs_release_all_roots(struct btrfs_fs_info *fs_info)
 		free_extent_buffer(fs_info->free_space_root->node);
 	if (fs_info->quota_root)
 		free_extent_buffer(fs_info->quota_root->node);
+	if (fs_info->bg_root)
+		free_extent_buffer(fs_info->bg_root->node);
 	if (fs_info->csum_root)
 		free_extent_buffer(fs_info->csum_root->node);
 	if (fs_info->dev_root)
extent-tree.c +138 -14

200 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#4 lore raw

PATCH 4/6 btrfs-progs: mkfs: Introduce -O bg-tree

In reply to Qu Wenruo

This allow mkfs.btrfs to create a btrfs with bg-tree feature.

---
 fsfeatures.c  |  6 ++++++
 mkfs/common.c |  7 +++++--
 mkfs/common.h |  1 +
 mkfs/main.c   | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 transaction.c |  1 +
 5 files changed, 70 insertions(+), 2 deletions(-)
fsfeatures.c +6 -0
index 13ad030870cd..6458253f05ff 100644
@@ -86,6 +86,12 @@ static const struct btrfs_fs_feature {
 		VERSION_TO_STRING2(4,0),
 		NULL, 0,
 		"no explicit hole extents for files" },
+	{ "bg-tree", BTRFS_FEATURE_INCOMPAT_BG_TREE,
+		"bg_tree",
+		VERSION_TO_STRING2(5, 0),
+		NULL, 0,
+		NULL, 0,
+		"store block group items in dedicated tree" },
 	/* Keep this one last */
 	{ "list-all", BTRFS_FEATURE_LIST_ALL, NULL }
 };
mkfs/common.c +5 -2
index 1f5e1d03a6e3..2916ab3035f5 100644
@@ -110,6 +110,9 @@ static int btrfs_create_tree_root(int fd, struct btrfs_mkfs_config *cfg,
 	return ret;
 }
 
+/* These features will not be set in the temporary fs */
+#define MASKED_FEATURES		(~(BTRFS_FEATURE_INCOMPAT_BG_TREE))
+
 /*
  * @fs_uuid - if NULL, generates a UUID, returns back the new filesystem UUID
  *
@@ -203,7 +206,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
 	btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
 	btrfs_set_super_chunk_root_generation(&super, 1);
 	btrfs_set_super_cache_generation(&super, -1);
-	btrfs_set_super_incompat_flags(&super, cfg->features);
+	btrfs_set_super_incompat_flags(&super, cfg->features & MASKED_FEATURES);
 	if (cfg->label)
 		__strncpy_null(super.label, cfg->label, BTRFS_LABEL_SIZE - 1);
 
@@ -868,7 +871,7 @@ static int __create_tree(struct btrfs_trans_handle *trans,
  *
  * Caller must ensure at the time of calling, csum tree is still empty
  */
-static int create_empty_tree(struct btrfs_trans_handle *trans, u64 objectid)
+int create_empty_tree(struct btrfs_trans_handle *trans, u64 objectid)
 {
 	struct btrfs_root *csum_root = trans->fs_info->csum_root;
 
mkfs/common.h +1 -0
index adb5d561c38d..dfb82f9c84a3 100644
@@ -75,6 +75,7 @@ int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile,
 int test_status_for_mkfs(const char *file, bool force_overwrite);
 int test_dev_for_mkfs(const char *file, int force_overwrite);
 
+int create_empty_tree(struct btrfs_trans_handle *trans, u64 objectid);
 int create_uuid_tree(struct btrfs_trans_handle *trans);
 int create_inode_tree(struct btrfs_trans_handle *trans, u64 objectid);
 
mkfs/main.c +57 -0

69 lines not on this page · raw message

transaction.c +1 -0
index e756db332fec..3c07f589d670 100644
@@ -205,6 +205,7 @@ commit_tree:
 	root->commit_root = NULL;
 	fs_info->running_transaction = NULL;
 	fs_info->last_trans_committed = transid;
+	fs_info->convert_to_bg_tree = 0;
 out:
 	return ret;
 }
Signature · 1 line
2.20.1
author
#5 lore raw

PATCH 5/6 btrfs-progs: dump-tree/dump-super: Introduce support for bg tree

In reply to Qu Wenruo
---
 cmds-inspect-dump-super.c | 3 ++-
 cmds-inspect-dump-tree.c  | 5 +++++
 print-tree.c              | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)
cmds-inspect-dump-super.c +2 -1
index 97e9624db8d7..4550a38e59fe 100644
@@ -229,7 +229,8 @@ static struct readable_flag_entry incompat_flags_array[] = {
 	DEF_INCOMPAT_FLAG_ENTRY(RAID56),
 	DEF_INCOMPAT_FLAG_ENTRY(SKINNY_METADATA),
 	DEF_INCOMPAT_FLAG_ENTRY(NO_HOLES),
-	DEF_INCOMPAT_FLAG_ENTRY(METADATA_UUID)
+	DEF_INCOMPAT_FLAG_ENTRY(METADATA_UUID),
+	DEF_INCOMPAT_FLAG_ENTRY(BG_TREE)
 };
 static const int incompat_flags_num = sizeof(incompat_flags_array) /
 				      sizeof(struct readable_flag_entry);
cmds-inspect-dump-tree.c +5 -0
index ad5345b4f1db..0e96acded90a 100644
@@ -148,6 +148,7 @@ static u64 treeid_from_string(const char *str, const char **end)
 		{ "CSUM", BTRFS_CSUM_TREE_OBJECTID },
 		{ "CHECKSUM", BTRFS_CSUM_TREE_OBJECTID },
 		{ "QUOTA", BTRFS_QUOTA_TREE_OBJECTID },
+		{ "BG", BTRFS_BLOCK_GROUP_TREE_OBJECTID },
 		{ "UUID", BTRFS_UUID_TREE_OBJECTID },
 		{ "FREE_SPACE", BTRFS_FREE_SPACE_TREE_OBJECTID },
 		{ "TREE_LOG_FIXUP", BTRFS_TREE_LOG_FIXUP_OBJECTID },
@@ -559,6 +560,10 @@ again:
 				if (!skip)
 					printf("free space");
 				break;
+			case BTRFS_BLOCK_GROUP_TREE_OBJECTID:
+				if (!skip)
+					printf("block group");
+				break;
 			case BTRFS_MULTIPLE_OBJECTIDS:
 				if (!skip) {
 					printf("multiple");
print-tree.c +3 -0
index ab77463706c1..3e61b5254a1f 100644
@@ -790,6 +790,9 @@ void print_objectid(FILE *stream, u64 objectid, u8 type)
 	case BTRFS_FREE_SPACE_TREE_OBJECTID:
 		fprintf(stream, "FREE_SPACE_TREE");
 		break;
+	case BTRFS_BLOCK_GROUP_TREE_OBJECTID:
+		fprintf(stream, "BLOCK_GROUP_TREE");
+		break;
 	case BTRFS_MULTIPLE_OBJECTIDS:
 		fprintf(stream, "MULTIPLE");
 		break;
Signature · 1 line
2.20.1
author
#6 lore raw

PATCH 6/6 btrfs-progs: check: Introduce support for bg-tree feature

In reply to Qu Wenruo

For original mode BLOCK_GROUP_ITEM can occur in bg tree.

For lowmem mode just check BLOCK_GROUP_ITEM in bg tree if the that feature is set.

---
 check/main.c        | 3 ++-
 check/mode-lowmem.c | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
check/main.c +2 -1
index 54ab146d0d13..255f762db3c3 100644
@@ -6013,7 +6013,8 @@ static int check_type_with_root(u64 rootid, u8 key_type)
 	case BTRFS_EXTENT_ITEM_KEY:
 	case BTRFS_METADATA_ITEM_KEY:
 	case BTRFS_BLOCK_GROUP_ITEM_KEY:
-		if (rootid != BTRFS_EXTENT_TREE_OBJECTID)
+		if (rootid != BTRFS_EXTENT_TREE_OBJECTID &&
+		    rootid != BTRFS_BLOCK_GROUP_TREE_OBJECTID)
 			goto err;
 		break;
 	case BTRFS_ROOT_ITEM_KEY:
check/mode-lowmem.c +7 -2
index 7bb079a98ea9..acfffe1fef87 100644
@@ -4229,7 +4229,7 @@ next:
 static int check_chunk_item(struct btrfs_fs_info *fs_info,
 			    struct extent_buffer *eb, int slot)
 {
-	struct btrfs_root *extent_root = fs_info->extent_root;
+	struct btrfs_root *root;
 	struct btrfs_root *dev_root = fs_info->dev_root;
 	struct btrfs_path path;
 	struct btrfs_key chunk_key;
@@ -4251,6 +4251,11 @@ static int check_chunk_item(struct btrfs_fs_info *fs_info,
 	int ret;
 	int err = 0;
 
+	if (btrfs_fs_incompat(fs_info, BG_TREE))
+		root = fs_info->bg_root;
+	else
+		root = fs_info->extent_root;
+
 	btrfs_item_key_to_cpu(eb, &chunk_key, slot);
 	chunk = btrfs_item_ptr(eb, slot, struct btrfs_chunk);
 	length = btrfs_chunk_length(eb, chunk);
@@ -4270,7 +4275,7 @@ static int check_chunk_item(struct btrfs_fs_info *fs_info,
 	bg_key.offset = length;
 
 	btrfs_init_path(&path);
-	ret = btrfs_search_slot(NULL, extent_root, &bg_key, &path, 0, 0);
+	ret = btrfs_search_slot(NULL, root, &bg_key, &path, 0, 0);
 	if (ret) {
 		error(
 		"chunk[%llu %llu) did not find the related block group item",
Signature · 1 line
2.20.1
#7 lore raw
In reply to Qu Wenruo

Sorry to bother you again...

Quoted 15 lines · Qu Wenruo

This patchset can be fetched from github:
https://github.com/adam900710/btrfs-progs/tree/bg_tree
The basis commit is:

commit 7d16a2b460182ee98c649533a6975b6e419c3d71

Author: Qu Wenruo <[email protected]>
Date:   Thu Dec 27 13:49:18 2018 +0800

btrfs-progs: Create uuid tree with proper contents

Which is further based on devel branch.

This patchset provides the needed user space infrastructure for BG_TREE feature.

Quoted 6 lines

Since it's an new exclusive feature, unlike SKINNY_METADATA, btrfs-progs is needed to convert existing fs (unmounted) to new format.

Although I have prepared the functionality, convert_to_bg_tree(), and already uses it in mkfs, I haven't decided if I should put it under btrfstune, as btrfstune isn't such offline convert tool.

Ok, so, the convert_to_bg_tree still needs wiring up somewhere before it's possible to convert an existing fs?

I want to test with a (iSCSI level clone of a) rather large-ish filesystem, so I was searching for how to convert that in place.

Do you have an idea for a (quick hack?) way to make this happen?

Doing the offline conversion itself is also already an interesting thing, seeing how it behaves with some tens of thousands of block groups... (As the intended audience for it will mostly be people having large filesystems already.)

Quoted 30 lines

If anyone has better idea on the new convert tool interface, I'm all ears.

For the performance improvement, please check the kernel patchset cover letter or the last patch.
(SPOILER ALERT: It's super fast)

Qu Wenruo (6):
btrfs-progs: Refactor excluded extent functions to use fs_info
btrfs-progs: Refactor btrfs_read_block_groups()
btrfs-progs: Enable read-write ability for 'bg_tree' feature
btrfs-progs: mkfs: Introduce -O bg-tree
btrfs-progs: dump-tree/dump-super: Introduce support for bg tree
btrfs-progs: check: Introduce support for bg-tree feature

 check/main.c              |   7 +-
 check/mode-lowmem.c       |   9 +-
 cmds-inspect-dump-super.c |   3 +-
 cmds-inspect-dump-tree.c  |   5 +
 ctree.h                   |  17 +-
 disk-io.c                 |  29 +++-
 extent-tree.c             | 326 +++++++++++++++++++++++++++-----------
 fsfeatures.c              |   6 +
 mkfs/common.c             |   7 +-
 mkfs/common.h             |   1 +
 mkfs/main.c               |  57 +++++++
 print-tree.c              |   3 +
 transaction.c             |   1 +
 13 files changed, 365 insertions(+), 106 deletions(-)
#8 lore raw
Quoted 21 lines · Hans van Kranenburg

Sorry to bother you again...

Quoted 18 lines · Qu Wenruo

This patchset can be fetched from github:
https://github.com/adam900710/btrfs-progs/tree/bg_tree
The basis commit is:

commit 7d16a2b460182ee98c649533a6975b6e419c3d71

Author: Qu Wenruo <[email protected]>
Date:   Thu Dec 27 13:49:18 2018 +0800

btrfs-progs: Create uuid tree with proper contents

Which is further based on devel branch.

This patchset provides the needed user space infrastructure for BG_TREE feature.

Since it's an new exclusive feature, unlike SKINNY_METADATA, btrfs-progs is needed to convert existing fs (unmounted) to new format.

Quoted 6 lines
Quoted 3 lines

Although I have prepared the functionality, convert_to_bg_tree(), and already uses it in mkfs, I haven't decided if I should put it under btrfstune, as btrfstune isn't such offline convert tool.

Ok, so, the convert_to_bg_tree still needs wiring up somewhere before it's possible to convert an existing fs?

Sorry, I haven't investigate more time for this convert. It's more or less expected to be something use it or not so far.

Quoted 5 lines

I want to test with a (iSCSI level clone of a) rather large-ish filesystem, so I was searching for how to convert that in place.

Do you have an idea for a (quick hack?) way to make this happen?

Btrfs-progs needs extra patch for it, but I haven't implemented it yet. It shouldn't be super complex, but I'm not confident enough yet.

If nothing goes wrong, I'll update the btrfs-progs patchset this week with (maybe PoC) offline convert.

Thanks,
Qu

Quoted 37 lines

Doing the offline conversion itself is also already an interesting thing, seeing how it behaves with some tens of thousands of block groups... (As the intended audience for it will mostly be people having large filesystems already.)

Quoted 30 lines

If anyone has better idea on the new convert tool interface, I'm all ears.

For the performance improvement, please check the kernel patchset cover letter or the last patch.
(SPOILER ALERT: It's super fast)

Qu Wenruo (6):
btrfs-progs: Refactor excluded extent functions to use fs_info
btrfs-progs: Refactor btrfs_read_block_groups()
btrfs-progs: Enable read-write ability for 'bg_tree' feature
btrfs-progs: mkfs: Introduce -O bg-tree
btrfs-progs: dump-tree/dump-super: Introduce support for bg tree
btrfs-progs: check: Introduce support for bg-tree feature

 check/main.c              |   7 +-
 check/mode-lowmem.c       |   9 +-
 cmds-inspect-dump-super.c |   3 +-
 cmds-inspect-dump-tree.c  |   5 +
 ctree.h                   |  17 +-
 disk-io.c                 |  29 +++-
 extent-tree.c             | 326 +++++++++++++++++++++++++++-----------
 fsfeatures.c              |   6 +
 mkfs/common.c             |   7 +-
 mkfs/common.h             |   1 +
 mkfs/main.c               |  57 +++++++
 print-tree.c              |   3 +
 transaction.c             |   1 +
 13 files changed, 365 insertions(+), 106 deletions(-)