Skip to content

Commit f085448

Browse files
zoumingzheaxboe
authored andcommitted
bcache: fixup btree_cache_wait list damage
We get a kernel crash about "list_add corruption. next->prev should be prev (ffff9c801bc01210), but was ffff9c77b688237c. (next=ffffae586d8afe68)." crash> struct list_head 0xffff9c801bc01210 struct list_head { next = 0xffffae586d8afe68, prev = 0xffffae586d8afe68 } crash> struct list_head 0xffff9c77b688237c struct list_head { next = 0x0, prev = 0x0 } crash> struct list_head 0xffffae586d8afe68 struct list_head struct: invalid kernel virtual address: ffffae586d8afe68 type: "gdb_readmem_callback" Cannot access memory at address 0xffffae586d8afe68 [230469.019492] Call Trace: [230469.032041] prepare_to_wait+0x8a/0xb0 [230469.044363] ? bch_btree_keys_free+0x6c/0xc0 [escache] [230469.056533] mca_cannibalize_lock+0x72/0x90 [escache] [230469.068788] mca_alloc+0x2ae/0x450 [escache] [230469.080790] bch_btree_node_get+0x136/0x2d0 [escache] [230469.092681] bch_btree_check_thread+0x1e1/0x260 [escache] [230469.104382] ? finish_wait+0x80/0x80 [230469.115884] ? bch_btree_check_recurse+0x1a0/0x1a0 [escache] [230469.127259] kthread+0x112/0x130 [230469.138448] ? kthread_flush_work_fn+0x10/0x10 [230469.149477] ret_from_fork+0x35/0x40 bch_btree_check_thread() and bch_dirty_init_thread() may call mca_cannibalize() to cannibalize other cached btree nodes. Only one thread can do it at a time, so the op of other threads will be added to the btree_cache_wait list. We must call finish_wait() to remove op from btree_cache_wait before free it's memory address. Otherwise, the list will be damaged. Also should call bch_cannibalize_unlock() to release the btree_cache_alloc_lock and wake_up other waiters. Fixes: 8e71022 ("bcache: make bch_btree_check() to be multithreaded") Fixes: b144e45 ("bcache: make bch_sectors_dirty_init() to be multithreaded") Cc: [email protected] Signed-off-by: Mingzhe Zou <[email protected]> Signed-off-by: Coly Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 80fca8a commit f085448

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

drivers/md/bcache/btree.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ static struct btree *mca_cannibalize(struct cache_set *c, struct btree_op *op,
885885
* cannibalize_bucket() will take. This means every time we unlock the root of
886886
* the btree, we need to release this lock if we have it held.
887887
*/
888-
static void bch_cannibalize_unlock(struct cache_set *c)
888+
void bch_cannibalize_unlock(struct cache_set *c)
889889
{
890890
spin_lock(&c->btree_cannibalize_lock);
891891
if (c->btree_cache_alloc_lock == current) {
@@ -1970,6 +1970,15 @@ static int bch_btree_check_thread(void *arg)
19701970
c->gc_stats.nodes++;
19711971
bch_btree_op_init(&op, 0);
19721972
ret = bcache_btree(check_recurse, p, c->root, &op);
1973+
/*
1974+
* The op may be added to cache_set's btree_cache_wait
1975+
* in mca_cannibalize(), must ensure it is removed from
1976+
* the list and release btree_cache_alloc_lock before
1977+
* free op memory.
1978+
* Otherwise, the btree_cache_wait will be damaged.
1979+
*/
1980+
bch_cannibalize_unlock(c);
1981+
finish_wait(&c->btree_cache_wait, &(&op)->wait);
19731982
if (ret)
19741983
goto out;
19751984
}

drivers/md/bcache/btree.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ void bch_initial_gc_finish(struct cache_set *c);
282282
void bch_moving_gc(struct cache_set *c);
283283
int bch_btree_check(struct cache_set *c);
284284
void bch_initial_mark_key(struct cache_set *c, int level, struct bkey *k);
285+
void bch_cannibalize_unlock(struct cache_set *c);
285286

286287
static inline void wake_up_gc(struct cache_set *c)
287288
{

drivers/md/bcache/writeback.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,16 @@ static int bch_root_node_dirty_init(struct cache_set *c,
890890
if (ret < 0)
891891
pr_warn("sectors dirty init failed, ret=%d!\n", ret);
892892

893+
/*
894+
* The op may be added to cache_set's btree_cache_wait
895+
* in mca_cannibalize(), must ensure it is removed from
896+
* the list and release btree_cache_alloc_lock before
897+
* free op memory.
898+
* Otherwise, the btree_cache_wait will be damaged.
899+
*/
900+
bch_cannibalize_unlock(c);
901+
finish_wait(&c->btree_cache_wait, &(&op.op)->wait);
902+
893903
return ret;
894904
}
895905

0 commit comments

Comments
 (0)