From: robbieko <robbieko@synology.com>
To: dsterba@suse.cz, robbieko <robbieko@synology.com>,
linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] Btrfs : improve the speed of compare orphan item and dead roots with tree root when mount
Date: Tue, 28 Apr 2020 11:12:45 +0800 [thread overview]
Message-ID: <31c590f2abee67d60ca8941f5e92e924@synology.com> (raw)
In-Reply-To: <20200427154628.GE18421@twin.jikos.cz>
David Sterba 於 2020-04-27 23:46 寫到:
> On Mon, Apr 27, 2020 at 04:04:11PM +0800, robbieko wrote:
>> From: Robbie Ko <robbieko@synology.com>
>>
>> When mounting, we handle deleted subvol and orphan items.
>> First, find add orphan roots, then add them to fs_root radix tree.
>> Second, in tree-root, process each orphan item, skip if it is dead
>> root.
>>
>> The original algorithm is based on the list of dead_roots,
>> one by one to visit and check whether the objectid is consistent,
>> the time complexity is O (n ^ 2).
>> When processing 50000 deleted subvols, it takes about 120s.
>>
>> We can quickly check whether the orphan item is dead root
>> through the fs_roots radix tree.
>>
>> Signed-off-by: Robbie Ko <robbieko@synology.com>
>> ---
>> fs/btrfs/inode.c | 20 +++++++++-----------
>> 1 file changed, 9 insertions(+), 11 deletions(-)
>>
>> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
>> index 320d1062068d..1becf5c63e5a 100644
>> --- a/fs/btrfs/inode.c
>> +++ b/fs/btrfs/inode.c
>> @@ -3000,18 +3000,16 @@ int btrfs_orphan_cleanup(struct btrfs_root
>> *root)
>> * orphan must not get deleted.
>> * find_dead_roots already ran before us, so if this
>> * is a snapshot deletion, we should find the root
>> - * in the dead_roots list
>> + * in the fs_roots radix tree.
>> */
>> - spin_lock(&fs_info->trans_lock);
>> - list_for_each_entry(dead_root, &fs_info->dead_roots,
>> - root_list) {
>> - if (dead_root->root_key.objectid ==
>> - found_key.objectid) {
>> - is_dead_root = 1;
>> - break;
>> - }
>> - }
>> - spin_unlock(&fs_info->trans_lock);
>> +
>> + spin_lock(&fs_info->fs_roots_radix_lock);
>> + dead_root = radix_tree_lookup(&fs_info->fs_roots_radix,
>> + (unsigned long)found_key.objectid);
>> + if (dead_root && btrfs_root_refs(&dead_root->root_item) == 0)
>> + is_dead_root = 1;
>> + spin_unlock(&fs_info->fs_roots_radix_lock);
>
> The list uses fs_info::trans_lock and the radix uses
> fs_roots_radix_lock. I'd like to know why you think it's safe.
>
> The trans_lock is used for a lot of things, fs_roots_radix_lock is for
> the radix tree insertion/deletion/update/lookup so it does not seem
> like
> an equivalent change. It could be functionally equivalent due to some
> other constraint, like that the number of references is 0 and the tree
> won't be ever touched outside of the orphan cleanup process.
Because btrfs_find_orphan_roots has already ran before us,
and added deleted subvol to fs_roots radix tree.
The fs root will only be removed from the fs_roots radix tree
after the cleaner is processed, and the cleaner will only start
execution after the mount is complete.
So we can directly find the root from the radix tree.
>
> btrfs_orphan_cleanup can be called during the whole filesystem mount
> lifetime, so we can't rely on the mount time where nothing can
> iterfere.
Only "tree root" will be used in this section of code,
and only mount time will be brought into tree root.
next prev parent reply other threads:[~2020-04-28 3:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 8:04 [PATCH] Btrfs : improve the speed of compare orphan item and dead roots with tree root when mount robbieko
2020-04-27 15:46 ` David Sterba
2020-04-28 3:12 ` robbieko [this message]
2020-05-05 1:39 ` robbieko
2020-05-06 15:19 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=31c590f2abee67d60ca8941f5e92e924@synology.com \
--to=robbieko@synology.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).