bcachefs: Tweak btree cache helpers for use by btree node scan
PATCH 1/2 bcachefs: Tweak btree cache helpers for use by btree node scan
btree node scan needs to not use the btree node cache: that causes interference from prior failed reads and parallel workers.
Instead we need to allocate btree nodes that don't live in the btree cache, so that we can call bch2_btree_node_read_done() directly.
This patch tweaks the low level helpers so they don't touch the btree cache lists.
--- fs/bcachefs/btree_cache.c | 21 ++++++++++++--------- fs/bcachefs/btree_cache.h | 1 + fs/bcachefs/debug.c | 2 -- 3 files changed, 13 insertions(+), 11 deletions(-)
fs/bcachefs/btree_cache.c +12 -9
@@ -86,7 +86,7 @@ void bch2_btree_node_to_freelist(struct bch_fs *c, struct btree *b)six_unlock_intent (&b->c.lock); } -static void __btree_node_data_free (struct btree_cache *bc,struct btree *b) +void __btree_node_data_free (struct btree *b) {BUG_ON (!list_empty (&b->list));BUG_ON (btree_node_hashed (b));
@@ -113,16 +113,17 @@ static void __btree_node_data_free(struct btree_cache *bc, struct btree *b)munmap (b->aux_data,btree_aux_data_bytes (b));#endif b->aux_data =NULL ; - -btree_node_to_freedlist (bc, b); }static void btree_node_data_free (struct btree_cache *bc,struct btree *b) {BUG_ON (list_empty (&b->list));list_del_init (&b->list); + +__btree_node_data_free (b); + --bc->nr_freeable; -__btree_node_data_free (bc, b); +btree_node_to_freedlist (bc, b); } static int bch2_btree_cache_cmp_fn(struct rhashtable_compare_arg *arg,
@@ -199,8 +200,6 @@ struct btree *__bch2_btree_node_mem_alloc(struct bch_fs *c) }bch2_btree_lock_init (&b->c,0 ,GFP_KERNEL ); - -__bch2_btree_node_to_freelist (bc, b);return b; }
@@ -526,7 +525,8 @@ static unsigned long bch2_btree_cache_scan(struct shrinker *shrink, --touched;; }else if (!btree_node_reclaim (c, b)) {__bch2_btree_node_hash_remove (bc, b); -__btree_node_data_free (bc, b); +__btree_node_data_free (b); +btree_node_to_freedlist (bc, b); freed++; bc->nr_freed++;
@@ -667,9 +667,12 @@ int bch2_fs_btree_cache_init(struct bch_fs *c)bch2_recalc_btree_reserve (c); -for (i =0 ; i < bc->nr_reserve; i++) -if (!__bch2_btree_node_mem_alloc (c)) +for (i =0 ; i < bc->nr_reserve; i++) { +struct btree *b =__bch2_btree_node_mem_alloc (c); +if (!b) goto err; +__bch2_btree_node_to_freelist (bc, b); + }list_splice_init (&bc->live[0 ].list, &bc->freeable);
fs/bcachefs/btree_cache.h +1 -0
@@ -30,6 +30,7 @@ void bch2_btree_node_update_key_early(struct btree_trans *, enum btree_id, unsigvoid bch2_btree_cache_cannibalize_unlock (struct btree_trans *);int bch2_btree_cache_cannibalize_lock (struct btree_trans *,struct closure *); +void __btree_node_data_free (struct btree *);struct btree *__bch2_btree_node_mem_alloc (struct bch_fs *);struct btree *bch2_btree_node_mem_alloc (struct btree_trans *,bool );
fs/bcachefs/debug.c +0 -2
@@ -153,8 +153,6 @@ void __bch2_btree_verify(struct bch_fs *c, struct btree *b) c->verify_data =__bch2_btree_node_mem_alloc (c);if (!c->verify_data) goto out; - -list_del_init (&c->verify_data->list); }BUG_ON (b->nsets !=1 );
Signature · 1 line
2.50.0
PATCH 2/2 bcachefs: btree node scan no longer uses btree cache
Previously, btree node scan used the btree node cache to check if btree nodes were readable, but this is subject to interference from threads scanning different devices trying to read the same node - and more critically, nodes that we already attempted and failed to read before kicking off scan.
Instead, we now allocate a 'struct btree' that does not live in the btree node cache, and call bch2_btree_node_read_done() directly.
--- fs/bcachefs/btree_node_scan.c | 70 ++++++++++++++--------------------- 1 file changed, 27 insertions(+), 43 deletions(-)
fs/bcachefs/btree_node_scan.c +27 -43
@@ -75,39 +75,6 @@ static inline u64 bkey_journal_seq(struct bkey_s_c k) } } -static bool found_btree_node_is_readable (struct btree_trans *trans, -struct found_btree_node *f) -{ - struct { __BKEY_PADDED(k, BKEY_BTREE_PTR_VAL_U64s_MAX); } tmp; - -found_btree_node_to_key (&tmp.k, f); - -struct btree *b =bch2_btree_node_get_noiter (trans, &tmp.k, f->btree_id, f->level, false); -bool ret = !IS_ERR_OR_NULL (b); -if (!ret) -return ret; - - f->sectors_written = b->written; - f->journal_seq =le64_to_cpu (b->data->keys.journal_seq); - -struct bkey_s_c k; -struct bkey unpacked; -struct btree_node_iter iter; -for_each_btree_node_key_unpack (b, k, &iter, &unpacked) - f->journal_seq =max (f->journal_seq,bkey_journal_seq (k)); - -six_unlock_read (&b->c.lock); - -/* -* We might update this node's range; if that happens, we need the node -* to be re-read so the read path can trim keys that are no longer in -* this node -*/ -if (b !=btree_node_root (trans->c, b)) -bch2_btree_node_evict (trans, &tmp.k); -return ret; -} -static int found_btree_node_cmp_cookie (const void *_l,const void *_r) {const struct found_btree_node *l = _l;
@@ -159,17 +126,17 @@ static const struct min_heap_callbacks found_btree_node_heap_cbs = { };static void try_read_btree_node (struct find_btree_nodes *f,struct bch_dev *ca, -struct bio *bio,struct btree_node *bn,u64 offset) +struct btree *b,struct bio *bio,u64 offset) { struct bch_fs *c = container_of(f, struct bch_fs, found_btree_nodes); +struct btree_node *bn = b->data;bio_reset (bio, ca->disk_sb.bdev,REQ_OP_READ ); bio->bi_iter.bi_sector = offset; -bch2_bio_map (bio, bn,PAGE_SIZE ); +bch2_bio_map (bio, b->data, c->opts.block_size);u64 submit_time =local_clock ();submit_bio_wait (bio); -bch2_account_io_completion (ca, BCH_MEMBER_ERROR_read, submit_time, !bio->bi_status);if (bio->bi_status) {
@@ -201,6 +168,14 @@ static void try_read_btree_node(struct find_btree_nodes *f, struct bch_dev *ca,if (BTREE_NODE_ID (bn) >=BTREE_ID_NR_MAX )return ; +bio_reset (bio, ca->disk_sb.bdev,REQ_OP_READ ); + bio->bi_iter.bi_sector = offset; +bch2_bio_map (bio, b->data, c->opts.btree_node_size); + + submit_time =local_clock (); +submit_bio_wait (bio); +bch2_account_io_completion (ca, BCH_MEMBER_ERROR_read, submit_time, !bio->bi_status); +rcu_read_lock ();struct found_btree_node n = { .btree_id =BTREE_NODE_ID (bn),
@@ -217,7 +192,10 @@ static void try_read_btree_node(struct find_btree_nodes *f, struct bch_dev *ca, };rcu_read_unlock (); -if (bch2_trans_run (c,found_btree_node_is_readable (trans, &n))) { +found_btree_node_to_key (&b->key, &n); + +CLASS (printbuf, buf)(); +if (!bch2_btree_node_read_done (c, ca, b,NULL , &buf)) {mutex_lock (&f->lock);if (BSET_BIG_ENDIAN (&bn->keys) !=CPU_BIG_ENDIAN ) {bch_err (c,"try_read_btree_node() can't handle endian conversion" );
@@ -237,12 +215,18 @@ static int read_btree_nodes_worker(void *p)struct find_btree_nodes_worker *w = p; struct bch_fs *c = container_of(w->f, struct bch_fs, found_btree_nodes);struct bch_dev *ca = w->ca; -void *buf = (void *)__get_free_page (GFP_KERNEL ); -struct bio *bio =bio_alloc (NULL ,1 ,0 ,GFP_KERNEL );unsigned long last_print = jiffies; -if (!buf || !bio) { -bch_err (c,"read_btree_nodes_worker: error allocating bio/buf" ); +struct btree *b =__bch2_btree_node_mem_alloc (c); +if (!b) { +bch_err (c,"read_btree_nodes_worker: error allocating buf" ); + w->f->ret = -ENOMEM ; + goto err; + } + +struct bio *bio =bio_alloc (NULL ,buf_pages (b->data, c->opts.btree_node_size),0 ,GFP_KERNEL ); +if (!bio) { +bch_err (c,"read_btree_nodes_worker: error allocating bio" ); w->f->ret = -ENOMEM ; goto err; }
@@ -266,11 +250,11 @@ static int read_btree_nodes_worker(void *p) !bch2_dev_btree_bitmap_marked_sectors(ca, sector, btree_sectors(c))) continue; -try_read_btree_node (w->f, ca, bio, buf, sector); +try_read_btree_node (w->f, ca, b, bio, sector); } err: +__btree_node_data_free (b);bio_put (bio); -free_page ((unsigned long ) buf);enumerated_ref_put (&ca->io_ref[READ ], BCH_DEV_READ_REF_btree_node_scan);closure_put (w->cl);kfree (w);
Signature · 1 line
2.50.0