From: Johannes Thumshirn <Johannes.Thumshirn@wdc.com>
To: Daniel Vacek <neelx@suse.com>, Chris Mason <clm@fb.com>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>
Cc: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] btrfs: keep `priv` struct on stack for sync reads in `btrfs_encoded_read_regular_fill_pages()`
Date: Wed, 8 Jan 2025 12:42:23 +0000 [thread overview]
Message-ID: <9cca57da-3361-470d-83e5-0d78deffb673@wdc.com> (raw)
In-Reply-To: <20250108114326.1729250-1-neelx@suse.com>
On 08.01.25 12:44, Daniel Vacek wrote:
> Only allocate the `priv` struct from slab for asynchronous mode.
>
> There's no need to allocate an object from slab in the synchronous mode. In
> such a case stack can be happily used as it used to be before 68d3b27e05c7
> ("btrfs: move priv off stack in btrfs_encoded_read_regular_fill_pages()")
> which was a preparation for the async mode.
>
> While at it, fix the comment to reflect the atomic => refcount change in
> d29662695ed7 ("btrfs: fix use-after-free waiting for encoded read endios").
Generally I'm not a huge fan of conditional allocation/freeing. It just
complicates matters. I get it in case of the bio's bi_inline_vecs where
it's a optimization, but I fail to see why it would make a difference in
this case.
If we're really going down that route, there should at least be a
justification other than "no need" to.
> struct btrfs_encoded_read_private {
> - struct completion done;
> + struct completion *sync_reads;
> void *uring_ctx;
> - refcount_t pending_refs;
> + refcount_t pending_reads;
> blk_status_t status;
> };
These renames just make the diff harder to read (and yes I shouldn't
have renamed pending to pending_refs but that at least also changed the
type).
> - if (refcount_dec_and_test(&priv->pending_refs)) {
> - int err = blk_status_to_errno(READ_ONCE(priv->status));
> -
> + if (refcount_dec_and_test(&priv->pending_reads)) {
> if (priv->uring_ctx) {
> + int err = blk_status_to_errno(READ_ONCE(priv->status));
Missing newline after the declaration.
> unsigned long i = 0;
> struct btrfs_bio *bbio;
> - int ret;
That seems unrelated.
> @@ -9155,25 +9159,23 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
> disk_io_size -= bytes;
> } while (disk_io_size);
>
> - refcount_inc(&priv->pending_refs);
> + refcount_inc(&priv->pending_reads);
> btrfs_submit_bbio(bbio, 0);
>
> if (uring_ctx) {
> - if (refcount_dec_and_test(&priv->pending_refs)) {
> - ret = blk_status_to_errno(READ_ONCE(priv->status));
> - btrfs_uring_read_extent_endio(uring_ctx, ret);
> + if (refcount_dec_and_test(&priv->pending_reads)) {
> + int err = blk_status_to_errno(READ_ONCE(priv->status));
> + btrfs_uring_read_extent_endio(uring_ctx, err);
> kfree(priv);
Missing newline after the declaration, but still why can't we just keep ret?
next prev parent reply other threads:[~2025-01-08 12:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 11:43 Daniel Vacek
2025-01-08 12:42 ` Johannes Thumshirn [this message]
2025-01-08 15:24 ` Daniel Vacek
2025-01-08 18:27 ` David Sterba
2025-01-09 8:31 ` Daniel Vacek
2025-01-08 18:29 ` Johannes Thumshirn
2025-01-08 18:35 ` David Sterba
2025-01-09 8:41 ` Daniel Vacek
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=9cca57da-3361-470d-83e5-0d78deffb673@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neelx@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
all inboxes | Powered by JetHome®