From: Alan Huang Date: Thu, 10 Oct 2024 13:21:50 +0000 (+0800) Subject: bcachefs: Do not allow no fail lock request to fail X-Git-Tag: v6.14-rc1~204^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ef9ab34f442f7236b5a84a6691959c67639f8b9;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Do not allow no fail lock request to fail If the transaction chose itself as a victim before and restarted, it might request a no fail lock request this time. But it might be added to others' lock graph and be chose as the victim again, it's no longer safe without additional check. We can also convert the cycle detector to be fully RCU-based to solve that unsoundness, but the latency added to trans_put and additional memory required may not worth it. Signed-off-by: Alan Huang Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c index c1a0f8f78eb42..771d531d6533f 100644 --- a/fs/bcachefs/btree_locking.c +++ b/fs/bcachefs/btree_locking.c @@ -281,7 +281,7 @@ int bch2_check_for_deadlock(struct btree_trans *trans, struct printbuf *cycle) g.nr = 0; - if (trans->lock_must_abort) { + if (trans->lock_must_abort && !trans->lock_may_not_fail) { if (cycle) return -1;