bcachefs: btree key cache asserts

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c
index 669825f89cdd849c5ac4e3b6713b18689c284b96..b8efe2fddbc4418ed03e5986bc826777fa221886 100644 (file)
--- a/fs/bcachefs/btree_key_cache.c
+++ b/fs/bcachefs/btree_key_cache.c
@@ -101,8 +101,8 @@ static void __bkey_cached_free(struct rcu_pending *pending, struct rcu_head *rcu
        kmem_cache_free(bch2_key_cache, ck);
 }
 
-static void bkey_cached_free(struct btree_key_cache *bc,
-                            struct bkey_cached *ck)
+static inline void bkey_cached_free_noassert(struct btree_key_cache *bc,
+                                     struct bkey_cached *ck)
 {
        kfree(ck->k);
        ck->k           = NULL;
@@ -116,6 +116,19 @@ static void bkey_cached_free(struct btree_key_cache *bc,
        this_cpu_inc(*bc->nr_pending);
 }
 
+static void bkey_cached_free(struct btree_trans *trans,
+                            struct btree_key_cache *bc,
+                            struct bkey_cached *ck)
+{
+       /*
+        * we'll hit strange issues in the SRCU code if we aren't holding an
+        * SRCU read lock...
+        */
+       EBUG_ON(!trans->srcu_held);
+
+       bkey_cached_free_noassert(bc, ck);
+}
+
 static struct bkey_cached *__bkey_cached_alloc(unsigned key_u64s, gfp_t gfp)
 {
        gfp |= __GFP_ACCOUNT|__GFP_RECLAIMABLE;
@@ -281,7 +294,7 @@ static int btree_key_cache_create(struct btree_trans *trans,
        ck_path->uptodate = BTREE_ITER_UPTODATE;
        return 0;
 err:
-       bkey_cached_free(bc, ck);
+       bkey_cached_free(trans, bc, ck);
        mark_btree_node_locked_noreset(ck_path, 0, BTREE_NODE_UNLOCKED);
 
        return ret;
@@ -511,7 +524,7 @@ evict:
 
                mark_btree_node_locked_noreset(path, 0, BTREE_NODE_UNLOCKED);
                if (bkey_cached_evict(&c->btree_key_cache, ck)) {
-                       bkey_cached_free(&c->btree_key_cache, ck);
+                       bkey_cached_free(trans, &c->btree_key_cache, ck);
                } else {
                        six_unlock_write(&ck->c.lock);
                        six_unlock_intent(&ck->c.lock);
@@ -625,7 +638,7 @@ void bch2_btree_key_cache_drop(struct btree_trans *trans,
        }
 
        bkey_cached_evict(bc, ck);
-       bkey_cached_free(bc, ck);
+       bkey_cached_free(trans, bc, ck);
 
        mark_btree_node_locked(trans, path, 0, BTREE_NODE_UNLOCKED);
 
@@ -693,7 +706,7 @@ static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink,
                        } else if (!bkey_cached_lock_for_evict(ck)) {
                                bc->skipped_lock_fail++;
                        } else if (bkey_cached_evict(bc, ck)) {
-                               bkey_cached_free(bc, ck);
+                               bkey_cached_free_noassert(bc, ck);
                                bc->freed++;
                                freed++;
                        } else {