From: Boris Burkov <boris@bur.io>
To: Qu Wenruo <wqu@suse.com>
Cc: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH 1/7] btrfs: correctly model root qgroup rsv in convert
Date: Wed, 27 Mar 2024 10:20:31 -0700 [thread overview]
Message-ID: <20240327172031.GA2470028@zen.localdomain> (raw)
In-Reply-To: <245057c8-e7fb-4ad0-9e88-d21ae31cf375@suse.com>
On Wed, Mar 27, 2024 at 08:30:47AM +1030, Qu Wenruo wrote:
>
>
> 在 2024/3/27 08:09, Boris Burkov 写道:
> > We use add_root_meta_rsv and sub_root_meta_rsv to track prealloc and
> > pertrans reservations for subvols when quotas are enabled. The convert
> > function does not properly increment pertrans after decrementing
> > prealloc, so the count is not accurate.
> >
> > Note: we check that the fs is not read-only to mirror the logic in
> > qgroup_convert_meta, which checks that before adding to the pertrans rsv.
> >
> > Fixes: 8287475a2055 ("btrfs: qgroup: Use root::qgroup_meta_rsv_* to record qgroup meta reserved space")
> > Signed-off-by: Boris Burkov <boris@bur.io>
> > ---
> > fs/btrfs/qgroup.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
> > index a8197e25192c..2cba6451d164 100644
> > --- a/fs/btrfs/qgroup.c
> > +++ b/fs/btrfs/qgroup.c
> > @@ -4492,6 +4492,8 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes)
> > BTRFS_QGROUP_RSV_META_PREALLOC);
> > trace_qgroup_meta_convert(root, num_bytes);
> > qgroup_convert_meta(fs_info, root->root_key.objectid, num_bytes);
> > + if (!sb_rdonly(fs_info->sb))
> > + add_root_meta_rsv(root, num_bytes, BTRFS_QGROUP_RSV_META_PERTRANS);
>
> Don't we already call qgroup_rsv_add() inside qgroup_convert_meta()?
> This sounds like a double add here.
qgroup_rsv_add doesn't call add_root_meta_rsv. AFAICT, this is the
separate accounting in root->qgroup_meta_rsv_pertrans to fixup underflow
errors as we free.
>
> And if you have any example to show the problem in a more detailed way, it
> would be great help.
I don't have a reproducer for this, it was just something I noticed. I'm
fine to drop this patch if you don't think it's worth the churn (and
certainly if I'm just a dummy and didn't see where we already call it)
In fact, this counter only exists to avoid underflow, but PERTRANS is
cleared by exact amount, and not via btrfs_qgroup_free_meta_pertrans, so
it might just be moot to track it at all in this way.
>
> Thanks,
> Qu
> > }
> > /*
next prev parent reply other threads:[~2024-03-27 17:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-26 21:39 [PATCH 0/7] btrfs: various qg meta rsv leak fixes Boris Burkov
2024-03-26 21:39 ` [PATCH 1/7] btrfs: correctly model root qgroup rsv in convert Boris Burkov
2024-03-26 22:00 ` Qu Wenruo
2024-03-27 17:20 ` Boris Burkov [this message]
2024-03-27 19:35 ` Qu Wenruo
2024-03-26 21:39 ` [PATCH 2/7] btrfs: fix qgroup prealloc rsv leak in subvolume operations Boris Burkov
2024-03-26 22:07 ` Qu Wenruo
2024-03-26 21:39 ` [PATCH 3/7] btrfs: record delayed inode root in transaction Boris Burkov
2024-03-26 22:08 ` Qu Wenruo
2024-03-27 17:21 ` Boris Burkov
2024-03-26 21:39 ` [PATCH 4/7] btrfs: convert PREALLOC to PERTRANS after record_root_in_trans Boris Burkov
2024-03-26 22:12 ` Qu Wenruo
2024-03-26 21:39 ` [PATCH 5/7] btrfs: free pertrans at end of cleanup_transaction Boris Burkov
2024-03-26 22:16 ` Qu Wenruo
2024-03-27 17:22 ` Boris Burkov
2024-03-27 19:51 ` Qu Wenruo
2024-03-26 21:39 ` [PATCH 6/7] btrfs: btrfs_clear_delalloc_extent frees rsv Boris Burkov
2024-03-26 22:26 ` Qu Wenruo
2024-03-27 17:26 ` Boris Burkov
2024-03-27 19:39 ` Qu Wenruo
2024-03-26 21:39 ` [PATCH 7/7] btrfs: always clear meta pertrans during commit Boris Burkov
2024-03-26 22:20 ` 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=20240327172031.GA2470028@zen.localdomain \
--to=boris@bur.io \
--cc=kernel-team@fb.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