From: Jeff Layton <jlayton@kernel.org>
To: Chris Mason <clm@fb.com>, David Sterba <dsterba@suse.com>,
Filipe Manana <fdmanana@suse.com>,
Josef Bacik <josef@toxicpanda.com>
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH] btrfs: don't let shrinker touch extent_maps that are being logged
Date: Mon, 29 Jun 2026 09:10:09 -0400 [thread overview]
Message-ID: <20260629-btrfs-skip-logging-v1-1-4e3a28c1acaf@kernel.org> (raw)
The extent map shrinker can free an extent map that is still owned by an
in-flight fsync and still linked on the inode's modified_extents list,
corrupting that list and eventually causing an RCU stall.
btrfs_scan_inode() currently skips EXTENT_FLAG_PINNED maps, then calls
btrfs_remove_extent_mapping() followed by btrfs_free_extent_map():
if (em->flags & EXTENT_FLAG_PINNED)
goto next;
...
btrfs_remove_extent_mapping(inode, em);
btrfs_free_extent_map(em);
But btrfs_remove_extent_mapping() deliberately does NOT unlink a map that
has EXTENT_FLAG_LOGGING set:
if (!(em->flags & EXTENT_FLAG_LOGGING))
list_del_init(&em->list);
remove_em(inode, em);
This sets up a UAF situation where a later fsync() can trip over the
now-freed extent_map still on the modified_extents() list.
Fix it by having the shrinker skip maps that are being logged, the same
way it skips pinned maps. Such a map is owned by the in-flight fsync and
will become reclaimable again once logging clears the flag.
Fixes: 956a17d9d050 ("btrfs: add a shrinker for extent maps")
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
We've started hitting a number of these problems in our fleet. It
seems to mostly happen on ARM64 architecture, but there have been some
WARN_ONs that popped on x86_64 too.
---
fs/btrfs/extent_map.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index fce9c5cc0122..128f7800e101 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -1166,7 +1166,13 @@ static long btrfs_scan_inode(struct btrfs_inode *inode, struct btrfs_em_shrink_c
em = rb_entry(node, struct extent_map, rb_node);
ctx->scanned++;
- if (em->flags & EXTENT_FLAG_PINNED)
+ /*
+ * Skip extent maps that are pinned or are being logged. The
+ * i_mmap_lock should prevent this from seeing LOGGING on extent_maps
+ * directly associated with inode, but em may be associated with
+ * other, dependent inodes and their locks are not held.
+ */
+ if (em->flags & (EXTENT_FLAG_PINNED | EXTENT_FLAG_LOGGING))
goto next;
/*
---
base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
change-id: 20260629-btrfs-skip-logging-3e31701d9647
Best regards,
--
Jeff Layton <jlayton@kernel.org>
next reply other threads:[~2026-06-29 13:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-29 13:10 Jeff Layton [this message]
2026-06-29 14:19 ` [PATCH] btrfs: don't let shrinker touch extent_maps that are being logged Filipe Manana
2026-06-29 14:56 ` Jeff Layton
2026-06-29 15:06 ` Filipe Manana
2026-06-29 15:47 ` Filipe Manana
2026-06-30 12:28 ` Jeff Layton
2026-06-30 14:06 ` 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=20260629-btrfs-skip-logging-v1-1-4e3a28c1acaf@kernel.org \
--to=jlayton@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=fdmanana@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@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