From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: Josef Bacik <josef@toxicpanda.com>, Qu Wenruo <wqu@suse.com>,
dsterba@suse.com
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] btrfs: don't update the block group item if used bytes are the same
Date: Thu, 8 Sep 2022 06:20:36 +0800 [thread overview]
Message-ID: <8fe1128c-ebd9-87b6-a2ac-0a427223b456@gmx.com> (raw)
In-Reply-To: <YxjVDY7jIH3Vv/il@localhost.localdomain>
On 2022/9/8 01:29, Josef Bacik wrote:
> On Wed, Sep 07, 2022 at 10:31:58AM -0400, Josef Bacik wrote:
>> On Mon, Jul 11, 2022 at 02:37:52PM +0800, Qu Wenruo wrote:
>>> When committing a transaction, we will update block group items for all
>>> dirty block groups.
>>>
>>> But in fact, dirty block groups don't always need to update their block
>>> group items.
>>> It's pretty common to have a metadata block group which experienced
>>> several CoW operations, but still have the same amount of used bytes.
>>>
>>> In that case, we may unnecessarily CoW a tree block doing nothing.
>>>
>>> This patch will introduce btrfs_block_group::commit_used member to
>>> remember the last used bytes, and use that new member to skip
>>> unnecessary block group item update.
>>>
>>> This would be more common for large fs, which metadata block group can
>>> be as large as 1GiB, containing at most 64K metadata items.
>>>
>>> In that case, if CoW added and the deleted one metadata item near the end
>>> of the block group, then it's completely possible we don't need to touch
>>> the block group item at all.
>>>
>>> I don't have any benchmark to prove this, but this should not cause any
>>> hurt either.
>>>
>>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>>
>> I've been seeing random btrfs check failures on our overnight testing since this
>> patch was merged. I can't blame it directly yet, I've mostly seen it on
>> TEST_DEV, and once while running generic/648. I'm running it in a loop now to
>> reproduce and then fix it.
>>
>> We can start updating block groups before we're in the critical section, so we
>> can update block_group->bytes_used while we're updating the block group item in
>> a different thread. So if we set the block_group item to some value of
>> bytes_used, then update it in another thread, and then set ->commit_used to the
>> new value we'll fail to update the block group item with the correct value
>> later.
>>
>> We need to wrap this bit in the block_group->lock to avoid this particular
>> problem. Once I reproduce and validate the fix I'll send that, but I wanted to
>> reply in case that takes longer than I expect. Thanks,
>
> Ok this is in fact the problem, this fixup made the problem go away. Thanks,
This fix means, a bg members can change even we are at
update_block_group_item().
The old code is completely relying on the one time access on cache->used.
Anyway thanks for the fix.
Thanks,
Qu
>
> Josef
>
> diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
> index 6e7bb1c0352d..1e2773b120d4 100644
> --- a/fs/btrfs/block-group.c
> +++ b/fs/btrfs/block-group.c
> @@ -2694,10 +2694,16 @@ static int update_block_group_item(struct btrfs_trans_handle *trans,
> struct extent_buffer *leaf;
> struct btrfs_block_group_item bgi;
> struct btrfs_key key;
> + u64 used;
>
> /* No change in used bytes, can safely skip it. */
> - if (cache->commit_used == cache->used)
> + spin_lock(&cache->lock);
> + used = cache->used;
> + if (cache->commit_used == used) {
> + spin_unlock(&cache->lock);
> return 0;
> + }
> + spin_unlock(&cache->lock);
>
> key.objectid = cache->start;
> key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
> @@ -2712,13 +2718,14 @@ static int update_block_group_item(struct btrfs_trans_handle *trans,
>
> leaf = path->nodes[0];
> bi = btrfs_item_ptr_offset(leaf, path->slots[0]);
> - btrfs_set_stack_block_group_used(&bgi, cache->used);
> +
> + btrfs_set_stack_block_group_used(&bgi, used);
> btrfs_set_stack_block_group_chunk_objectid(&bgi,
> cache->global_root_id);
> btrfs_set_stack_block_group_flags(&bgi, cache->flags);
> write_extent_buffer(leaf, &bgi, bi, sizeof(bgi));
> btrfs_mark_buffer_dirty(leaf);
> - cache->commit_used = cache->used;
> + cache->commit_used = used;
> fail:
> btrfs_release_path(path);
> return ret;
next prev parent reply other threads:[~2022-09-07 22:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 6:37 [PATCH] btrfs: don't update the block group item if used bytes are the same Qu Wenruo
2022-07-11 8:30 ` Nikolay Borisov
2022-07-11 8:47 ` Qu Wenruo
2022-08-18 12:26 ` David Sterba
2022-09-02 12:51 ` David Sterba
2022-09-07 14:31 ` Josef Bacik
2022-09-07 17:29 ` Josef Bacik
2022-09-07 22:08 ` David Sterba
2022-09-07 22:20 ` Qu Wenruo [this message]
2022-09-07 22:35 ` Qu Wenruo
-- strict thread matches above, loose matches on Subject: below --
2022-09-09 6:45 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=8fe1128c-ebd9-87b6-a2ac-0a427223b456@gmx.com \
--to=quwenruo.btrfs@gmx.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.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