bcachefs: Reserve 8 bits in bch_reflink_p
PATCH 1/3 bcachefs: Reserve 8 bits in bch_reflink_p
Better repair for reflink pointers, as well as propagating new inode options to indirect extents, are going to require a few extra bitsbch_reflink_p: so claim a few from the high end of the destination index.
Also add some missing bounds checking.
--- fs/bcachefs/extent_update.c | 2 +- fs/bcachefs/extents.c | 2 +- fs/bcachefs/io_read.c | 14 ++++------- fs/bcachefs/reflink.c | 45 +++++++++++++++++++++++----------- fs/bcachefs/reflink_format.h | 4 ++- fs/bcachefs/sb-errors_format.h | 3 ++- 6 files changed, 43 insertions(+), 27 deletions(-)
fs/bcachefs/extent_update.c +1 -1
@@ -64,7 +64,7 @@ static int count_iters_for_insert(struct btree_trans *trans,break ;case KEY_TYPE_reflink_p: {struct bkey_s_c_reflink_p p =bkey_s_c_to_reflink_p (k); -u64 idx =le64_to_cpu (p.v->idx); +u64 idx =REFLINK_P_IDX (p.v);unsigned sectors =bpos_min (*end, p.k->p).offset -bkey_start_offset (p.k);struct btree_iter iter;
fs/bcachefs/extents.c +1 -1
@@ -1492,7 +1492,7 @@ int bch2_cut_front_s(struct bpos where, struct bkey_s k)case KEY_TYPE_reflink_p: {struct bkey_s_reflink_p p =bkey_s_to_reflink_p (k); -le64_add_cpu (&p.v->idx, sub); +SET_REFLINK_P_IDX (p.v,REFLINK_P_IDX (p.v) + sub);break ; }case KEY_TYPE_inline_data:
fs/bcachefs/io_read.c +5 -9
@@ -753,17 +753,13 @@ int __bch2_read_indirect_extent(struct btree_trans *trans,unsigned *offset_into_extent, struct bkey_buf *orig_k) { - struct btree_iter iter; -struct bkey_s_c k; -u64 reflink_offset; -int ret; + struct bkey_i_reflink_p *p = bkey_i_to_reflink_p(orig_k->k); +u64 reflink_offset =REFLINK_P_IDX (&p->v) + *offset_into_extent; - reflink_offset =le64_to_cpu (bkey_i_to_reflink_p (orig_k->k)->v.idx) + - *offset_into_extent; - - k =bch2_bkey_get_iter (trans, &iter, BTREE_ID_reflink, +struct btree_iter iter; +struct bkey_s_c k =bch2_bkey_get_iter (trans, &iter, BTREE_ID_reflink,POS (0 , reflink_offset),0 ); - ret =bkey_err (k); +int ret =bkey_err (k);if (ret) goto err;
fs/bcachefs/reflink.c +31 -14
114 lines not on this page · raw message
fs/bcachefs/reflink_format.h +3 -1
@@ -4,7 +4,7 @@struct bch_reflink_p {struct bch_val v; -__le64 idx; +__le64 idx_flags;/* * A reflink pointer might point to an indirect extent which is then * later split (by copygc or rebalance). If we only pointed to part of
@@ -17,6 +17,8 @@ struct bch_reflink_p {__le32 back_pad; } __packed__aligned(8) ; +LE64_BITMASK(REFLINK_P_IDX, struct bch_reflink_p, idx_flags, 0, 56); +struct bch_reflink_v {struct bch_val v;__le64 refcount;
fs/bcachefs/sb-errors_format.h +2 -1
@@ -177,6 +177,7 @@ enum bch_fsck_flags { x(ptr_stripe_redundant, 163, 0) \ x(reservation_key_nr_replicas_invalid, 164, 0) \ x(reflink_v_refcount_wrong, 165, 0) \ + x(reflink_v_pos_bad, 292, 0) \ x(reflink_p_to_missing_reflink_v, 166, 0) \ x(stripe_pos_bad, 167, 0) \x (stripe_val_size_bad,168 ,0 ) \
@@ -302,7 +303,7 @@ enum bch_fsck_flags { x(accounting_key_replicas_devs_unsorted, 280, FSCK_AUTOFIX) \ x(accounting_key_version_0, 282, FSCK_AUTOFIX) \ x(logged_op_but_clean, 283, FSCK_AUTOFIX) \ - x(MAX, 292, 0) + x(MAX, 293, 0)enum bch_sb_error_id {#define x(t, n, ...) BCH_FSCK_ERR_##t = n,
Signature · 1 line
2.46.0
PATCH 2/3 bcachefs: Reorganize reflink.c a bit
--- fs/bcachefs/btree_gc.c | 92 ------------------ fs/bcachefs/reflink.c | 214 ++++++++++++++++++++++++++++++----------- fs/bcachefs/reflink.h | 3 + 3 files changed, 160 insertions(+), 149 deletions(-)
fs/bcachefs/btree_gc.c +0 -92
@@ -937,98 +937,6 @@ static int bch2_gc_alloc_start(struct bch_fs *c)return ret; } -static int bch2_gc_write_reflink_key (struct btree_trans *trans, -struct btree_iter *iter, -struct bkey_s_c k, -size_t *idx) -{ -struct bch_fs *c = trans->c; -const __le64 *refcount =bkey_refcount_c (k); -struct printbuf buf =PRINTBUF ; -struct reflink_gc *r; -int ret =0 ; - -if (!refcount) -return 0 ; - -while ((r =genradix_ptr (&c->reflink_gc_table, *idx)) && - r->offset < k.k->p.offset) - ++*idx; - -if (!r || - r->offset != k.k->p.offset || - r->size != k.k->size) { -bch_err (c,"unexpected inconsistency walking reflink table at gc finish" ); -return -EINVAL ; - } - -if (fsck_err_on (r->refcount !=le64_to_cpu (*refcount), - trans, reflink_v_refcount_wrong, -"reflink key has wrong refcount:\n" -" %s\n" -" should be %u" , - (bch2_bkey_val_to_text (&buf, c, k), buf.buf), - r->refcount)) { -struct bkey_i *new =bch2_bkey_make_mut_noupdate (trans, k); - ret =PTR_ERR_OR_ZERO (new); -if (ret) - goto out; - -if (!r->refcount) - new->k.type = KEY_TYPE_deleted; -else - *bkey_refcount (bkey_i_to_s (new)) =cpu_to_le64 (r->refcount); - ret =bch2_trans_update (trans, iter, new,0 ); - } -out: -fsck_err: -printbuf_exit (&buf); -return ret; -} - -static int bch2_gc_reflink_done (struct bch_fs *c) -{ -size_t idx =0 ; - -int ret =bch2_trans_run (c, - for_each_btree_key_commit(trans, iter, - BTREE_ID_reflink,POS_MIN , - BTREE_ITER_prefetch, k, -NULL ,NULL , BCH_TRANS_COMMIT_no_enospc, -bch2_gc_write_reflink_key (trans, &iter, k, &idx))); - c->reflink_gc_nr =0 ; -return ret; -} - -static int bch2_gc_reflink_start (struct bch_fs *c) -{ - c->reflink_gc_nr =0 ; - -int ret =bch2_trans_run (c, - for_each_btree_key(trans, iter, BTREE_ID_reflink, POS_MIN, - BTREE_ITER_prefetch, k, ({ -const __le64 *refcount =bkey_refcount_c (k); - -if (!refcount) -continue ; - -struct reflink_gc *r =genradix_ptr_alloc (&c->reflink_gc_table, - c->reflink_gc_nr++,GFP_KERNEL ); -if (!r) { - ret = -BCH_ERR_ENOMEM_gc_reflink_start; -break ; - } - - r->offset = k.k->p.offset; - r->size = k.k->size; - r->refcount =0 ; -0 ; - }))); - -bch_err_fn (c, ret); -return ret; -} -static int bch2_gc_write_stripes_key (struct btree_trans *trans,struct btree_iter *iter,struct bkey_s_c k)
fs/bcachefs/reflink.c +157 -57
241 lines not on this page · raw message
fs/bcachefs/reflink.h +3 -0
@@ -76,4 +76,7 @@ static inline __le64 *bkey_refcount(struct bkey_s k)s64 bch2_remap_range (struct bch_fs *,subvol_inum ,u64 ,subvol_inum ,u64 ,u64 ,u64 ,s64 *); +int bch2_gc_reflink_done (struct bch_fs *); +int bch2_gc_reflink_start (struct bch_fs *); +#endif /* _BCACHEFS_REFLINK_H */
Signature · 1 line
2.46.0
PATCH 3/3 bcachefs: Don't delete reflink pointers to missing indirect extents
In reply to Kent OverstreetTo avoid tragic loss in the event of transient errors (i.e., a btree node topology error that was later corrected by btree node scan), we can't delete reflink pointers to correct errors.
This adds a new error bit to bch_reflink_p, indicating that it is known to point to a missing indirect extent, and the error has already been reported.
Indirect extent lookups now use bch2_lookup_indirect_extent(), which on error reports it as a fsck_err() and sets the error bit, and clears it if necessary on succesful lookup.
This also gets rid of the bch2_inconsistent_error() call in __bch2_read_indirect_extent, and in the reflink_p trigger: part of the online self healing project.
An on disk format change isn't necessary here: setting the error bit will be interpreted by older versions as pointing to a different index, which will also be missing - which is fine.
--- fs/bcachefs/fs-io-buffered.c | 5 +- fs/bcachefs/fs.c | 8 +- fs/bcachefs/io_read.c | 45 +----- fs/bcachefs/io_read.h | 28 +++- fs/bcachefs/reflink.c | 241 +++++++++++++++++++++++++-------- fs/bcachefs/reflink.h | 4 + fs/bcachefs/reflink_format.h | 1 + fs/bcachefs/sb-errors_format.h | 3 +- 8 files changed, 224 insertions(+), 111 deletions(-)
fs/bcachefs/fs-io-buffered.c +3 -2
@@ -164,7 +164,8 @@ static void bchfs_read(struct btree_trans *trans, BTREE_ITER_slots);while (1 ) {struct bkey_s_c k; -unsigned bytes, sectors, offset_into_extent; +unsigned bytes, sectors; +s64 offset_into_extent;enum btree_id data_btree = BTREE_ID_extents;bch2_trans_begin (trans);
@@ -197,7 +198,7 @@ static void bchfs_read(struct btree_trans *trans, k =bkey_i_to_s_c (sk.k); - sectors =min (sectors, k.k->size - offset_into_extent); + sectors =min_t (unsigned, sectors, k.k->size - offset_into_extent);if (readpages_iter) { ret = readpage_bio_extend(trans, readpages_iter, &rbio->bio, sectors,
fs/bcachefs/fs.c +3 -5
@@ -1263,7 +1263,6 @@ static int bch2_fiemap(struct inode *vinode, struct fiemap_extent_info *info,struct btree_iter iter;struct bkey_s_c k;struct bkey_buf cur, prev; -unsigned offset_into_extent, sectors;bool have_extent = false;int ret =0 ;
@@ -1310,9 +1309,8 @@ static int bch2_fiemap(struct inode *vinode, struct fiemap_extent_info *info,continue ; } - offset_into_extent = iter.pos.offset - -bkey_start_offset (k.k); - sectors = k.k->size - offset_into_extent; +s64 offset_into_extent = iter.pos.offset -bkey_start_offset (k.k); +unsigned sectors = k.k->size - offset_into_extent;bch2_bkey_buf_reassemble (&cur, c, k);
@@ -1324,7 +1322,7 @@ static int bch2_fiemap(struct inode *vinode, struct fiemap_extent_info *info, k =bkey_i_to_s_c (cur.k);bch2_bkey_buf_realloc (&prev, c, k.k->u64s); - sectors =min (sectors, k.k->size - offset_into_extent); + sectors =min_t (unsigned, sectors, k.k->size - offset_into_extent); bch2_cut_front(POS(k.k->p.inode, bkey_start_offset(k.k) +
fs/bcachefs/io_read.c +5 -40
77 lines not on this page · raw message
fs/bcachefs/io_read.h +21 -7
@@ -3,6 +3,7 @@#define _BCACHEFS_IO_READ_H#include "bkey_buf.h" +#include "reflink.h" struct bch_read_bio {struct bch_fs *c;
@@ -79,19 +80,32 @@ struct bch_devs_mask;struct cache_promote_op ;struct extent_ptr_decoded ; -int __bch2_read_indirect_extent (struct btree_trans *,unsigned *, -struct bkey_buf *); -static inline int bch2_read_indirect_extent (struct btree_trans *trans,enum btree_id *data_btree, -unsigned *offset_into_extent, -struct bkey_buf *k) +s64 *offset_into_extent, +struct bkey_buf *extent) { -if (k->k->k.type != KEY_TYPE_reflink_p) +if (extent->k->k.type != KEY_TYPE_reflink_p)return 0 ; *data_btree = BTREE_ID_reflink; -return __bch2_read_indirect_extent (trans, offset_into_extent, k); +struct btree_iter iter; +struct bkey_s_c k =bch2_lookup_indirect_extent (trans, &iter, + offset_into_extent, +bkey_i_to_s_c_reflink_p (extent->k), + true,0 ); +int ret =bkey_err (k); +if (ret) +return ret; + +if (bkey_deleted (k.k)) { +bch2_trans_iter_exit (trans, &iter); +return -BCH_ERR_missing_indirect_extent; + } + +bch2_bkey_buf_reassemble (extent, trans->c, k); +bch2_trans_iter_exit (trans, &iter); +return 0 ; }enum bch_read_flags {
fs/bcachefs/reflink.c +185 -56
310 lines not on this page · raw message
fs/bcachefs/reflink.h +4 -0
@@ -73,6 +73,10 @@ static inline __le64 *bkey_refcount(struct bkey_s k) } } +struct bkey_s_c bch2_lookup_indirect_extent (struct btree_trans *,struct btree_iter *, +s64 *,struct bkey_s_c_reflink_p , +bool ,unsigned ); +s64 bch2_remap_range (struct bch_fs *,subvol_inum ,u64 ,subvol_inum ,u64 ,u64 ,u64 ,s64 *);
fs/bcachefs/reflink_format.h +1 -0
@@ -18,6 +18,7 @@ struct bch_reflink_p { } __packed__aligned(8) ; LE64_BITMASK(REFLINK_P_IDX, struct bch_reflink_p, idx_flags, 0, 56); +LE64_BITMASK(REFLINK_P_ERROR, struct bch_reflink_p, idx_flags, 56, 57);struct bch_reflink_v {struct bch_val v;
fs/bcachefs/sb-errors_format.h +2 -1
@@ -179,6 +179,7 @@ enum bch_fsck_flags { x(reflink_v_refcount_wrong, 165, 0) \ x(reflink_v_pos_bad, 292, 0) \ x(reflink_p_to_missing_reflink_v, 166, 0) \ + x(reflink_refcount_underflow, 293, 0) \ x(stripe_pos_bad, 167, 0) \ x(stripe_val_size_bad, 168, 0) \x (stripe_csum_granularity_bad,290 ,0 ) \
@@ -303,7 +304,7 @@ enum bch_fsck_flags { x(accounting_key_replicas_devs_unsorted, 280, FSCK_AUTOFIX) \ x(accounting_key_version_0, 282, FSCK_AUTOFIX) \ x(logged_op_but_clean, 283, FSCK_AUTOFIX) \ - x(MAX, 293, 0) + x(MAX, 294, 0)enum bch_sb_error_id {#define x(t, n, ...) BCH_FSCK_ERR_##t = n,
Signature · 1 line
2.46.0