backpointers cleanup and prep
cover backpointers cleanup and prep
all small stuff, getting ready for killing off the (very expensive!) backpointers fsck passes
Kent Overstreet (7):
bcachefs: fix bp_pos_to_bucket_nodev_noerror
bcachefs: bucket_pos_to_bp_end()
bcachefs: Drop swab code for backpointers in alloc keys
bcachefs: bch_backpointer -> bkey_i_backpointer
bcachefs: kill bch_backpointer.bucket_offset usage
bcachefs: kill __bch2_extent_ptr_to_bp()
bcachefs: New backpointers helpers
fs/bcachefs/alloc_background.c | 8 - fs/bcachefs/backpointers.c | 282 ++++++++++++++++----------------- fs/bcachefs/backpointers.h | 85 +++++----- fs/bcachefs/buckets.c | 15 +- fs/bcachefs/ec.c | 7 +- fs/bcachefs/move.c | 5 +- 6 files changed, 188 insertions(+), 214 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/7 bcachefs: fix bp_pos_to_bucket_nodev_noerror
_noerror means don't produce inconsistent errors, so it should be using bch2_dev_rcu_noerror().
--- fs/bcachefs/backpointers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/bcachefs/backpointers.h +1 -1
@@ -46,7 +46,7 @@ static inline struct bpos bp_pos_to_bucket(const struct bch_dev *ca, struct bposstatic inline bool bp_pos_to_bucket_nodev_noerror (struct bch_fs *c,struct bpos bp_pos,struct bpos *bucket) {rcu_read_lock (); -struct bch_dev *ca =bch2_dev_rcu (c, bp_pos.inode); +struct bch_dev *ca =bch2_dev_rcu_noerror (c, bp_pos.inode);if (ca) *bucket =bp_pos_to_bucket (ca, bp_pos);rcu_read_unlock ();
Signature · 1 line
2.45.2
PATCH 2/7 bcachefs: bucket_pos_to_bp_end()
In reply to Kent OverstreetBetter helpers for iterating over backpointers within a specific bucket
--- fs/bcachefs/backpointers.h | 10 ++++++++++ fs/bcachefs/ec.c | 5 +++-- fs/bcachefs/move.c | 5 ++--- 3 files changed, 15 insertions(+), 5 deletions(-)
fs/bcachefs/backpointers.h +10 -0
@@ -80,6 +80,16 @@ static inline struct bpos bucket_pos_to_bp(const struct bch_dev *ca,return ret; } +static inline struct bpos bucket_pos_to_bp_start (const struct bch_dev *ca,struct bpos bucket) +{ +return bucket_pos_to_bp (ca, bucket,0 ); +} + +static inline struct bpos bucket_pos_to_bp_end (const struct bch_dev *ca,struct bpos bucket) +{ +return bpos_nosnap_predecessor (bucket_pos_to_bp (ca,bpos_nosnap_successor (bucket),0 )); +} +int bch2_bucket_backpointer_mod_nowritebuffer (struct btree_trans *,struct bch_dev *,struct bpos bucket,struct bch_backpointer ,struct bkey_s_c ,bool );
fs/bcachefs/ec.c +3 -2
@@ -1374,8 +1374,9 @@ static int ec_stripe_update_bucket(struct btree_trans *trans, struct ec_stripe_bstruct bpos bucket_pos =PTR_BUCKET_POS (ca, &ptr); - ret = for_each_btree_key_commit(trans, bp_iter, BTREE_ID_backpointers, - bucket_pos_to_bp(ca, bucket_pos, 0), 0, bp_k, + ret = for_each_btree_key_max_commit(trans, bp_iter, BTREE_ID_backpointers, + bucket_pos_to_bp_start(ca, bucket_pos), + bucket_pos_to_bp_end(ca, bucket_pos), 0, bp_k, NULL, NULL, BCH_TRANS_COMMIT_no_check_rw| BCH_TRANS_COMMIT_no_enospc, ({
fs/bcachefs/move.c +2 -3
@@ -692,7 +692,7 @@ int bch2_evacuate_bucket(struct moving_context *ctxt,bch2_trans_begin (trans);bch2_trans_iter_init (trans, &bp_iter, BTREE_ID_backpointers, -bucket_pos_to_bp (ca, bucket,0 ),0 ); +bucket_pos_to_bp_start (ca, bucket),0 );bch_err_msg (c, ret,"looking up alloc key" );if (ret)
@@ -716,8 +716,7 @@ int bch2_evacuate_bucket(struct moving_context *ctxt,if (ret) goto err; -if (!k.k || -bkey_ge (k.k->p,bucket_pos_to_bp (ca,bpos_nosnap_successor (bucket),0 ))) +if (!k.k ||bkey_gt (k.k->p,bucket_pos_to_bp_end (ca, bucket)))break ;if (k.k->type != KEY_TYPE_backpointer)
Signature · 1 line
2.45.2
PATCH 3/7 bcachefs: Drop swab code for backpointers in alloc keys
In reply to Kent Overstreet--- fs/bcachefs/alloc_background.c | 8 -------- 1 file changed, 8 deletions(-)
fs/bcachefs/alloc_background.c +0 -8
@@ -322,7 +322,6 @@ int bch2_alloc_v4_validate(struct bch_fs *c, struct bkey_s_c k,void bch2_alloc_v4_swab (struct bkey_s k) {struct bch_alloc_v4 *a =bkey_s_to_alloc_v4 (k).v; -struct bch_backpointer *bp, *bps; a->journal_seq =swab64 (a->journal_seq); a->flags =swab32 (a->flags);
@@ -333,13 +332,6 @@ void bch2_alloc_v4_swab(struct bkey_s k) a->stripe =swab32 (a->stripe); a->nr_external_backpointers =swab32 (a->nr_external_backpointers); a->stripe_sectors =swab32 (a->stripe_sectors); - - bps =alloc_v4_backpointers (a); -for (bp = bps; bp < bps +BCH_ALLOC_V4_NR_BACKPOINTERS (a); bp++) { - bp->bucket_offset =swab40 (bp->bucket_offset); - bp->bucket_len =swab32 (bp->bucket_len); -bch2_bpos_swab (&bp->pos); - } }void bch2_alloc_to_text (struct printbuf *out,struct bch_fs *c,struct bkey_s_c k)
Signature · 1 line
2.45.2
PATCH 4/7 bcachefs: bch_backpointer -> bkey_i_backpointer
In reply to Kent OverstreetSince we no longer store backpointers in alloc keys, there's no reason not to pass around bkey_i_backpointers; this means we don't have to pass the bucket pos separately.
--- fs/bcachefs/backpointers.c | 215 +++++++++++++++---------------------- fs/bcachefs/backpointers.h | 51 ++++----- fs/bcachefs/buckets.c | 8 +- fs/bcachefs/ec.c | 2 +- 4 files changed, 111 insertions(+), 165 deletions(-)
fs/bcachefs/backpointers.c +85 -130
@@ -14,40 +14,6 @@#include <linux/mm.h> -static bool extent_matches_bp (struct bch_fs *c, -enum btree_id btree_id,unsigned level, -struct bkey_s_c k, -struct bpos bucket, -struct bch_backpointer bp) -{ -struct bkey_ptrs_c ptrs =bch2_bkey_ptrs_c (k); -const union bch_extent_entry *entry; -struct extent_ptr_decoded p; - -rcu_read_lock (); -bkey_for_each_ptr_decode (k.k, ptrs, p, entry) { -struct bpos bucket2; -struct bch_backpointer bp2; - -if (p.ptr.cached) -continue ; - -struct bch_dev *ca =bch2_dev_rcu (c, p.ptr.dev); -if (!ca) -continue ; - -bch2_extent_ptr_to_bp (c, ca, btree_id, level, k, p, entry, &bucket2, &bp2); -if (bpos_eq (bucket, bucket2) && - !memcmp (&bp, &bp2,sizeof (bp))) { -rcu_read_unlock (); -return true; - } - } -rcu_read_unlock (); - -return false; -} -int bch2_backpointer_validate (struct bch_fs *c,struct bkey_s_c k,enum bch_validate_flags flags) {
@@ -74,23 +40,15 @@ int bch2_backpointer_validate(struct bch_fs *c, struct bkey_s_c k,bkey_fsck_err_on ((bp.v->bucket_offset >>MAX_EXTENT_COMPRESS_RATIO_SHIFT ) >= ca->mi.bucket_size || !bpos_eq (bp.k->p, bp_pos), c, backpointer_bucket_offset_wrong, -"backpointer bucket_offset wrong" ); +"backpointer bucket_offset wrong (%llu)" , (u64 ) bp.v->bucket_offset); fsck_err:return ret; } -void bch2_backpointer_to_text (struct printbuf *out,const struct bch_backpointer *bp) +void bch2_backpointer_to_text (struct printbuf *out,struct bch_fs *c,struct bkey_s_c k) { -bch2_btree_id_level_to_text (out, bp->btree_id, bp->level); -prt_printf (out," offset=%llu:%u len=%u pos=" , - (u64) (bp->bucket_offset >>MAX_EXTENT_COMPRESS_RATIO_SHIFT ), - (u32 ) bp->bucket_offset & ~(~0U <<MAX_EXTENT_COMPRESS_RATIO_SHIFT ), - bp->bucket_len); -bch2_bpos_to_text (out, bp->pos); -} +struct bkey_s_c_backpointer bp =bkey_s_c_to_backpointer (k); -void bch2_backpointer_k_to_text (struct printbuf *out,struct bch_fs *c,struct bkey_s_c k) -{rcu_read_lock ();struct bch_dev *ca =bch2_dev_rcu_noerror (c, k.k->p.inode);if (ca) {
@@ -103,7 +61,12 @@ void bch2_backpointer_k_to_text(struct printbuf *out, struct bch_fs *c, struct brcu_read_unlock (); } -bch2_backpointer_to_text (out,bkey_s_c_to_backpointer (k).v); +bch2_btree_id_level_to_text (out, bp.v->btree_id, bp.v->level); +prt_printf (out," offset=%llu:%u len=%u pos=" , + (u64) (bp.v->bucket_offset >>MAX_EXTENT_COMPRESS_RATIO_SHIFT ), + (u32 ) bp.v->bucket_offset & ~(~0U <<MAX_EXTENT_COMPRESS_RATIO_SHIFT ), + bp.v->bucket_len); +bch2_bpos_to_text (out, bp.v->pos); }void bch2_backpointer_swab (struct bkey_s k)
@@ -115,10 +78,43 @@ void bch2_backpointer_swab(struct bkey_s k)bch2_bpos_swab (&bp.v->pos); } +static bool extent_matches_bp (struct bch_fs *c, +enum btree_id btree_id,unsigned level, +struct bkey_s_c k, +struct bkey_s_c_backpointer bp) +{ +struct bkey_ptrs_c ptrs =bch2_bkey_ptrs_c (k); +const union bch_extent_entry *entry; +struct extent_ptr_decoded p; + +rcu_read_lock (); +bkey_for_each_ptr_decode (k.k, ptrs, p, entry) { +struct bpos bucket2; +struct bkey_i_backpointer bp2; + +if (p.ptr.cached) +continue ; + +struct bch_dev *ca =bch2_dev_rcu (c, p.ptr.dev); +if (!ca) +continue ; + +bch2_extent_ptr_to_bp (c, ca, btree_id, level, k, p, entry, &bucket2, &bp2); +if (bpos_eq (bp.k->p, bp2.k.p) && + !memcmp (bp.v, &bp2.v,sizeof (bp2.v))) { +rcu_read_unlock (); +return true; + } + } +rcu_read_unlock (); + +return false; +} + static noinline int backpointer_mod_err(struct btree_trans *trans, -struct bch_backpointer bp, -struct bkey_s_c bp_k,struct bkey_s_c orig_k, +struct bkey_i_backpointer *new_bp, +struct bkey_s_c found_bp,bool insert) {struct bch_fs *c = trans->c;
@@ -126,12 +122,12 @@ static noinline int backpointer_mod_err(struct btree_trans *trans,if (insert) {prt_printf (&buf,"existing backpointer found when inserting " ); -bch2_backpointer_to_text (&buf, &bp); +bch2_bkey_val_to_text (&buf, c,bkey_i_to_s_c (&new_bp->k_i));prt_newline (&buf);printbuf_indent_add (&buf,2 );prt_printf (&buf,"found " ); -bch2_bkey_val_to_text (&buf, c, bp_k); +bch2_bkey_val_to_text (&buf, c, found_bp);prt_newline (&buf);prt_printf (&buf,"for " );
@@ -143,11 +139,11 @@ static noinline int backpointer_mod_err(struct btree_trans *trans,printbuf_indent_add (&buf,2 );prt_printf (&buf,"searching for " ); -bch2_backpointer_to_text (&buf, &bp); +bch2_bkey_val_to_text (&buf, c,bkey_i_to_s_c (&new_bp->k_i));prt_newline (&buf);prt_printf (&buf,"got " ); -bch2_bkey_val_to_text (&buf, c, bp_k); +bch2_bkey_val_to_text (&buf, c, found_bp);prt_newline (&buf);prt_printf (&buf,"for " );
@@ -166,50 +162,35 @@ static noinline int backpointer_mod_err(struct btree_trans *trans, }int bch2_bucket_backpointer_mod_nowritebuffer (struct btree_trans *trans, -struct bch_dev *ca, -struct bpos bucket, -struct bch_backpointer bp,struct bkey_s_c orig_k, +struct bkey_i_backpointer *bp,bool insert) {struct btree_iter bp_iter; -struct bkey_s_c k; -struct bkey_i_backpointer *bp_k; -int ret; - - bp_k =bch2_trans_kmalloc_nomemzero (trans,sizeof (struct bkey_i_backpointer )); - ret =PTR_ERR_OR_ZERO (bp_k); -if (ret) -return ret; - -bkey_backpointer_init (&bp_k->k_i); - bp_k->k.p =bucket_pos_to_bp (ca, bucket, bp.bucket_offset); - bp_k->v = bp; - -if (!insert) { - bp_k->k.type = KEY_TYPE_deleted; -set_bkey_val_u64s (&bp_k->k,0 ); - } - - k =bch2_bkey_get_iter (trans, &bp_iter, BTREE_ID_backpointers, - bp_k->k.p, +struct bkey_s_c k =bch2_bkey_get_iter (trans, &bp_iter, BTREE_ID_backpointers, + bp->k.p, BTREE_ITER_intent| BTREE_ITER_slots| BTREE_ITER_with_updates); - ret =bkey_err (k); +int ret =bkey_err (k);if (ret) - goto err; +return ret;if (insert ? k.k->type : (k.k->type != KEY_TYPE_backpointer || -memcmp (bkey_s_c_to_backpointer (k).v, &bp,sizeof (bp)))) { - ret =backpointer_mod_err (trans, bp, k, orig_k, insert); +memcmp (bkey_s_c_to_backpointer (k).v, &bp->v,sizeof (bp->v)))) { + ret =backpointer_mod_err (trans, orig_k, bp, k, insert);if (ret) goto err; } - ret =bch2_trans_update (trans, &bp_iter, &bp_k->k_i,0 ); +if (!insert) { + bp->k.type = KEY_TYPE_deleted; +set_bkey_val_u64s (&bp->k,0 ); + } + + ret =bch2_trans_update (trans, &bp_iter, &bp->k_i,0 ); err:bch2_trans_iter_exit (trans, &bp_iter);return ret;
@@ -230,22 +211,11 @@ static void backpointer_target_not_found(struct btree_trans *trans,if (likely (!bch2_backpointers_no_use_write_buffer))return ; -struct bpos bucket; -if (!bp_pos_to_bucket_nodev (c, bp.k->p, &bucket)) -return ; -prt_printf (&buf,"backpointer doesn't match %s it points to:\n " , bp.v->level ?"btree node" :"extent" ); -prt_printf (&buf,"bucket: " ); -bch2_bpos_to_text (&buf, bucket); -prt_printf (&buf,"\n " ); - -prt_printf (&buf,"backpointer pos: " ); -bch2_bpos_to_text (&buf, bp.k->p); +bch2_bkey_val_to_text (&buf, c, bp.s_c);prt_printf (&buf,"\n " ); -bch2_backpointer_to_text (&buf, bp.v); -prt_printf (&buf,"\n " );bch2_bkey_val_to_text (&buf, c, target_k);if (c->curr_recovery_pass >= BCH_RECOVERY_PASS_check_extents_to_backpointers)bch_err_ratelimited (c,"%s" , buf.buf);
@@ -263,10 +233,6 @@ struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans,if (likely (!bp.v->level)) {struct bch_fs *c = trans->c; -struct bpos bucket; -if (!bp_pos_to_bucket_nodev (c, bp.k->p, &bucket)) -return bkey_s_c_err (-EIO ); - bch2_trans_node_iter_init(trans, iter, bp.v->btree_id, bp.v->pos,
@@ -279,7 +245,7 @@ struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans, }if (k.k && -extent_matches_bp (c, bp.v->btree_id, bp.v->level, k, bucket, *bp.v)) +extent_matches_bp (c, bp.v->btree_id, bp.v->level, k, bp))return k;bch2_trans_iter_exit (trans, iter);
@@ -304,10 +270,6 @@ struct btree *bch2_backpointer_get_node(struct btree_trans *trans,BUG_ON (!bp.v->level); -struct bpos bucket; -if (!bp_pos_to_bucket_nodev (c, bp.k->p, &bucket)) -return ERR_PTR (-EIO ); - bch2_trans_node_iter_init(trans, iter, bp.v->btree_id, bp.v->pos,
@@ -321,8 +283,7 @@ struct btree *bch2_backpointer_get_node(struct btree_trans *trans,BUG_ON (b->c.level != bp.v->level -1 );if (extent_matches_bp (c, bp.v->btree_id, bp.v->level, -bkey_i_to_s_c (&b->key), - bucket, *bp.v)) +bkey_i_to_s_c (&b->key), bp))return b;if (btree_node_will_make_reachable (b)) {
@@ -476,8 +437,7 @@ static int check_extent_checksum(struct btree_trans *trans,static int check_bp_exists (struct btree_trans *trans,struct extents_to_bp_state *s, -struct bpos bucket, -struct bch_backpointer bp, +struct bkey_i_backpointer *bp,struct bkey_s_c orig_k) {struct bch_fs *c = trans->c;
@@ -487,30 +447,28 @@ static int check_bp_exists(struct btree_trans *trans,struct bkey_s_c bp_k;int ret =0 ; -struct bch_dev *ca =bch2_dev_bucket_tryget (c, bucket); +struct bch_dev *ca =bch2_dev_tryget_noerror (c, bp->k.p.inode);if (!ca) { -prt_str (&buf,"extent for nonexistent device:bucket " ); -bch2_bpos_to_text (&buf, bucket); -prt_str (&buf,"\n " ); +prt_printf (&buf,"extent for nonexistent device %llu\n" , bp->k.p.inode);bch2_bkey_val_to_text (&buf, c, orig_k);bch_err (c,"%s" , buf.buf); ret = -BCH_ERR_fsck_repair_unimplemented; goto err; } +struct bpos bucket =bp_pos_to_bucket (ca, bp->k.p); +if (bpos_lt (bucket, s->bucket_start) ||bpos_gt (bucket, s->bucket_end)) goto out; - bp_k =bch2_bkey_get_iter (trans, &bp_iter, BTREE_ID_backpointers, -bucket_pos_to_bp (ca, bucket, bp.bucket_offset), -0 ); + bp_k =bch2_bkey_get_iter (trans, &bp_iter, BTREE_ID_backpointers, bp->k.p,0 ); ret =bkey_err (bp_k);if (ret) goto err;if (bp_k.k->type != KEY_TYPE_backpointer || -memcmp (bkey_s_c_to_backpointer (bp_k).v, &bp,sizeof (bp))) { +memcmp (bkey_s_c_to_backpointer (bp_k).v, &bp->v,sizeof (bp->v))) { ret =bch2_btree_write_buffer_maybe_flush (trans, orig_k, &s->last_flushed);if (ret) goto err;
@@ -557,14 +515,17 @@ static int check_bp_exists(struct btree_trans *trans, goto err; goto out; }else { - ret =drop_dev_and_update (trans, bp.btree_id, orig_k, bucket.inode); + ret =drop_dev_and_update (trans, bp->v.btree_id, orig_k, bucket.inode);if (ret) goto err; goto missing; } } - ret =check_extent_checksum (trans, other_bp.v->btree_id, other_extent, bp.btree_id, orig_k, bucket.inode); + ret =check_extent_checksum (trans, + other_bp.v->btree_id, other_extent, + bp->v.btree_id, orig_k, + bucket.inode);if (ret <0 ) goto err;if (ret) {
@@ -572,7 +533,8 @@ static int check_bp_exists(struct btree_trans *trans, goto missing; } - ret =check_extent_checksum (trans, bp.btree_id, orig_k, other_bp.v->btree_id, other_extent, bucket.inode); + ret =check_extent_checksum (trans, bp->v.btree_id, orig_k, + other_bp.v->btree_id, other_extent, bucket.inode);if (ret <0 ) goto err;if (ret) {
@@ -590,22 +552,15 @@ static int check_bp_exists(struct btree_trans *trans, goto err; missing:printbuf_reset (&buf); -prt_str (&buf,"missing backpointer for btree=" ); -bch2_btree_id_to_text (&buf, bp.btree_id); -prt_printf (&buf," l=%u " , bp.level); +prt_str (&buf,"missing backpointer " ); +bch2_bkey_val_to_text (&buf, c,bkey_i_to_s_c (&bp->k_i)); +prt_newline (&buf);bch2_bkey_val_to_text (&buf, c, orig_k);prt_printf (&buf,"\n got: " );bch2_bkey_val_to_text (&buf, c, bp_k); -struct bkey_i_backpointer n_bp_k; -bkey_backpointer_init (&n_bp_k.k_i); - n_bp_k.k.p =bucket_pos_to_bp (ca, bucket, bp.bucket_offset); - n_bp_k.v = bp; -prt_printf (&buf,"\n want: " ); -bch2_bkey_val_to_text (&buf, c,bkey_i_to_s_c (&n_bp_k.k_i)); -if (fsck_err (trans, ptr_to_missing_backpointer,"%s" , buf.buf)) - ret =bch2_bucket_backpointer_mod (trans, ca, bucket, bp, orig_k, true); + ret =bch2_bucket_backpointer_mod (trans, orig_k, bp, true); goto out; }
@@ -623,8 +578,8 @@ static int check_extent_to_backpointers(struct btree_trans *trans, ptrs =bch2_bkey_ptrs_c (k);bkey_for_each_ptr_decode (k.k, ptrs, p, entry) { -struct bpos bucket_pos =POS_MIN ; -struct bch_backpointer bp; +struct bpos bucket_pos; +struct bkey_i_backpointer bp;if (p.ptr.cached)continue ;
@@ -638,7 +593,7 @@ static int check_extent_to_backpointers(struct btree_trans *trans,if (!ca)continue ; - ret =check_bp_exists (trans, s, bucket_pos, bp, k); + ret =check_bp_exists (trans, s, &bp, k);if (ret)return ret; }
fs/bcachefs/backpointers.h +21 -30
101 lines not on this page · raw message
fs/bcachefs/buckets.c +4 -4
@@ -585,18 +585,18 @@ static int bch2_trigger_pointer(struct btree_trans *trans, }struct bpos bucket; -struct bch_backpointer bp; +struct bkey_i_backpointer bp;__bch2_extent_ptr_to_bp (trans->c, ca, btree_id, level, k, p, entry, &bucket, &bp, abs_sectors);if (flags & BTREE_TRIGGER_transactional) {struct bkey_i_alloc_v4 *a =bch2_trans_start_alloc_update (trans, bucket,0 ); ret =PTR_ERR_OR_ZERO (a) ?: -__mark_pointer (trans, ca, k, &p, *sectors, bp.data_type, &a->v); +__mark_pointer (trans, ca, k, &p, *sectors, bp.v.data_type, &a->v);if (ret) goto err;if (!p.ptr.cached) { - ret =bch2_bucket_backpointer_mod (trans, ca, bucket, bp, k, insert); + ret =bch2_bucket_backpointer_mod (trans, k, &bp, insert);if (ret) goto err; }
@@ -614,7 +614,7 @@ static int bch2_trigger_pointer(struct btree_trans *trans,bucket_lock (g);struct bch_alloc_v4 old =bucket_m_to_alloc (*g), new = old; - ret =__mark_pointer (trans, ca, k, &p, *sectors, bp.data_type, &new); + ret =__mark_pointer (trans, ca, k, &p, *sectors, bp.v.data_type, &new);alloc_to_bucket (g, new);bucket_unlock (g); err_unlock:
fs/bcachefs/ec.c +1 -1
@@ -1300,7 +1300,7 @@ static int ec_stripe_update_extent(struct btree_trans *trans,return 0 ;prt_printf (&buf,"found btree node in erasure coded bucket: b=%px\n" , b); -bch2_backpointer_to_text (&buf, bp.v); +bch2_bkey_val_to_text (&buf, c, bp.s_c);bch2_fs_inconsistent (c,"%s" , buf.buf);printbuf_exit (&buf);
Signature · 1 line
2.45.2
PATCH 5/7 bcachefs: kill bch_backpointer.bucket_offset usage
In reply to Kent Overstreetbch_backpointer.bucket_offset is going away - it's no longer needed since we no longer store backpointers in alloc keys, the same information is in the key position itself.
And we'll be reclaiming the space in bch_backpointer for the bucket generation number.
--- fs/bcachefs/backpointers.c | 15 +++++++-------- fs/bcachefs/backpointers.h | 8 ++++++++ 2 files changed, 15 insertions(+), 8 deletions(-)
fs/bcachefs/backpointers.c +7 -8
@@ -50,21 +50,20 @@ void bch2_backpointer_to_text(struct printbuf *out, struct bch_fs *c, struct bkestruct bkey_s_c_backpointer bp =bkey_s_c_to_backpointer (k);rcu_read_lock (); -struct bch_dev *ca =bch2_dev_rcu_noerror (c, k.k->p.inode); +struct bch_dev *ca =bch2_dev_rcu_noerror (c, bp.k->p.inode);if (ca) { -struct bpos bucket =bp_pos_to_bucket (ca, k.k->p); +u32 bucket_offset; +struct bpos bucket =bp_pos_to_bucket_and_offset (ca, bp.k->p, &bucket_offset);rcu_read_unlock (); -prt_str (out,"bucket=" ); -bch2_bpos_to_text (out, bucket); -prt_str (out," " ); +prt_printf (out,"bucket=%llu:%llu:%u" , bucket.inode, bucket.offset, bucket_offset); }else {rcu_read_unlock (); +prt_printf (out,"sector=%llu:%llu" , bp.k->p.inode, bp.k->p.offset >>MAX_EXTENT_COMPRESS_RATIO_SHIFT ); }bch2_btree_id_level_to_text (out, bp.v->btree_id, bp.v->level); -prt_printf (out," offset=%llu:%u len=%u pos=" , - (u64) (bp.v->bucket_offset >>MAX_EXTENT_COMPRESS_RATIO_SHIFT ), - (u32 ) bp.v->bucket_offset & ~(~0U <<MAX_EXTENT_COMPRESS_RATIO_SHIFT ), +prt_printf (out," suboffset=%u len=%u pos=" , + (u32 ) bp.k->p.offset & ~(~0U <<MAX_EXTENT_COMPRESS_RATIO_SHIFT ), bp.v->bucket_len);bch2_bpos_to_text (out, bp.v->pos); }
fs/bcachefs/backpointers.h +8 -0
@@ -42,6 +42,14 @@ static inline struct bpos bp_pos_to_bucket(const struct bch_dev *ca, struct bposreturn POS (bp_pos.inode,sector_to_bucket (ca, bucket_sector)); } +static inline struct bpos bp_pos_to_bucket_and_offset (const struct bch_dev *ca,struct bpos bp_pos, +u32 *bucket_offset) +{ +u64 bucket_sector = bp_pos.offset >>MAX_EXTENT_COMPRESS_RATIO_SHIFT ; + +return POS (bp_pos.inode,sector_to_bucket_and_offset (ca, bucket_sector, bucket_offset)); +} +static inline bool bp_pos_to_bucket_nodev_noerror (struct bch_fs *c,struct bpos bp_pos,struct bpos *bucket) {rcu_read_lock ();
Signature · 1 line
2.45.2
PATCH 6/7 bcachefs: kill __bch2_extent_ptr_to_bp()
In reply to Kent Overstreet--- fs/bcachefs/backpointers.h | 18 +++--------------- fs/bcachefs/buckets.c | 7 +++---- 2 files changed, 6 insertions(+), 19 deletions(-)
fs/bcachefs/backpointers.h +3 -15
@@ -139,12 +139,11 @@ static inline enum bch_data_type bch2_bkey_ptr_data_type(struct bkey_s_c k, } } -static inline void __bch2_extent_ptr_to_bp (struct bch_fs *c,struct bch_dev *ca, +static inline void bch2_extent_ptr_to_bp (struct bch_fs *c,struct bch_dev *ca,enum btree_id btree_id,unsigned level,struct bkey_s_c k,struct extent_ptr_decoded p,const union bch_extent_entry *entry, -struct bpos *bucket,struct bkey_i_backpointer *bp, -u64 sectors) +struct bpos *bucket,struct bkey_i_backpointer *bp) {u32 bucket_offset; *bucket =PTR_BUCKET_POS_OFFSET (ca, &p.ptr, &bucket_offset);
@@ -158,22 +157,11 @@ static inline void __bch2_extent_ptr_to_bp(struct bch_fs *c, struct bch_dev *ca, .level = level, .data_type = bch2_bkey_ptr_data_type(k, p, entry), .bucket_offset = bp_bucket_offset, - .bucket_len = sectors, + .bucket_len = ptr_disk_sectors(level ? btree_sectors(c) : k.k->size, p), .pos = k.k->p, }; } -static inline void bch2_extent_ptr_to_bp (struct bch_fs *c,struct bch_dev *ca, -enum btree_id btree_id,unsigned level, -struct bkey_s_c k,struct extent_ptr_decoded p, -const union bch_extent_entry *entry, -struct bpos *bucket_pos,struct bkey_i_backpointer *bp) -{ -u64 sectors =ptr_disk_sectors (level ?btree_sectors (c) : k.k->size, p); - -__bch2_extent_ptr_to_bp (c, ca, btree_id, level, k, p, entry, bucket_pos, bp, sectors); -} -struct bkey_s_c bch2_backpointer_get_key (struct btree_trans *,struct bkey_s_c_backpointer ,struct btree_iter *,unsigned ); struct btree *bch2_backpointer_get_node(struct btree_trans *, struct bkey_s_c_backpointer,
fs/bcachefs/buckets.c +3 -4
@@ -574,9 +574,6 @@ static int bch2_trigger_pointer(struct btree_trans *trans,struct printbuf buf =PRINTBUF ;int ret =0 ; -u64 abs_sectors =ptr_disk_sectors (level ?btree_sectors (c) : k.k->size, p); - *sectors = insert ? abs_sectors : -abs_sectors; -struct bch_dev *ca =bch2_dev_tryget (c, p.ptr.dev);if (unlikely (!ca)) {if (insert && p.ptr.dev !=BCH_SB_MEMBER_INVALID )
@@ -586,7 +583,9 @@ static int bch2_trigger_pointer(struct btree_trans *trans,struct bpos bucket;struct bkey_i_backpointer bp; -__bch2_extent_ptr_to_bp (trans->c, ca, btree_id, level, k, p, entry, &bucket, &bp, abs_sectors); +bch2_extent_ptr_to_bp (trans->c, ca, btree_id, level, k, p, entry, &bucket, &bp); + + *sectors = insert ? bp.v.bucket_len : -(s64 ) bp.v.bucket_len;if (flags & BTREE_TRIGGER_transactional) {struct bkey_i_alloc_v4 *a =bch2_trans_start_alloc_update (trans, bucket,0 );
Signature · 1 line
2.45.2
PATCH 7/7 bcachefs: New backpointers helpers
In reply to Kent Overstreet- bch2_backpointer_del()
- bch2_backpointer_maybe_flush()
Kill a bit of open coding and make sure we're properly handling the btree write buffer.
--- fs/bcachefs/backpointers.c | 58 +++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 13 deletions(-)
fs/bcachefs/backpointers.c +45 -13
@@ -195,6 +195,22 @@ int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *trans,return ret; } +static int bch2_backpointer_del (struct btree_trans *trans,struct bpos pos) +{ +return likely (!bch2_backpointers_no_use_write_buffer) + ?bch2_btree_delete_at_buffered (trans, BTREE_ID_backpointers, pos) + :bch2_btree_delete (trans, BTREE_ID_backpointers, pos,0 ); +} + +static int bch2_backpointers_maybe_flush (struct btree_trans *trans, +struct bkey_s_c visiting_k, +struct bkey_buf *last_flushed) +{ +return likely (!bch2_backpointers_no_use_write_buffer) + ?bch2_btree_write_buffer_maybe_flush (trans, visiting_k, last_flushed) + :0 ; +} +static void backpointer_target_not_found (struct btree_trans *trans,struct bkey_s_c_backpointer bp,struct bkey_s_c target_k)
@@ -296,9 +312,12 @@ struct btree *bch2_backpointer_get_node(struct btree_trans *trans,return b; } -static int bch2_check_btree_backpointer (struct btree_trans *trans,struct btree_iter *bp_iter, -struct bkey_s_c k) +static int bch2_check_backpointer_has_valid_bucket (struct btree_trans *trans,struct bkey_s_c k, +struct bkey_buf *last_flushed) { +if (k.k->type != KEY_TYPE_backpointer) +return 0 ; +struct bch_fs *c = trans->c;struct btree_iter alloc_iter = {NULL };struct bkey_s_c alloc_k;
@@ -307,10 +326,14 @@ static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_struct bpos bucket;if (!bp_pos_to_bucket_nodev_noerror (c, k.k->p, &bucket)) { + ret =bch2_backpointers_maybe_flush (trans, k, last_flushed); +if (ret) + goto out; +if (fsck_err (trans, backpointer_to_missing_device,"backpointer for missing device:\n%s" , (bch2_bkey_val_to_text (&buf, c, k), buf.buf))) - ret =bch2_btree_delete_at (trans, bp_iter,0 ); + ret =bch2_backpointer_del (trans, k.k->p); goto out; }
@@ -319,13 +342,16 @@ static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_if (ret) goto out; -if (fsck_err_on (alloc_k.k->type != KEY_TYPE_alloc_v4, - trans, backpointer_to_missing_alloc, -"backpointer for nonexistent alloc key: %llu:%llu:0\n%s" , - alloc_iter.pos.inode, alloc_iter.pos.offset, - (bch2_bkey_val_to_text (&buf, c, k), buf.buf))) { - ret =bch2_btree_delete_at (trans, bp_iter,0 ); - goto out; +if (alloc_k.k->type != KEY_TYPE_alloc_v4) { + ret =bch2_backpointers_maybe_flush (trans, k, last_flushed); +if (ret) + goto out; + +if (fsck_err (trans, backpointer_to_missing_alloc, +"backpointer for nonexistent alloc key: %llu:%llu:0\n%s" , + alloc_iter.pos.inode, alloc_iter.pos.offset, + (bch2_bkey_val_to_text (&buf, c, k), buf.buf))) + ret =bch2_backpointer_del (trans, k.k->p); } out: fsck_err:
@@ -337,11 +363,17 @@ static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_/* verify that every backpointer has a corresponding alloc key */ int bch2_check_btree_backpointers (struct bch_fs *c) { +struct bkey_buf last_flushed; +bch2_bkey_buf_init (&last_flushed); +bkey_init (&last_flushed.k->k); +int ret =bch2_trans_run (c, for_each_btree_key_commit(trans, iter, BTREE_ID_backpointers,POS_MIN ,0 , k,NULL ,NULL , BCH_TRANS_COMMIT_no_enospc, -bch2_check_btree_backpointer (trans, &iter, k))); +bch2_check_backpointer_has_valid_bucket (trans, k, &last_flushed))); + +bch2_bkey_buf_exit (&last_flushed, c);bch_err_fn (c, ret);return ret; }
@@ -883,7 +915,7 @@ static int check_one_backpointer(struct btree_trans *trans,return ret;if (!k.k) { - ret =bch2_btree_write_buffer_maybe_flush (trans, bp.s_c, last_flushed); + ret =bch2_backpointers_maybe_flush (trans, bp.s_c, last_flushed);if (ret) goto out;
@@ -891,7 +923,7 @@ static int check_one_backpointer(struct btree_trans *trans, "backpointer for missing %s\n %s", bp.v->level ? "btree node" : "extent", (bch2_bkey_val_to_text(&buf, c, bp.s_c), buf.buf))) { - ret =bch2_btree_delete_at_buffered (trans, BTREE_ID_backpointers, bp.k->p); + ret =bch2_backpointer_del (trans, bp.k->p); goto out; } }
Signature · 1 line
2.45.2