From patchwork Thu Oct 19 22:30:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13429912 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD6BBC00A98 for ; Thu, 19 Oct 2023 22:30:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346656AbjJSWao (ORCPT ); Thu, 19 Oct 2023 18:30:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346639AbjJSWaj (ORCPT ); Thu, 19 Oct 2023 18:30:39 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B60CB115 for ; Thu, 19 Oct 2023 15:30:36 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5C9D81FD7F for ; Thu, 19 Oct 2023 22:30:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1697754635; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ev2SfOZSIKam2aPyEdMORDMvZLsgOGJ8TpngspAV5KQ=; b=tVVunKcRq1AtArQvWlKfJXcN9+GcgL+mLbQ8S/O+h7e1BEkx81gzI5+Fv01Nza8PkPDsda 0FfGdxjImbu6Rt+8EXn+2m4rp1ungz+a0NJtQtnoYvLj6Xsrlois9pO3XY/6lc+6hh0H/U L6dGHprIf+4ESfTaRKJN8z4OI7wd5u4= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8FFB21357F for ; Thu, 19 Oct 2023 22:30:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kFmKEwquMWXzWgAAMHmgww (envelope-from ) for ; Thu, 19 Oct 2023 22:30:34 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 6/9] btrfs-progs: enhance btrfs_create_root() function Date: Fri, 20 Oct 2023 09:00:05 +1030 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [-2.10 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[linux-btrfs@vger.kernel.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-3.00)[-1.000]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org 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 --- 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(-) diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c index 61cf125cc136..38c41135d438 100644 --- a/kernel-shared/ctree.c +++ b/kernel-shared/ctree.c @@ -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: diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h index ff43fefca802..34e14ea21420 100644 --- a/kernel-shared/ctree.h +++ b/kernel-shared/ctree.h @@ -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, diff --git a/mkfs/main.c b/mkfs/main.c index 3039fbb8a266..cf8922999b31 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -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; diff --git a/tune/convert-bgt.c b/tune/convert-bgt.c index dd3a8c750604..a027e50b79a0 100644 --- a/tune/convert-bgt.c +++ b/tune/convert-bgt.c @@ -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; diff --git a/tune/quota.c b/tune/quota.c index a14f453078d5..5896a61e61d6 100644 --- a/tune/quota.c +++ b/tune/quota.c @@ -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;