From: Deepanshu Kartikey <kartikey406@gmail.com>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org,
Deepanshu Kartikey <kartikey406@gmail.com>,
syzbot+cb91f22d8a581fc19edf@syzkaller.appspotmail.com,
Deepanshu Kartikey <Kartikey406@gmail.com>
Subject: [PATCH] bcachefs: Fix deadlocks between fallocate and readahead
Date: Sat, 27 Sep 2025 13:55:03 +0530 [thread overview]
Message-ID: <20250927082503.40951-1-kartikey406@gmail.com> (raw)
There are ABBA deadlocks between fallocate and readahead operations
at two locations in __bchfs_fallocate():
Thread 1 (fallocate):
bch2_fallocate_dispatch
inode_lock(&inode->v)
bch2_pagecache_block_get(inode) // Acquires two_state_lock
__bchfs_fallocate
bch2_clamp_data_hole (or bch2_mark_pagecache_reserved)
bch2_seek_pagecache_hole
__filemap_get_folio
folio_lock() // BLOCKS - Thread 2 holds it
Thread 2 (readahead via copy_file_range):
bch2_readahead
folio_lock() // Holds page lock
__bch2_two_state_lock(&pagecache_lock) // BLOCKS - Thread 1 holds it
The issue is that drop_locks_do() only releases btree transaction locks,
but Thread 2 is blocked waiting for the two_state_lock (pagecache_block)
held by bch2_pagecache_block_get().
Fix by explicitly releasing and re-acquiring the pagecache_block lock
around both blocking operations (bch2_clamp_data_hole and
bch2_mark_pagecache_reserved), following the same pattern used in
bch2_page_fault(). Force a transaction restart after lock release to
ensure consistency.
Reported-by: syzbot+cb91f22d8a581fc19edf@syzkaller.appspotmail.com
Tested-by: syzbot+cb91f22d8a581fc19edf@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?extid=cb91f22d8a581fc19edf
Signed-off-by: Deepanshu Kartikey <Kartikey406@gmail.com>
---
fs/bcachefs/fs-io.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index a233f45875e9..66a60e5f03fc 100644
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -694,13 +694,19 @@ static noinline int __bchfs_fallocate(struct bch_inode_info *inode, int mode,
&hole_start,
&hole_end,
opts.data_replicas, true)) {
+ /* Release pagecache_block to prevent deadlock with readahead */
+ bch2_pagecache_block_put(inode);
ret = drop_locks_do(trans,
(bch2_clamp_data_hole(&inode->v,
&hole_start,
&hole_end,
opts.data_replicas, false), 0));
+ bch2_pagecache_block_get(inode);
if (ret)
goto bkey_err;
+ /* Force transaction restart to revalidate state */
+ ret = -BCH_ERR_transaction_restart;
+ goto bkey_err;
}
bch2_btree_iter_set_pos(trans, &iter, POS(iter.pos.inode, hole_start));
@@ -730,11 +736,17 @@ static noinline int __bchfs_fallocate(struct bch_inode_info *inode, int mode,
if (bch2_mark_pagecache_reserved(inode, &hole_start,
iter.pos.offset, true)) {
+ /* Release pagecache_block to prevent deadlock */
+ bch2_pagecache_block_put(inode);
+
ret = drop_locks_do(trans,
bch2_mark_pagecache_reserved(inode, &hole_start,
iter.pos.offset, false));
+ bch2_pagecache_block_get(inode);
if (ret)
goto bkey_err;
+ ret = -BCH_ERR_transaction_restart;
+ goto bkey_err;
}
bkey_err:
bch2_quota_reservation_put(c, inode, "a_res);
--
2.43.0
next reply other threads:[~2025-09-27 8:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-27 8:25 Deepanshu Kartikey [this message]
2025-09-27 8:40 ` Kent Overstreet
2025-09-27 9:06 Deepanshu Kartikey
2025-09-29 7:56 Deepanshu Kartikey
2025-09-29 9:10 Deepanshu Kartikey
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=20250927082503.40951-1-kartikey406@gmail.com \
--to=kartikey406@gmail.com \
--cc=kent.overstreet@linux.dev \
--cc=linux-bcachefs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syzbot+cb91f22d8a581fc19edf@syzkaller.appspotmail.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®