From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3361EC2D0F8 for ; Wed, 13 May 2020 06:44:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E638320708 for ; Wed, 13 May 2020 06:44:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729376AbgEMGop (ORCPT ); Wed, 13 May 2020 02:44:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:46640 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728988AbgEMGoo (ORCPT ); Wed, 13 May 2020 02:44:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id AD3F8ABBE; Wed, 13 May 2020 06:44:44 +0000 (UTC) Subject: Re: [PATCH 2/2] btrfs: Don't set SHAREABLE flag for data reloc tree To: Qu Wenruo , linux-btrfs@vger.kernel.org References: <20200513061611.111807-1-wqu@suse.com> <20200513061611.111807-3-wqu@suse.com> From: Nikolay Borisov Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <84d3fb22-3845-b952-88ca-c5ce31ab967f@suse.com> Date: Wed, 13 May 2020 09:44:40 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200513061611.111807-3-wqu@suse.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 13.05.20 г. 9:16 ч., Qu Wenruo wrote: > SHAREABLE flag is set for subvolumes because users can create snapshot > for subvolumes, thus sharing tree blocks of them. > > But users can't access data reloc tree as it's only an internal tree for > data relocation, thus it doesn't need the full path replacement treat at > all. > > This patch will make data reloc tree just a non-shareable tree, and add > btrfs_fs_info::dreloc_root for data reloc tree, so relocation code can > grab it from fs_info directly. > > This would slightly improve tree relocation, as now data reloc tree > can go through regular COW routine to get relocated, without bothering > the complex tree reloc tree routine. > > Signed-off-by: Qu Wenruo > --- > fs/btrfs/ctree.h | 1 + > fs/btrfs/disk-io.c | 14 +++++++++++++- > fs/btrfs/inode.c | 7 ++++--- > fs/btrfs/relocation.c | 18 ++++-------------- > 4 files changed, 22 insertions(+), 18 deletions(-) > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index 65c09aea4cb9..a9690f438a15 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -582,6 +582,7 @@ struct btrfs_fs_info { > struct btrfs_root *quota_root; > struct btrfs_root *uuid_root; > struct btrfs_root *free_space_root; > + struct btrfs_root *dreloc_root; Rename this to data_reloc_root or simply reloc_root, dreloc is rather cryptic. > > /* the log root tree is a directory of all the other log roots */ > struct btrfs_root *log_root_tree; > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index 4dd3206c1ace..7355ebc648c5 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -1419,7 +1419,8 @@ static int btrfs_init_fs_root(struct btrfs_root *root) > if (ret) > goto fail; > > - if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) { > + if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID && > + root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID) { > set_bit(BTRFS_ROOT_SHAREABLE, &root->state); > btrfs_check_and_init_root_item(&root->root_item); > } > @@ -1525,6 +1526,7 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info) > btrfs_put_root(fs_info->uuid_root); > btrfs_put_root(fs_info->free_space_root); > btrfs_put_root(fs_info->fs_root); > + btrfs_put_root(fs_info->dreloc_root); > btrfs_check_leaked_roots(fs_info); > btrfs_extent_buffer_leak_debug_check(fs_info); > kfree(fs_info->super_copy); > @@ -1981,6 +1983,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, bool free_chunk_root) > free_root_extent_buffers(info->quota_root); > free_root_extent_buffers(info->uuid_root); > free_root_extent_buffers(info->fs_root); > + free_root_extent_buffers(info->dreloc_root); > if (free_chunk_root) > free_root_extent_buffers(info->chunk_root); > free_root_extent_buffers(info->free_space_root); > @@ -2287,6 +2290,15 @@ static int btrfs_read_roots(struct btrfs_fs_info *fs_info) > set_bit(BTRFS_ROOT_TRACK_DIRTY, &root->state); > fs_info->csum_root = root; > > + location.objectid = BTRFS_DATA_RELOC_TREE_OBJECTID; > + root = btrfs_get_fs_root(fs_info, &location, true); > + if (IS_ERR(root)) { > + ret = PTR_ERR(root); > + goto out; > + } > + set_bit(BTRFS_ROOT_TRACK_DIRTY, &root->state); > + fs_info->dreloc_root = root; > + > location.objectid = BTRFS_QUOTA_TREE_OBJECTID; > root = btrfs_read_tree_root(tree_root, &location); > if (!IS_ERR(root)) { > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 13bbb6b0d495..6b7ba20eee52 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -4133,7 +4133,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, > * inode. > */ > if (test_bit(BTRFS_ROOT_SHAREABLE, &root->state) || > - root == fs_info->tree_root) > + root == fs_info->tree_root || root == fs_info->dreloc_root) > btrfs_drop_extent_cache(BTRFS_I(inode), ALIGN(new_size, > fs_info->sectorsize), > (u64)-1, 0); > @@ -4338,7 +4338,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, > > if (found_extent && > (test_bit(BTRFS_ROOT_SHAREABLE, &root->state) || > - root == fs_info->tree_root)) { > + root == fs_info->tree_root || > + root == fs_info->dreloc_root)) { > struct btrfs_ref ref = { 0 }; > > bytes_deleted += extent_num_bytes; > @@ -5046,7 +5047,7 @@ void btrfs_evict_inode(struct inode *inode) > btrfs_end_transaction(trans); > } > > - if (!(root == fs_info->tree_root || > + if (!(root == fs_info->tree_root || root == fs_info->dreloc_root || > root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)) > btrfs_return_ino(root, btrfs_ino(BTRFS_I(inode))); > > diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c > index 437b782c57e6..cb45ae92f15d 100644 > --- a/fs/btrfs/relocation.c > +++ b/fs/btrfs/relocation.c > @@ -1087,7 +1087,8 @@ int replace_file_extents(struct btrfs_trans_handle *trans, > * if we are modifying block in fs tree, wait for readpage > * to complete and drop the extent cache > */ > - if (root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID) { > + if (root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID && > + root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID) { > if (first) { > inode = find_next_inode(root, key.objectid); > first = 0; > @@ -3470,15 +3471,11 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info, > { > struct inode *inode = NULL; > struct btrfs_trans_handle *trans; > - struct btrfs_root *root; > + struct btrfs_root *root = fs_info->dreloc_root; So why haven't you added code in btrfs_get_fs_root to quickly return a refcounted root and instead reference it without incrementing the refcount? > struct btrfs_key key; > u64 objectid; > int err = 0; > > - root = read_fs_root(fs_info, BTRFS_DATA_RELOC_TREE_OBJECTID); > - if (IS_ERR(root)) > - return ERR_CAST(root); > - > trans = btrfs_start_transaction(root, 6); > if (IS_ERR(trans)) { > btrfs_put_root(root); > @@ -3501,7 +3498,6 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info, > > err = btrfs_orphan_add(trans, BTRFS_I(inode)); > out: > - btrfs_put_root(root); > btrfs_end_transaction(trans); > btrfs_btree_balance_dirty(fs_info); > if (err) { > @@ -3870,13 +3866,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) > > if (err == 0) { > /* cleanup orphan inode in data relocation tree */ > - fs_root = read_fs_root(fs_info, BTRFS_DATA_RELOC_TREE_OBJECTID); > - if (IS_ERR(fs_root)) { > - err = PTR_ERR(fs_root); > - } else { > - err = btrfs_orphan_cleanup(fs_root); > - btrfs_put_root(fs_root); > - } > + err = btrfs_orphan_cleanup(fs_info->dreloc_root); > } > return err; > } >