From: Qu Wenruo <wqu@suse.com>
To: Shuangpeng Bai <shuangpeng.kernel@gmail.com>,
linux-btrfs@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, clm@fb.com, dsterba@suse.com,
fdmanana@suse.com, jbacik@fb.com, stable@vger.kernel.org
Subject: Re: [PATCH v2] btrfs: fix extent map leak in NOCOW direct I/O write
Date: Sun, 5 Jul 2026 15:27:57 +0930 [thread overview]
Message-ID: <7fd6b604-ca23-4881-8727-43a98aa0521a@suse.com> (raw)
In-Reply-To: <20260705054637.80584-1-shuangpeng.kernel@gmail.com>
在 2026/7/5 15:16, Shuangpeng Bai 写道:
> btrfs_dio_iomap_begin() calls btrfs_get_extent(), which returns an
> extent map reference that must be dropped on all exit paths.
>
> For direct writes into a NOCOW range, btrfs_get_blocks_direct_write()
> keeps using that extent map and asks btrfs_create_dio_extent() to
> allocate the ordered extent. If that fails, for example because
> btrfs_alloc_ordered_extent() fails, the function returns the error
> without dropping the input extent map. The PREALLOC path avoided this by
> dropping the input extent map before replacing it with the newly
> created one.
>
> Check the error from btrfs_create_dio_extent() before replacing the
> map and drop the input extent map on failure.
>
> Fixes: 5f9a8a51d8b9 ("Btrfs: add semaphore to synchronize direct IO writes with fsync")
> Cc: stable@vger.kernel.org
> Signed-off-by: Shuangpeng Bai <shuangpeng.kernel@gmail.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Thanks,
Qu
> ---
> Changes since v1:
> - Add a comment explaining the returned @em2 pointer.
> - Use @em2 to decide whether to replace the old extent map and assert
> that this only happens for PREALLOC writes.
>
> fs/btrfs/direct-io.c | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/direct-io.c b/fs/btrfs/direct-io.c
> index 460326d34143..19a1259b3b2f 100644
> --- a/fs/btrfs/direct-io.c
> +++ b/fs/btrfs/direct-io.c
> @@ -281,17 +281,24 @@ static int btrfs_get_blocks_direct_write(struct extent_map **map,
> em2 = btrfs_create_dio_extent(BTRFS_I(inode), dio_data, start,
> &file_extent, type);
> btrfs_dec_nocow_writers(bg);
> - if (type == BTRFS_ORDERED_PREALLOC) {
> - btrfs_free_extent_map(em);
> - *map = em2;
> - em = em2;
> - }
> -
> if (IS_ERR(em2)) {
> ret = PTR_ERR(em2);
> + btrfs_free_extent_map(em);
> + *map = NULL;
> goto out;
> }
>
> + /*
> + * True NOCOW writes don't need to create a new extent map,
> + * while PREALLOC writes must replace the existing one.
> + */
> + if (em2) {
> + ASSERT(type == BTRFS_ORDERED_PREALLOC);
> + btrfs_free_extent_map(em);
> + *map = em2;
> + em = em2;
> + }
> +
> dio_data->nocow_done = true;
> } else {
> /* Our caller expects us to free the input extent map. */
next prev parent reply other threads:[~2026-07-05 5:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-05 5:46 Shuangpeng Bai
2026-07-05 5:57 ` Qu Wenruo [this message]
2026-07-06 11:24 ` Filipe Manana
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=7fd6b604-ca23-4881-8727-43a98aa0521a@suse.com \
--to=wqu@suse.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=fdmanana@suse.com \
--cc=jbacik@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shuangpeng.kernel@gmail.com \
--cc=stable@vger.kernel.org \
/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®