linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Josef Bacik <josef@toxicpanda.com>
To: dsterba@suse.cz, Qu Wenruo <quwenruo.btrfs@gmx.com>,
	linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH 4/8] btrfs: free the reloc_control in a consistent way
Date: Fri, 13 Mar 2020 11:32:35 -0400	[thread overview]
Message-ID: <940ee1b7-a854-275e-e01f-05770435ee15@toxicpanda.com> (raw)
In-Reply-To: <20200313151829.GN12659@twin.jikos.cz>

On 3/13/20 11:18 AM, David Sterba wrote:
> On Thu, Mar 05, 2020 at 07:39:33PM +0800, Qu Wenruo wrote:
>>
>>
>> On 2020/3/5 上午12:18, Josef Bacik wrote:
>>> If we have an error while processing the reloc roots we could leak roots
>>> that were added to rc->reloc_roots before we hit the error.  We could
>>> have also not removed the reloct tree mapping from our rb_tree, so clean
>>> up any remaining nodes in the reloc root rb_tree.
>>>
>>> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
>>> ---
>>>   fs/btrfs/relocation.c | 18 ++++++++++++++++--
>>>   1 file changed, 16 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
>>> index c496f8ed8c7e..f6237d885fe0 100644
>>> --- a/fs/btrfs/relocation.c
>>> +++ b/fs/btrfs/relocation.c
>>> @@ -4387,6 +4387,20 @@ static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info)
>>>   	return rc;
>>>   }
>>>   
>>> +static void free_reloc_control(struct reloc_control *rc)
>>> +{
>>> +	struct rb_node *rb_node;
>>> +	struct mapping_node *node;
>>> +
>>> +	free_reloc_roots(&rc->reloc_roots);
>>> +	while ((rb_node = rb_first(&rc->reloc_root_tree.rb_root))) {
>>
>> rbtree_postorder_for_each_entry_safe().
>>
>> So that we don't need to bother the re-balance of rbtree.
> 
> I'll update the patch with this
> 
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -4240,15 +4240,13 @@ static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info)
>   
>   static void free_reloc_control(struct reloc_control *rc)
>   {
> -       struct rb_node *rb_node;
> -       struct mapping_node *node;
> +       struct mapping_node *node, *tmp;
>   
>          free_reloc_roots(&rc->reloc_roots);
> -       while ((rb_node = rb_first(&rc->reloc_root_tree.rb_root))) {
> -               node = rb_entry(rb_node, struct mapping_node, rb_node);
> -               rb_erase(rb_node, &rc->reloc_root_tree.rb_root);
> +       rbtree_postorder_for_each_entry_safe(node, tmp,
> +                       &rc->reloc_root_tree.rb_root, rb_node)
>                  kfree(node);

You need an rb_erase() in here.  I'm updating the series so I'll fix it before I 
send the new set.  Thanks,

Josef

  reply	other threads:[~2020-03-13 15:32 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-04 16:18 [PATCH 0/8][v2] relocation error handling fixes Josef Bacik
2020-03-04 16:18 ` [PATCH 1/8] btrfs: drop block from cache on error in relocation Josef Bacik
2020-03-05 11:37   ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 2/8] btrfs: do not init a reloc root if we aren't relocating Josef Bacik
2020-03-04 18:44   ` Nikolay Borisov
2020-03-04 18:47     ` Josef Bacik
2020-03-05 11:24   ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 3/8] btrfs: unset reloc control if we fail to recover Josef Bacik
2020-03-05 11:38   ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 4/8] btrfs: free the reloc_control in a consistent way Josef Bacik
2020-03-05 11:39   ` Qu Wenruo
2020-03-13 15:18     ` David Sterba
2020-03-13 15:32       ` Josef Bacik [this message]
2020-03-14  0:13         ` Qu Wenruo
2020-03-04 16:18 ` [PATCH 5/8] btrfs: run clean_dirty_subvols if we fail to start a trans Josef Bacik
2020-03-05 11:40   ` Qu Wenruo
2020-03-05 17:46   ` David Sterba
2020-03-04 16:18 ` [PATCH 6/8] btrfs: clear BTRFS_ROOT_DEAD_RELOC_TREE before dropping the reloc root Josef Bacik
2020-03-05 11:41   ` Qu Wenruo
2020-03-05 13:54     ` Josef Bacik
2020-03-04 16:18 ` [PATCH 7/8] btrfs: hold a ref on the root->reloc_root Josef Bacik
2020-03-04 16:18 ` [PATCH 8/8] btrfs: remove a BUG_ON() from merge_reloc_roots() Josef Bacik
2020-03-13 14:35 ` [PATCH 0/8][v2] relocation error handling fixes David Sterba
2020-03-13 15:44 [PATCH 0/8][v3] " Josef Bacik
2020-03-13 15:44 ` [PATCH 4/8] btrfs: free the reloc_control in a consistent way Josef Bacik
2020-03-13 17:18   ` David Sterba
2020-03-13 17:38     ` David Sterba
2020-03-13 17:39       ` Josef Bacik

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=940ee1b7-a854-275e-e01f-05770435ee15@toxicpanda.com \
    --to=josef@toxicpanda.com \
    --cc=dsterba@suse.cz \
    --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;
as well as URLs for NNTP newsgroup(s).