diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-12-29 13:50:19 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-16 16:48:39 -0500 |
commit | b25760f0565e20f78bb76d6596842f4f8ae9106a (patch) | |
tree | 74181120e4ed3611e70f474b6c58628e037db1b0 | |
parent | f6353fd3077f02783616146b51278f943e6d74ce (diff) |
bcachefs: Check for btree locks held on transaction init
Ideally we would disallow multiple btree_trans being initialized within
the same process - and hopefully we will at some point, the stack usage
is excessive - but for now there are a couple places where we do this:
- transaction commit error path -> journal reclaim - btree key cache
flush
- move data path -> do_pending_writes -> write path -> bucket
allocation (in the near future when bucket allocation switches to
using a freespace btree)
In order to avoid deadlocking the first btree_trans must have been
unlocked with bch2_trans_unlock() before using the second btree_trans -
this patch adds an assertion to bch2_trans_init() that verifies that
this has been done when lockdep is enabled.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r-- | fs/bcachefs/btree_iter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index ba196bdcabc5..7a68b89bc1bf 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -2963,6 +2963,8 @@ struct btree_trans *__bch2_trans_get(struct bch_fs *c, unsigned fn_idx) { struct btree_trans *trans; + bch2_assert_btree_nodes_not_locked(); + if (IS_ENABLED(__KERNEL__)) { trans = this_cpu_xchg(c->btree_trans_bufs->trans, NULL); if (trans) { |