From: Werner Kasselman <werner@verivus.ai>
To: "linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Cc: "wqu@suse.com" <wqu@suse.com>,
"dsterba@suse.com" <dsterba@suse.com>,
"josef@toxicpanda.com" <josef@toxicpanda.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Werner Kasselman <werner@verivus.ai>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: [PATCH] btrfs: fix subpage state mismatch in cow_fixup writeback path
Date: Mon, 16 Mar 2026 10:56:56 +0000 [thread overview]
Message-ID: <20260316105654.710798-1-werner@verivus.com> (raw)
writepage_delalloc() marks all dirty sectors as locked via
btrfs_folio_set_lock(), setting bits in the subpage locked bitmap and
incrementing nr_locked. These are cleaned up by
btrfs_folio_end_lock_bitmap() at the end of extent_writepage().
However, when btrfs_writepage_cow_fixup() returns -EAGAIN inside
extent_writepage_io(), the code calls folio_unlock() directly and
returns 1, causing extent_writepage() to skip the bitmap cleanup:
ret = btrfs_writepage_cow_fixup(folio);
if (ret == -EAGAIN) {
folio_redirty_for_writepage(bio_ctrl->wbc, folio);
folio_unlock(folio); // doesn't clear locked bitmap
return 1; // caller skips end_lock_bitmap()
}
This leaves the subpage locked bitmap out of sync with the folio lock
state: the folio is unlocked but its subpage locked bitmap still has
bits set and nr_locked is elevated. When writeback retries the folio,
btrfs_folio_set_lock() hits the ASSERT at subpage.c:746 because the
bits are still set from the previous attempt.
The cow_fixup path is largely a legacy path -- the GUP dirty-without-
informing-fs issue that triggered it has been fixed on the GUP side,
and experimental builds already catch this case with -EUCLEAN before
reaching the -EAGAIN return. However the subpage state mismatch is
still a correctness issue for non-experimental builds under error
injection or memory pressure (kzalloc failure in
btrfs_writepage_cow_fixup()).
Fix this by replacing folio_unlock() with btrfs_folio_end_lock_bitmap(),
which properly clears the locked bitmap bits before unlocking. For
non-subpage or when nr_locked is 0 (e.g. called from
extent_write_locked_range()), btrfs_folio_end_lock_bitmap() falls
through to plain folio_unlock(), so existing behavior is preserved.
Fixes: d034cdb4cc8a ("btrfs: lock subpage ranges in one go for writepage_delalloc()")
CC: stable@vger.kernel.org
Signed-off-by: Werner Kasselman <werner@verivus.com>
---
fs/btrfs/extent_io.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5f97a3d2a8d7..c7b25e415498 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1746,7 +1746,13 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
if (ret == -EAGAIN) {
/* Fixup worker will requeue */
folio_redirty_for_writepage(bio_ctrl->wbc, folio);
- folio_unlock(folio);
+ /*
+ * For subpage case, writepage_delalloc() may have set locked
+ * bitmap bits for this folio. We need to clear them or
+ * btrfs_folio_set_lock() will ASSERT when writeback retries.
+ */
+ btrfs_folio_end_lock_bitmap(fs_info, folio,
+ bio_ctrl->submit_bitmap);
return 1;
}
if (ret < 0) {
--
2.43.0
reply other threads:[~2026-03-16 10:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260316105654.710798-1-werner@verivus.com \
--to=werner@verivus.ai \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@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