@@ -26,8 +26,10 @@
#include "kernel-shared/print-tree.h"
#include "kernel-shared/tree-checker.h"
#include "kernel-shared/volumes.h"
+#include "kernel-shared/messages.h"
#include "common/internal.h"
#include "common/messages.h"
+#include "common/rbtree-utils.h"
static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
*root, struct btrfs_path *path, int level);
@@ -331,57 +333,17 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
*
* NOTE: Doesn't support tree with non-zero offset, like data reloc tree.
*/
-int btrfs_create_root(struct btrfs_trans_handle *trans,
- struct btrfs_fs_info *fs_info, u64 objectid)
+int btrfs_create_root(struct btrfs_trans_handle *trans, u64 objectid)
{
- struct extent_buffer *node;
- struct btrfs_root *new_root;
- struct btrfs_disk_key disk_key;
+ struct btrfs_fs_info *fs_info = trans->fs_info;
+ struct extent_buffer *node = NULL;
+ struct btrfs_root *new_root = NULL;
struct btrfs_key location;
- struct btrfs_root_item root_item = { 0 };
- int ret;
-
- new_root = malloc(sizeof(*new_root));
- if (!new_root)
- return -ENOMEM;
-
- btrfs_setup_root(new_root, fs_info, objectid);
- if (!is_fstree(objectid))
- set_bit(BTRFS_ROOT_TRACK_DIRTY, &new_root->state);
- add_root_to_dirty_list(new_root);
-
- new_root->objectid = objectid;
- new_root->root_key.objectid = objectid;
- new_root->root_key.type = BTRFS_ROOT_ITEM_KEY;
- new_root->root_key.offset = 0;
-
- node = btrfs_alloc_tree_block(trans, new_root, fs_info->nodesize,
- objectid, &disk_key, 0, 0, 0,
- BTRFS_NESTING_NORMAL);
- if (IS_ERR(node)) {
- ret = PTR_ERR(node);
- error("failed to create root node for tree %llu: %d (%m)",
- objectid, ret);
- return ret;
- }
- new_root->node = node;
-
- memset_extent_buffer(node, 0, 0, sizeof(struct btrfs_header));
- btrfs_set_header_bytenr(node, node->start);
- btrfs_set_header_generation(node, trans->transid);
- btrfs_set_header_backref_rev(node, BTRFS_MIXED_BACKREF_REV);
- btrfs_set_header_owner(node, objectid);
- write_extent_buffer_fsid(node, fs_info->fs_devices->metadata_uuid);
- write_extent_buffer_chunk_tree_uuid(node, fs_info->chunk_tree_uuid);
- btrfs_set_header_nritems(node, 0);
- btrfs_set_header_level(node, 0);
- ret = btrfs_inc_ref(trans, new_root, node, 0);
- if (ret < 0)
- goto free;
+ int ret = 0;
/*
* Special tree roots may need to modify pointers in @fs_info
- * Only quota is supported yet.
+ * Only quota and block group trees are supported yet.
*/
switch (objectid) {
case BTRFS_QUOTA_TREE_OBJECTID:
@@ -390,8 +352,6 @@ int btrfs_create_root(struct btrfs_trans_handle *trans,
ret = -EEXIST;
goto free;
}
- fs_info->quota_root = new_root;
- fs_info->quota_enabled = 1;
break;
case BTRFS_BLOCK_GROUP_TREE_OBJECTID:
if (fs_info->block_group_root) {
@@ -399,9 +359,7 @@ int btrfs_create_root(struct btrfs_trans_handle *trans,
ret = -EEXIST;
goto free;
}
- fs_info->block_group_root = new_root;
break;
-
/*
* Essential trees can't be created by this function, yet.
* As we expect such skeleton exists, or a lot of functions like
@@ -414,27 +372,51 @@ int btrfs_create_root(struct btrfs_trans_handle *trans,
ret = -EEXIST;
goto free;
default:
- /* Subvolume trees don't need special handling */
- if (is_fstree(objectid))
+ /*
+ * Subvolume trees don't need special handling.
+ * In progs we also treat DATA_RELOC tree just as a subvolume.
+ */
+ if (is_fstree(objectid) || objectid == BTRFS_DATA_RELOC_TREE_OBJECTID)
break;
/* Other special trees are not supported yet */
ret = -ENOTTY;
goto free;
}
- btrfs_mark_buffer_dirty(node);
- btrfs_set_root_bytenr(&root_item, btrfs_header_bytenr(node));
- btrfs_set_root_level(&root_item, 0);
- btrfs_set_root_generation(&root_item, trans->transid);
- btrfs_set_root_dirid(&root_item, 0);
- btrfs_set_root_refs(&root_item, 1);
- btrfs_set_root_used(&root_item, fs_info->nodesize);
+
location.objectid = objectid;
location.type = BTRFS_ROOT_ITEM_KEY;
location.offset = 0;
+ new_root = btrfs_create_tree(trans, fs_info, &location);
+ if (IS_ERR(new_root)) {
+ ret = PTR_ERR(new_root);
+ errno = -ret;
+ error("failed to create new tree for rootid %lld: %m", objectid);
+ return ret;
+ }
- ret = btrfs_insert_root(trans, fs_info->tree_root, &location, &root_item);
- if (ret < 0)
- goto free;
+ add_root_to_dirty_list(new_root);
+
+ switch (objectid) {
+ case BTRFS_QUOTA_TREE_OBJECTID:
+ fs_info->quota_root = new_root;
+ fs_info->quota_enabled = 1;
+ break;
+ case BTRFS_BLOCK_GROUP_TREE_OBJECTID:
+ fs_info->block_group_root = new_root;
+ break;
+ default:
+ /*
+ * We need to add subvolume trees to its rb tree, or we will
+ * leak root->node.
+ */
+ ASSERT(is_fstree(objectid) ||
+ objectid == BTRFS_DATA_RELOC_TREE_OBJECTID);
+ ret = rb_insert(&fs_info->fs_root_tree, &new_root->rb_node,
+ btrfs_fs_roots_compare_roots);
+ if (ret < 0)
+ goto free;
+ set_bit(BTRFS_ROOT_SHAREABLE, &new_root->state);
+ }
return ret;
free:
@@ -989,8 +989,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct extent_buffer *buf,
struct extent_buffer **cow_ret, u64 new_root_objectid);
-int btrfs_create_root(struct btrfs_trans_handle *trans,
- struct btrfs_fs_info *fs_info, u64 objectid);
+int btrfs_create_root(struct btrfs_trans_handle *trans, u64 objectid);
void btrfs_extend_item(struct btrfs_path *path, u32 data_size);
void btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end);
int btrfs_split_item(struct btrfs_trans_handle *trans,
@@ -1007,7 +1007,7 @@ static int setup_quota_root(struct btrfs_fs_info *fs_info)
error_msg(ERROR_MSG_START_TRANS, "%m");
return ret;
}
- ret = btrfs_create_root(trans, fs_info, BTRFS_QUOTA_TREE_OBJECTID);
+ ret = btrfs_create_root(trans, BTRFS_QUOTA_TREE_OBJECTID);
if (ret < 0) {
error("failed to create quota root: %d (%m)", ret);
goto fail;
@@ -54,8 +54,7 @@ int convert_to_bg_tree(struct btrfs_fs_info *fs_info)
if (btrfs_super_flags(sb) & BTRFS_SUPER_FLAG_CHANGING_BG_TREE)
goto iterate_bgs;
- ret = btrfs_create_root(trans, fs_info,
- BTRFS_BLOCK_GROUP_TREE_OBJECTID);
+ ret = btrfs_create_root(trans, BTRFS_BLOCK_GROUP_TREE_OBJECTID);
if (ret < 0) {
error("failed to create block group root: %d", ret);
goto error;
@@ -107,7 +107,7 @@ int enable_quota(struct btrfs_fs_info *fs_info, bool simple)
return ret;
}
- ret = btrfs_create_root(trans, fs_info, BTRFS_QUOTA_TREE_OBJECTID);
+ ret = btrfs_create_root(trans, BTRFS_QUOTA_TREE_OBJECTID);
if (ret < 0) {
error("failed to create quota root: %d (%m)", ret);
goto fail;
This patch does the following changes: - Remove the @fs_info parameter It can be fetched from @trans. - Update a comment Now the function can update fs_info pointers for not only quota tree, but also block group tree. - Error out immediately if the @objectid is invalid - Use btrfs_create_tree() to handle the root item/node creation - Do not update fs_info root pointers before the root fully created This is to prevent an use-after-free if we failed to insert the root item. - Add subvolume and data reloc tree into the fs roots cache This is to prevent eb leak on root->node. Signed-off-by: Qu Wenruo <wqu@suse.com> --- kernel-shared/ctree.c | 106 ++++++++++++++++++------------------------ kernel-shared/ctree.h | 3 +- mkfs/main.c | 2 +- tune/convert-bgt.c | 3 +- tune/quota.c | 2 +- 5 files changed, 48 insertions(+), 68 deletions(-)