From: Josef Bacik <josef@toxicpanda.com>
To: Qu Wenruo <quwenruo.btrfs@gmx.com>,
kernel-team@fb.com, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 6/7] btrfs: hold a ref on the root->reloc_root
Date: Mon, 2 Mar 2020 20:14:42 -0500 [thread overview]
Message-ID: <b43791ba-b4de-8cb1-d68f-28858eeee1e3@toxicpanda.com> (raw)
In-Reply-To: <1b3545b5-ab19-6f0d-7dd3-d80fe20a865e@gmx.com>
On 3/2/20 8:12 PM, Qu Wenruo wrote:
>
>
> On 2020/3/3 上午2:47, Josef Bacik wrote:
>> We previously were relying on root->reloc_root to be cleaned up by the
>> drop snapshot, or the error handling. However if btrfs_drop_snapshot()
>> failed it wouldn't drop the ref for the root. Also we sort of depend on
>> the right thing to happen with moving reloc roots between lists and the
>> fs root they belong to, which makes it hard to figure out who owns the
>> reference.
>>
>> Fix this by explicitly holding a reference on the reloc root for
>> roo->reloc_root. This means that we hold two references on reloc roots,
>> one for whichever reloc_roots list it's attached to, and the
>> root->reloc_root we're on.
>>
>> This makes it easier to reason out who owns a reference on the root, and
>> when it needs to be dropped.
>>
>> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
>
> A small question inlined below, despite that,
>
> Reviewed-by: Qu Wenruo <wqu@suse.com>
>
>> ---
>> fs/btrfs/relocation.c | 44 ++++++++++++++++++++++++++++++++-----------
>> 1 file changed, 33 insertions(+), 11 deletions(-)
>>
>> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
>> index acd21c156378..c8ff28930677 100644
>> --- a/fs/btrfs/relocation.c
>> +++ b/fs/btrfs/relocation.c
>> @@ -1384,6 +1384,7 @@ static void __del_reloc_root(struct btrfs_root *root)
>> struct rb_node *rb_node;
>> struct mapping_node *node = NULL;
>> struct reloc_control *rc = fs_info->reloc_ctl;
>> + bool put_ref = false;
>>
>> if (rc && root->node) {
>> spin_lock(&rc->reloc_root_tree.lock);
>> @@ -1400,8 +1401,13 @@ static void __del_reloc_root(struct btrfs_root *root)
>> }
>>
>> spin_lock(&fs_info->trans_lock);
>> - list_del_init(&root->root_list);
>> + if (!list_empty(&root->root_list)) {
>
> Can we make the ref of reloc root completely free from the list operation?
> It still looks like a compromise between fully ref counted reloc root
> and original non-ref counted one.
>
No because we have things like prepare_to_merge() which does
list_del_init(&reloc_root->list);
btrfs_update_reloc_root() <- which can call __del_reloc_root
list_add_tail(&reloc_root->list, &rc->reloc_roots);
so we don't want to drop the ref in __del_reloc_root there, as we're still
technically going to be holding the ref for the list to be cleared later. Thanks,
Josef
next prev parent reply other threads:[~2020-03-03 1:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 18:47 [PATCH 0/7] relocation error handling fixes Josef Bacik
2020-03-02 18:47 ` [PATCH 1/7] btrfs: drop block from cache on error in relocation Josef Bacik
2020-03-03 0:59 ` Qu Wenruo
2020-03-03 14:59 ` David Sterba
2020-03-03 20:27 ` Josef Bacik
2020-03-02 18:47 ` [PATCH 2/7] btrfs: unset reloc control if we fail to recover Josef Bacik
2020-03-03 0:58 ` Qu Wenruo
2020-03-03 1:03 ` Josef Bacik
2020-03-03 1:18 ` Qu Wenruo
2020-03-03 15:21 ` David Sterba
2020-03-02 18:47 ` [PATCH 3/7] btrfs: splice rc->reloc_roots onto reloc roots in recover Josef Bacik
2020-03-03 1:02 ` Qu Wenruo
2020-03-02 18:47 ` [PATCH 4/7] btrfs: run clean_dirty_subvols if we fail to start a trans Josef Bacik
2020-03-03 1:04 ` Qu Wenruo
2020-03-03 15:32 ` David Sterba
2020-03-02 18:47 ` [PATCH 5/7] btrfs: clear BTRFS_ROOT_DEAD_RELOC_TREE before dropping the reloc root Josef Bacik
2020-03-02 19:31 ` David Sterba
2020-03-02 19:51 ` Josef Bacik
2020-03-03 15:34 ` David Sterba
2020-03-03 0:31 ` Qu Wenruo
2020-03-02 18:47 ` [PATCH 6/7] btrfs: hold a ref on the root->reloc_root Josef Bacik
2020-03-03 1:12 ` Qu Wenruo
2020-03-03 1:14 ` Josef Bacik [this message]
2020-03-03 15:51 ` David Sterba
2020-03-02 18:47 ` [PATCH 7/7] btrfs: remove a BUG_ON() from merge_reloc_roots() Josef Bacik
2020-03-03 1:17 ` Qu Wenruo
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=b43791ba-b4de-8cb1-d68f-28858eeee1e3@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo.btrfs@gmx.com \
/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