rebalance_work btree
cover rebalance_work btree
Here's the rebalance_work patchset, which I expect to merge shortly.
It eliminates most scanning by the rebalance thread, which is a nice scalabality improvement. Cheers :)
Kent Overstreet (6):
bcachefs: move.c exports, refactoring
bcachefs: moving_context now owns a btree_trans
bcachefs: move: convert to bbpos
bcachefs: move: move_stats refactoring
bcachefs: bch2_inum_opts_get()
bcachefs: rebalance_work
fs/bcachefs/bbpos.h | 14 +- fs/bcachefs/bbpos_types.h | 18 ++ fs/bcachefs/bcachefs.h | 4 +- fs/bcachefs/bcachefs_format.h | 34 +-- fs/bcachefs/buckets.c | 10 + fs/bcachefs/chardev.c | 4 +- fs/bcachefs/compress.c | 18 +- fs/bcachefs/compress.h | 2 + fs/bcachefs/data_update.c | 21 +- fs/bcachefs/data_update.h | 1 + fs/bcachefs/extents.c | 155 +++++++++- fs/bcachefs/extents.h | 20 ++ fs/bcachefs/inode.c | 12 + fs/bcachefs/inode.h | 1 + fs/bcachefs/io_misc.c | 11 +- fs/bcachefs/io_write.c | 20 +- fs/bcachefs/move.c | 277 ++++++++--------- fs/bcachefs/move.h | 36 ++- fs/bcachefs/move_types.h | 8 +- fs/bcachefs/movinggc.c | 37 ++- fs/bcachefs/rebalance.c | 553 ++++++++++++++++++++-------------- fs/bcachefs/rebalance.h | 9 +- fs/bcachefs/rebalance_types.h | 31 +- fs/bcachefs/recovery.c | 1 + fs/bcachefs/recovery_types.h | 1 + fs/bcachefs/reflink.c | 19 +- fs/bcachefs/sysfs.c | 14 +- fs/bcachefs/trace.c | 1 + fs/bcachefs/trace.h | 31 +- fs/bcachefs/xattr.c | 2 +- 30 files changed, 848 insertions(+), 517 deletions(-) create mode 100644 fs/bcachefs/bbpos_types.h
Signature · 1 line
2.42.0
PATCH 1/6 bcachefs: move.c exports, refactoring
Prep work for the new rebalance code - we need a few helpers exported.
--- fs/bcachefs/move.c | 119 +++++++++++++++++++++------------------- fs/bcachefs/move.h | 22 +++++++- fs/bcachefs/rebalance.c | 3 +- 3 files changed, 85 insertions(+), 59 deletions(-)
fs/bcachefs/move.c +64 -55
@@ -171,8 +171,8 @@ void bch2_moving_ctxt_do_pending_writes(struct moving_context *ctxt, } } -static void bch2_move_ctxt_wait_for_io (struct moving_context *ctxt, -struct btree_trans *trans) +void bch2_move_ctxt_wait_for_io (struct moving_context *ctxt, +struct btree_trans *trans) {unsigned sectors_pending =atomic_read (&ctxt->write_sectors);
@@ -287,14 +287,13 @@ static int bch2_extent_drop_ptrs(struct btree_trans *trans,bch2_trans_commit (trans,NULL ,NULL ,BTREE_INSERT_NOFAIL ); } -static int bch2_move_extent (struct btree_trans *trans, -struct btree_iter *iter, -struct moving_context *ctxt, -struct move_bucket_in_flight *bucket_in_flight, -struct bch_io_opts io_opts, -enum btree_id btree_id, -struct bkey_s_c k, -struct data_update_opts data_opts) +int bch2_move_extent (struct btree_trans *trans, +struct btree_iter *iter, +struct moving_context *ctxt, +struct move_bucket_in_flight *bucket_in_flight, +struct bch_io_opts io_opts, +struct bkey_s_c k, +struct data_update_opts data_opts) {struct bch_fs *c = trans->c;struct bkey_ptrs_c ptrs =bch2_bkey_ptrs_c (k);
@@ -356,7 +355,7 @@ static int bch2_move_extent(struct btree_trans *trans, io->rbio.bio.bi_end_io = move_read_endio; ret =bch2_data_update_init (trans, ctxt, &io->write, ctxt->wp, - io_opts, data_opts, btree_id, k); + io_opts, data_opts, iter->btree_id, k);if (ret && ret != -BCH_ERR_unwritten_extent_update) goto err_free_pages;
@@ -371,6 +370,9 @@ static int bch2_move_extent(struct btree_trans *trans, io->write.ctxt = ctxt; io->write.op.end_io = move_write_done; +if (ctxt->rate) +bch2_ratelimit_increment (ctxt->rate, k.k->size); +if (ctxt->stats) {atomic64_inc (&ctxt->stats->keys_moved);atomic64_add (k.k->size, &ctxt->stats->sectors_moved);
@@ -400,7 +402,7 @@ static int bch2_move_extent(struct btree_trans *trans,closure_get (&ctxt->cl);bch2_read_extent (trans, &io->rbio,bkey_start_pos (k.k), - btree_id, k,0 , + iter->btree_id, k,0 ,BCH_READ_NODECODE |BCH_READ_LAST_FRAGMENT );return 0 ;
@@ -464,9 +466,9 @@ struct bch_io_opts *bch2_move_get_io_opts(struct btree_trans *trans,return &io_opts->fs_io_opts; } -static int bch2_move_get_io_opts_one (struct btree_trans *trans, -struct bch_io_opts *io_opts, -struct bkey_s_c extent_k) +int bch2_move_get_io_opts_one (struct btree_trans *trans, +struct bch_io_opts *io_opts, +struct bkey_s_c extent_k) {struct btree_iter iter;struct bkey_s_c k;
@@ -497,8 +499,8 @@ static int bch2_move_get_io_opts_one(struct btree_trans *trans,return 0 ; } -static int move_ratelimit (struct btree_trans *trans, -struct moving_context *ctxt) +int bch2_move_ratelimit (struct btree_trans *trans, +struct moving_context *ctxt) {struct bch_fs *c = trans->c;u64 delay;
@@ -545,7 +547,8 @@ static int move_ratelimit(struct btree_trans *trans,return 0 ; } -static int __bch2_move_data(struct moving_context *ctxt, +static int bch2_move_data_btree(struct btree_trans *trans, + struct moving_context *ctxt, struct bpos start, struct bpos end, move_pred_fn pred, void *arg,
@@ -555,7 +558,6 @@ static int __bch2_move_data(struct moving_context *ctxt,struct per_snapshot_io_opts snapshot_io_opts;struct bch_io_opts *io_opts;struct bkey_buf sk; -struct btree_trans *trans =bch2_trans_get (c);struct btree_iter iter;struct bkey_s_c k;struct data_update_opts data_opts;
@@ -577,7 +579,7 @@ static int __bch2_move_data(struct moving_context *ctxt,if (ctxt->rate)bch2_ratelimit_reset (ctxt->rate); -while (!move_ratelimit (trans, ctxt)) { +while (!bch2_move_ratelimit (trans, ctxt)) {bch2_trans_begin (trans); k =bch2_btree_iter_peek (&iter);
@@ -616,7 +618,7 @@ static int __bch2_move_data(struct moving_context *ctxt, k =bkey_i_to_s_c (sk.k); ret2 =bch2_move_extent (trans, &iter, ctxt,NULL , - *io_opts, btree_id, k, data_opts); + *io_opts, k, data_opts);if (ret2) {if (bch2_err_matches (ret2, BCH_ERR_transaction_restart))continue ;
@@ -630,9 +632,6 @@ static int __bch2_move_data(struct moving_context *ctxt,/* XXX signal failure */ goto next; } - -if (ctxt->rate) -bch2_ratelimit_increment (ctxt->rate, k.k->size); next:if (ctxt->stats)atomic64_add (k.k->size, &ctxt->stats->sectors_seen);
@@ -641,48 +640,60 @@ static int __bch2_move_data(struct moving_context *ctxt, }bch2_trans_iter_exit (trans, &iter); -bch2_trans_put (trans);bch2_bkey_buf_exit (&sk, c);per_snapshot_io_opts_exit (&snapshot_io_opts);return ret; } -int bch2_move_data (struct bch_fs *c, -enum btree_id start_btree_id,struct bpos start_pos, -enum btree_id end_btree_id,struct bpos end_pos, -struct bch_ratelimit *rate, -struct bch_move_stats *stats, -struct write_point_specifier wp, -bool wait_on_copygc, -move_pred_fn pred,void *arg) +int __bch2_move_data (struct btree_trans *trans, +struct moving_context *ctxt, +struct bbpos start, +struct bbpos end, +move_pred_fn pred,void *arg) { -struct moving_context ctxt; +struct bch_fs *c = trans->c;enum btree_id id;int ret =0 ; -bch2_moving_ctxt_init (&ctxt, c, rate, stats, wp, wait_on_copygc); - -for (id = start_btree_id; - id <=min_t (unsigned, end_btree_id,btree_id_nr_alive (c) -1 ); +for (id = start.btree; + id <=min_t (unsigned, end.btree,btree_id_nr_alive (c) -1 ); id++) { - stats->btree_id = id; + ctxt->stats->btree_id = id; -if (id != BTREE_ID_extents && - id != BTREE_ID_reflink) +if (!btree_type_has_ptrs (id) || + !bch2_btree_id_root (c, id)->b)continue ; -if (!bch2_btree_id_root (c, id)->b) -continue ; - - ret =__bch2_move_data (&ctxt, - id == start_btree_id ? start_pos :POS_MIN , - id == end_btree_id ? end_pos :POS_MAX , + ret =bch2_move_data_btree (trans, ctxt, + id == start.btree ? start.pos :POS_MIN , + id == end.btree ? end.pos :POS_MAX , pred, arg, id);if (ret)break ; } +return ret; +} + +int bch2_move_data (struct bch_fs *c, +struct bbpos start, +struct bbpos end, +struct bch_ratelimit *rate, +struct bch_move_stats *stats, +struct write_point_specifier wp, +bool wait_on_copygc, +move_pred_fn pred,void *arg) +{ + +struct btree_trans *trans; +struct moving_context ctxt; +int ret; + +bch2_moving_ctxt_init (&ctxt, c, rate, stats, wp, wait_on_copygc); + trans =bch2_trans_get (c); + ret =__bch2_move_data (trans, &ctxt, start, end, pred, arg); +bch2_trans_put (trans);bch2_moving_ctxt_exit (&ctxt);return ret;
@@ -739,7 +750,7 @@ int __bch2_evacuate_bucket(struct btree_trans *trans, goto err; } -while (!(ret =move_ratelimit (trans, ctxt))) { +while (!(ret =bch2_move_ratelimit (trans, ctxt))) {bch2_trans_begin (trans); ret = bch2_get_next_backpointer(trans, bucket, gen,
@@ -791,7 +802,7 @@ int __bch2_evacuate_bucket(struct btree_trans *trans, ret =bch2_move_extent (trans, &iter, ctxt, bucket_in_flight, - io_opts, bp.btree_id, k, data_opts); + io_opts, k, data_opts);bch2_trans_iter_exit (trans, &iter);if (bch2_err_matches (ret, BCH_ERR_transaction_restart))
@@ -804,8 +815,6 @@ int __bch2_evacuate_bucket(struct btree_trans *trans,if (ret) goto err; -if (ctxt->rate) -bch2_ratelimit_increment (ctxt->rate, k.k->size);if (ctxt->stats)atomic64_add (k.k->size, &ctxt->stats->sectors_seen); }else {
@@ -1087,8 +1096,8 @@ int bch2_data_job(struct bch_fs *c, ret =bch2_replicas_gc2 (c) ?: ret; ret = bch2_move_data(c, - op.start_btree, op.start_pos, - op.end_btree, op.end_pos, + (struct bbpos) { op.start_btree, op.start_pos }, + (struct bbpos) { op.end_btree, op.end_pos }, NULL, stats, writepoint_hashed((unsigned long) current),
@@ -1111,8 +1120,8 @@ int bch2_data_job(struct bch_fs *c, ret =bch2_replicas_gc2 (c) ?: ret; ret = bch2_move_data(c, - op.start_btree, op.start_pos, - op.end_btree, op.end_pos, + (struct bbpos) { op.start_btree, op.start_pos }, + (struct bbpos) { op.end_btree, op.end_pos }, NULL, stats, writepoint_hashed((unsigned long) current),
fs/bcachefs/move.h +20 -2
@@ -2,6 +2,7 @@#ifndef _BCACHEFS_MOVE_H#define _BCACHEFS_MOVE_H +#include "bbpos.h" #include "bcachefs_ioctl.h" #include "btree_iter.h" #include "buckets.h"
@@ -61,6 +62,9 @@ void bch2_moving_ctxt_init(struct moving_context *, struct bch_fs *,struct moving_io *bch2_moving_ctxt_next_pending_write (struct moving_context *);void bch2_moving_ctxt_do_pending_writes (struct moving_context *,struct btree_trans *); +void bch2_move_ctxt_wait_for_io (struct moving_context *, +struct btree_trans *); +int bch2_move_ratelimit (struct btree_trans *,struct moving_context *);/* Inodes in different snapshots may have different IO options: */ struct snapshot_io_opts_entry {
@@ -87,12 +91,26 @@ static inline void per_snapshot_io_opts_exit(struct per_snapshot_io_opts *io_optstruct bch_io_opts *bch2_move_get_io_opts (struct btree_trans *,struct per_snapshot_io_opts *,struct bkey_s_c ); +int bch2_move_get_io_opts_one (struct btree_trans *,struct bch_io_opts *,struct bkey_s_c );int bch2_scan_old_btree_nodes (struct bch_fs *,struct bch_move_stats *); +int bch2_move_extent (struct btree_trans *, +struct btree_iter *, +struct moving_context *, +struct move_bucket_in_flight *, +struct bch_io_opts , +struct bkey_s_c , +struct data_update_opts ); + +int __bch2_move_data (struct btree_trans *, +struct moving_context *, +struct bbpos , +struct bbpos , +move_pred_fn ,void *); int bch2_move_data(struct bch_fs *, - enum btree_id, struct bpos, - enum btree_id, struct bpos, + struct bbpos start, + struct bbpos end, struct bch_ratelimit *, struct bch_move_stats *, struct write_point_specifier,
fs/bcachefs/rebalance.c +1 -2
@@ -254,8 +254,7 @@ static int bch2_rebalance_thread(void *arg)rebalance_work_reset (c); bch2_move_data(c, - 0, POS_MIN, - BTREE_ID_NR, POS_MAX, + BBPOS_MIN, BBPOS_MAX, /* ratelimiting disabled for now */ NULL, /* &r->pd.rate, */ &move_stats,
Signature · 1 line
2.42.0
PATCH 2/6 bcachefs: moving_context now owns a btree_trans
In reply to Kent Overstreetbtree_trans and moving_context are used together, and having the moving_context owns the transaction object reduces some plumbing.
--- fs/bcachefs/data_update.c | 2 +- fs/bcachefs/move.c | 93 ++++++++++++++++++--------------------- fs/bcachefs/move.h | 27 +++++------- fs/bcachefs/movinggc.c | 36 +++++++-------- 4 files changed, 70 insertions(+), 88 deletions(-)
fs/bcachefs/data_update.c +1 -1
@@ -487,7 +487,7 @@ int bch2_data_update_init(struct btree_trans *trans,if (c->opts.nocow_enabled) {if (ctxt) { -move_ctxt_wait_event (ctxt, trans, +move_ctxt_wait_event (ctxt, (locked =bch2_bucket_nocow_trylock (&c->nocow_locks,PTR_BUCKET_POS (c, &p.ptr),0 )) || !atomic_read (&ctxt->read_sectors));
fs/bcachefs/move.c +42 -51
257 lines not on this page · raw message
fs/bcachefs/move.h +11 -16
@@ -12,7 +12,7 @@struct bch_read_bio ;struct moving_context { -struct bch_fs *c; +struct btree_trans *trans;struct list_head list;void *fn;
@@ -38,10 +38,10 @@ struct moving_context {wait_queue_head_t wait; }; -#define move_ctxt_wait_event (_ctxt, _trans, _cond) \ +#define move_ctxt_wait_event (_ctxt, _cond) \ do { \ bool cond_finished = false; \ - bch2_moving_ctxt_do_pending_writes(_ctxt, _trans); \ + bch2_moving_ctxt_do_pending_writes(_ctxt); \ \ if (_cond) \ break; \
@@ -60,11 +60,9 @@ void bch2_moving_ctxt_init(struct moving_context *, struct bch_fs *, struct bch_ratelimit *, struct bch_move_stats *, struct write_point_specifier, bool);struct moving_io *bch2_moving_ctxt_next_pending_write (struct moving_context *); -void bch2_moving_ctxt_do_pending_writes (struct moving_context *, -struct btree_trans *); -void bch2_move_ctxt_wait_for_io (struct moving_context *, -struct btree_trans *); -int bch2_move_ratelimit (struct btree_trans *,struct moving_context *); +void bch2_moving_ctxt_do_pending_writes (struct moving_context *); +void bch2_move_ctxt_wait_for_io (struct moving_context *); +int bch2_move_ratelimit (struct moving_context *);/* Inodes in different snapshots may have different IO options: */ struct snapshot_io_opts_entry {
@@ -95,16 +93,14 @@ int bch2_move_get_io_opts_one(struct btree_trans *, struct bch_io_opts *, structint bch2_scan_old_btree_nodes (struct bch_fs *,struct bch_move_stats *); -int bch2_move_extent (struct btree_trans *, -struct btree_iter *, -struct moving_context *, +int bch2_move_extent (struct moving_context *,struct move_bucket_in_flight *, -struct bch_io_opts , +struct btree_iter *,struct bkey_s_c , +struct bch_io_opts ,struct data_update_opts ); -int __bch2_move_data (struct btree_trans *, -struct moving_context *, +int __bch2_move_data (struct moving_context *,struct bbpos ,struct bbpos ,move_pred_fn ,void *);
@@ -117,8 +113,7 @@ int bch2_move_data(struct bch_fs *, bool, move_pred_fn, void *); -int __bch2_evacuate_bucket (struct btree_trans *, -struct moving_context *, +int __bch2_evacuate_bucket (struct moving_context *,struct move_bucket_in_flight *,struct bpos ,int ,struct data_update_opts );
fs/bcachefs/movinggc.c +16 -20
@@ -101,8 +101,7 @@ static int bch2_bucket_is_movable(struct btree_trans *trans,return ret; } -static void move_buckets_wait (struct btree_trans *trans, -struct moving_context *ctxt, +static void move_buckets_wait (struct moving_context *ctxt,struct buckets_in_flight *list,bool flush) {
@@ -111,7 +110,7 @@ static void move_buckets_wait(struct btree_trans *trans,while ((i = list->first)) {if (flush) -move_ctxt_wait_event (ctxt, trans, !atomic_read (&i->count)); +move_ctxt_wait_event (ctxt, !atomic_read (&i->count));if (atomic_read (&i->count))break ;
@@ -129,7 +128,7 @@ static void move_buckets_wait(struct btree_trans *trans,kfree (i); } -bch2_trans_unlock (trans); +bch2_trans_unlock (ctxt->trans); } static bool bucket_in_flight(struct buckets_in_flight *list,
@@ -140,11 +139,11 @@ static bool bucket_in_flight(struct buckets_in_flight *list,typedef DARRAY (struct move_bucket )move_buckets ; -static int bch2_copygc_get_buckets (struct btree_trans *trans, -struct moving_context *ctxt, +static int bch2_copygc_get_buckets (struct moving_context *ctxt,struct buckets_in_flight *buckets_in_flight,move_buckets *buckets) { +struct btree_trans *trans = ctxt->trans;struct bch_fs *c = trans->c;struct btree_iter iter;struct bkey_s_c k;
@@ -152,7 +151,7 @@ static int bch2_copygc_get_buckets(struct btree_trans *trans,size_t saw =0 , in_flight =0 , not_movable =0 , sectors =0 ;int ret; -move_buckets_wait (trans, ctxt, buckets_in_flight, false); +move_buckets_wait (ctxt, buckets_in_flight, false); ret =bch2_btree_write_buffer_flush (trans); if (bch2_fs_fatal_err_on(ret, c, "%s: error %s from bch2_btree_write_buffer_flush()",
@@ -188,10 +187,10 @@ static int bch2_copygc_get_buckets(struct btree_trans *trans, }noinline -static int bch2_copygc(struct btree_trans *trans, -struct moving_context *ctxt, +static int bch2_copygc(struct moving_context *ctxt,struct buckets_in_flight *buckets_in_flight) { +struct btree_trans *trans = ctxt->trans;struct bch_fs *c = trans->c;struct data_update_opts data_opts = { .btree_insert_flags = BCH_WATERMARK_copygc,
@@ -202,7 +201,7 @@ static int bch2_copygc(struct btree_trans *trans,u64 moved =atomic64_read (&ctxt->stats->sectors_moved);int ret =0 ; - ret =bch2_copygc_get_buckets (trans, ctxt, buckets_in_flight, &buckets); + ret =bch2_copygc_get_buckets (ctxt, buckets_in_flight, &buckets);if (ret) goto err;
@@ -221,7 +220,7 @@ static int bch2_copygc(struct btree_trans *trans,break ; } - ret =__bch2_evacuate_bucket (trans, ctxt, f, f->bucket.k.bucket, + ret =__bch2_evacuate_bucket (ctxt, f, f->bucket.k.bucket, f->bucket.k.gen, data_opts);if (ret) goto err;
@@ -300,7 +299,6 @@ void bch2_copygc_wait_to_text(struct printbuf *out, struct bch_fs *c)static int bch2_copygc_thread (void *arg) {struct bch_fs *c = arg; -struct btree_trans *trans;struct moving_context ctxt;struct bch_move_stats move_stats;struct io_clock *clock = &c->io_clock[WRITE ];
@@ -317,7 +315,6 @@ static int bch2_copygc_thread(void *arg) }set_freezable (); - trans =bch2_trans_get (c);bch2_move_stats_init (&move_stats,"copygc" ); bch2_moving_ctxt_init(&ctxt, c, NULL, &move_stats,
@@ -325,16 +322,16 @@ static int bch2_copygc_thread(void *arg) false);while (!ret && !kthread_should_stop ()) { -bch2_trans_unlock (trans); +bch2_trans_unlock (ctxt.trans);cond_resched ();if (!c->copy_gc_enabled) { -move_buckets_wait (trans, &ctxt, &buckets, true); +move_buckets_wait (&ctxt, &buckets, true);kthread_wait_freezable (c->copy_gc_enabled); }if (unlikely (freezing (current))) { -move_buckets_wait (trans, &ctxt, &buckets, true); +move_buckets_wait (&ctxt, &buckets, true);__refrigerator (false);continue ; }
@@ -345,7 +342,7 @@ static int bch2_copygc_thread(void *arg)if (wait > clock->max_slop) { c->copygc_wait_at = last; c->copygc_wait = last + wait; -move_buckets_wait (trans, &ctxt, &buckets, true); +move_buckets_wait (&ctxt, &buckets, true);trace_and_count (c, copygc_wait, c, wait, last + wait);bch2_kthread_io_clock_wait (clock, last + wait,MAX_SCHEDULE_TIMEOUT );
@@ -355,15 +352,14 @@ static int bch2_copygc_thread(void *arg) c->copygc_wait =0 ; c->copygc_running = true; - ret =bch2_copygc (trans, &ctxt, &buckets); + ret =bch2_copygc (&ctxt, &buckets); c->copygc_running = false;wake_up (&c->copygc_running_wq); } -move_buckets_wait (trans, &ctxt, &buckets, true); +move_buckets_wait (&ctxt, &buckets, true);rhashtable_destroy (&buckets.table); -bch2_trans_put (trans);bch2_moving_ctxt_exit (&ctxt);return 0 ;
Signature · 1 line
2.42.0
PATCH 3/6 bcachefs: move: convert to bbpos
In reply to Kent Overstreet--- fs/bcachefs/bbpos.h | 14 +------------- fs/bcachefs/bbpos_types.h | 18 ++++++++++++++++++ fs/bcachefs/chardev.c | 4 ++-- fs/bcachefs/data_update.c | 8 +++++--- fs/bcachefs/data_update.h | 1 + fs/bcachefs/move.c | 19 ++++++++----------- fs/bcachefs/move_types.h | 5 +++-- 7 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 fs/bcachefs/bbpos_types.h
fs/bcachefs/bbpos.h +1 -13
@@ -2,22 +2,10 @@#ifndef _BCACHEFS_BBPOS_H#define _BCACHEFS_BBPOS_H +#include "bbpos_types.h" #include "bkey_methods.h" #include "btree_cache.h" -struct bbpos { -enum btree_id btree; -struct bpos pos; -}; - -static inline struct bbpos BBPOS (enum btree_id btree,struct bpos pos) -{ -return (struct bbpos ) { btree, pos }; -} - -#define BBPOS_MIN BBPOS(0, POS_MIN) -#define BBPOS_MAX BBPOS(BTREE_ID_NR - 1, POS_MAX) -static inline int bbpos_cmp (struct bbpos l,struct bbpos r) {return cmp_int (l.btree, r.btree) ?:bpos_cmp (l.pos, r.pos);
fs/bcachefs/bbpos_types.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _BCACHEFS_BBPOS_TYPES_H +#define _BCACHEFS_BBPOS_TYPES_H + +struct bbpos { +enum btree_id btree; +struct bpos pos; +}; + +static inline struct bbpos BBPOS (enum btree_id btree,struct bpos pos) +{ +return (struct bbpos ) { btree, pos }; +} + +#define BBPOS_MIN BBPOS(0, POS_MIN) +#define BBPOS_MAX BBPOS(BTREE_ID_NR - 1, POS_MAX) + +#endif /* _BCACHEFS_BBPOS_TYPES_H */
fs/bcachefs/chardev.c +2 -2
@@ -332,8 +332,8 @@ static ssize_t bch2_data_job_read(struct file *file, char __user *buf,struct bch_ioctl_data_event e = { .type =BCH_DATA_EVENT_PROGRESS , .p.data_type = ctx->stats.data_type, - .p.btree_id = ctx->stats.btree_id, - .p.pos = ctx->stats.pos, + .p.btree_id = ctx->stats.pos.btree, + .p.pos = ctx->stats.pos.pos, .p.sectors_done =atomic64_read (&ctx->stats.sectors_seen), .p.sectors_total =bch2_fs_usage_read_short (c).used, };
fs/bcachefs/data_update.c +5 -3
@@ -281,11 +281,11 @@ static int __bch2_data_update_index_update(struct btree_trans *trans, }continue ; nowork: -if (m->ctxt && m->ctxt->stats) { +if (m->stats && m->stats) {BUG_ON (k.k->p.offset <= iter.pos.offset); -atomic64_inc (&m->ctxt->stats->keys_raced); +atomic64_inc (&m->stats->keys_raced);atomic64_add (k.k->p.offset - iter.pos.offset, - &m->ctxt->stats->sectors_raced); + &m->stats->sectors_raced); }this_cpu_inc (c->counters[BCH_COUNTER_move_extent_fail]);
@@ -439,6 +439,8 @@ int bch2_data_update_init(struct btree_trans *trans,bch2_bkey_buf_reassemble (&m->k, c, k); m->btree_id = btree_id; m->data_opts = data_opts; + m->ctxt = ctxt; + m->stats = ctxt->stats;bch2_write_op_init (&m->op, c, io_opts); m->op.pos =bkey_start_pos (k.k);
fs/bcachefs/data_update.h +1 -0
@@ -23,6 +23,7 @@ struct data_update {struct bkey_buf k;struct data_update_opts data_opts;struct moving_context *ctxt; +struct bch_move_stats *stats;struct bch_write_op op; };
fs/bcachefs/move.c +8 -11
@@ -367,7 +367,6 @@ int bch2_move_extent(struct moving_context *ctxt,BUG_ON (ret); - io->write.ctxt = ctxt; io->write.op.end_io = move_write_done;if (ctxt->rate)
@@ -567,8 +566,7 @@ static int bch2_move_data_btree(struct moving_context *ctxt,if (ctxt->stats) { ctxt->stats->data_type = BCH_DATA_user; - ctxt->stats->btree_id = btree_id; - ctxt->stats->pos = start; + ctxt->stats->pos =BBPOS (btree_id, start); } bch2_trans_iter_init(trans, &iter, btree_id, start,
@@ -595,7 +593,7 @@ static int bch2_move_data_btree(struct moving_context *ctxt,break ;if (ctxt->stats) - ctxt->stats->pos = iter.pos; + ctxt->stats->pos =BBPOS (iter.btree_id, iter.pos);if (!bkey_extent_is_direct_data (k.k)) goto next_nondata;
@@ -656,7 +654,7 @@ int __bch2_move_data(struct moving_context *ctxt,for (id = start.btree; id <=min_t (unsigned, end.btree,btree_id_nr_alive (c) -1 ); id++) { - ctxt->stats->btree_id = id; + ctxt->stats->pos =BBPOS (id,POS_MIN );if (!btree_type_has_ptrs (id) || !bch2_btree_id_root (c, id)->b)
@@ -894,7 +892,7 @@ static int bch2_move_btree(struct bch_fs *c,for (id = start_btree_id; id <=min_t (unsigned, end_btree_id,btree_id_nr_alive (c) -1 ); id++) { - stats->btree_id = id; + stats->pos =BBPOS (id,POS_MIN );if (!bch2_btree_id_root (c, id)->b)continue ;
@@ -913,7 +911,7 @@ static int bch2_move_btree(struct bch_fs *c, bpos_cmp(b->key.k.p, end_pos)) > 0)break ; - stats->pos = iter.pos; + stats->pos =BBPOS (iter.btree_id, iter.pos);if (!pred (c, arg, b, &io_opts, &data_opts)) goto next;
@@ -1139,10 +1137,9 @@ static void bch2_moving_ctxt_to_text(struct printbuf *out, struct bch_fs *c, strprt_printf (out,"%s (%ps):" , stats->name, ctxt->fn);prt_newline (out); -prt_printf (out," data type %s btree_id %s position: " , - bch2_data_types[stats->data_type], -bch2_btree_id_str (stats->btree_id)); -bch2_bpos_to_text (out, stats->pos); +prt_printf (out," data type %s position: " , + bch2_data_types[stats->data_type]); +bch2_bbpos_to_text (out, stats->pos);prt_newline (out);printbuf_indent_add (out,2 );
fs/bcachefs/move_types.h +3 -2
@@ -2,10 +2,11 @@ #ifndef _BCACHEFS_MOVE_TYPES_H #define _BCACHEFS_MOVE_TYPES_H +#include "bbpos_types.h" + struct bch_move_stats { enum bch_data_type data_type; - enum btree_id btree_id; - struct bpos pos; + struct bbpos pos; struct list_head list; char name[32];
Signature · 1 line
2.42.0
PATCH 4/6 bcachefs: move: move_stats refactoring
In reply to Kent Overstreetdata_progress_list is gone - it was redundant with moving_context_list
The upcoming rebalance rewrite is going to have it using two different move_stats objects with the same moving_context, depending on whether it's scanning or using the rebalance_work btree - this patch plumbs stats around a bit differently so that will work.
--- fs/bcachefs/bcachefs.h | 3 -- fs/bcachefs/data_update.c | 2 +- fs/bcachefs/move.c | 98 +++++++++++++++++++++------------------ fs/bcachefs/move.h | 5 +- fs/bcachefs/move_types.h | 3 +- fs/bcachefs/movinggc.c | 1 + fs/bcachefs/trace.c | 1 + fs/bcachefs/trace.h | 31 +++++++++---- 8 files changed, 82 insertions(+), 62 deletions(-)
fs/bcachefs/bcachefs.h +0 -3
@@ -939,9 +939,6 @@ struct bch_fs {struct list_head moving_context_list;struct mutex moving_context_lock; -struct list_head data_progress_list; -struct mutex data_progress_lock; -/* REBALANCE */ struct bch_fs_rebalance rebalance;
fs/bcachefs/data_update.c +1 -1
@@ -440,7 +440,7 @@ int bch2_data_update_init(struct btree_trans *trans, m->btree_id = btree_id; m->data_opts = data_opts; m->ctxt = ctxt; - m->stats = ctxt->stats; + m->stats = ctxt ? ctxt->stats :NULL ;bch2_write_op_init (&m->op, c, io_opts); m->op.pos =bkey_start_pos (k.k);
fs/bcachefs/move.c +53 -45
185 lines not on this page · raw message
fs/bcachefs/move.h +4 -1
@@ -127,7 +127,10 @@ int bch2_data_job(struct bch_fs *, struct bch_move_stats *, struct bch_ioctl_data); -void bch2_move_stats_init (struct bch_move_stats *stats,char *name); +void bch2_move_stats_to_text (struct printbuf *,struct bch_move_stats *); +void bch2_move_stats_exit (struct bch_move_stats *,struct bch_fs *); +void bch2_move_stats_init (struct bch_move_stats *,char *); +void bch2_fs_moving_ctxts_to_text (struct printbuf *,struct bch_fs *);void bch2_fs_move_init (struct bch_fs *);
fs/bcachefs/move_types.h +1 -2
@@ -7,13 +7,12 @@struct bch_move_stats {enum bch_data_type data_type;struct bbpos pos; -struct list_head list;char name[32 ];atomic64_t keys_moved;atomic64_t keys_raced; -atomic64_t sectors_moved;atomic64_t sectors_seen; +atomic64_t sectors_moved;atomic64_t sectors_raced; };
fs/bcachefs/movinggc.c +1 -0
@@ -361,6 +361,7 @@ static int bch2_copygc_thread(void *arg)move_buckets_wait (&ctxt, &buckets, true);rhashtable_destroy (&buckets.table);bch2_moving_ctxt_exit (&ctxt); +bch2_move_stats_exit (&move_stats, c);return 0 ; }
fs/bcachefs/trace.c +1 -0
@@ -7,6 +7,7 @@#include "btree_locking.h" #include "btree_update_interior.h" #include "keylist.h" +#include "move_types.h" #include "opts.h" #include "six.h"
fs/bcachefs/trace.h +21 -10
@@ -767,25 +767,36 @@ DEFINE_EVENT(bkey, move_extent_alloc_mem_fail, );TRACE_EVENT (move_data, - TP_PROTO(struct bch_fs *c, u64 sectors_moved, - u64 keys_moved), -TP_ARGS (c, sectors_moved, keys_moved), + TP_PROTO(struct bch_fs *c, + struct bch_move_stats *stats), +TP_ARGS (c, stats),TP_STRUCT__entry ( - __field(dev_t, dev ) - __field(u64, sectors_moved ) + __field(dev_t, dev ) __field(u64, keys_moved ) + __field(u64, keys_raced ) + __field(u64, sectors_seen ) + __field(u64, sectors_moved ) +__field (u64, sectors_raced ) ),TP_fast_assign ( - __entry->dev = c->dev; - __entry->sectors_moved = sectors_moved; - __entry->keys_moved = keys_moved; + __entry->dev = c->dev; + __entry->keys_moved = atomic64_read(&stats->keys_moved); + __entry->keys_raced = atomic64_read(&stats->keys_raced); + __entry->sectors_seen = atomic64_read(&stats->sectors_seen); + __entry->sectors_moved = atomic64_read(&stats->sectors_moved); + __entry->sectors_raced = atomic64_read(&stats->sectors_raced); ), -TP_printk ("%d,%d sectors_moved %llu keys_moved %llu" , +TP_printk ("%d,%d keys moved %llu raced %llu" +"sectors seen %llu moved %llu raced %llu" ,MAJOR (__entry->dev),MINOR (__entry->dev), - __entry->sectors_moved, __entry->keys_moved) + __entry->keys_moved, + __entry->keys_raced, + __entry->sectors_seen, + __entry->sectors_moved, + __entry->sectors_raced) ); TRACE_EVENT(evacuate_bucket,
Signature · 1 line
2.42.0
PATCH 5/6 bcachefs: bch2_inum_opts_get()
In reply to Kent OverstreetNew helper for new rebalance code
--- fs/bcachefs/inode.c | 12 ++++++++++++ fs/bcachefs/inode.h | 1 + 2 files changed, 13 insertions(+)
fs/bcachefs/inode.c +12 -0
@@ -981,6 +981,18 @@ void bch2_inode_opts_get(struct bch_io_opts *opts, struct bch_fs *c, opts->compression = opts->background_compression = opts->data_checksum = opts->erasure_code =0 ; } +int bch2_inum_opts_get (struct btree_trans *trans,subvol_inum inum,struct bch_io_opts *opts) +{ +struct bch_inode_unpacked inode; +int ret =lockrestart_do (trans,bch2_inode_find_by_inum_trans (trans, inum, &inode)); + +if (ret) +return ret; + +bch2_inode_opts_get (opts, trans->c, &inode); +return 0 ; +} +int bch2_inode_rm_snapshot (struct btree_trans *trans,u64 inum,u32 snapshot) {struct bch_fs *c = trans->c;
fs/bcachefs/inode.h +1 -0
@@ -200,6 +200,7 @@ void bch2_inode_nlink_dec(struct btree_trans *, struct bch_inode_unpacked *);struct bch_opts bch2_inode_opts_to_opts (struct bch_inode_unpacked *);void bch2_inode_opts_get (struct bch_io_opts *,struct bch_fs *,struct bch_inode_unpacked *); +int bch2_inum_opts_get (struct btree_trans *,subvol_inum ,struct bch_io_opts *);int bch2_inode_rm_snapshot (struct btree_trans *,u64 ,u32 );int bch2_delete_dead_inodes (struct bch_fs *);
Signature · 1 line
2.42.0
PATCH 6/6 bcachefs: rebalance_work
In reply to Kent OverstreetThis adds a new btree, rebalance_work, to eliminate scanning required for finding extents that need work done on them in the background - i.e. for the background_target and background_compression options.
rebalance_work is a bitset btree, where a KEY_TYPE_set corresponds to an extent in the extents or reflink btree at the same pos.
A new extent field is added, bch_extent_rebalance, which indicates that this extent has work that needs to be done in the background - and which options to use. This allows per-inode options to be propagated to indirect extents - at least in some circumstances. In this patch, changing IO options on a file will not propagate the new options to indirect extents pointed to by that file.
Updating (setting/clearing) the rebalance_work btree is done by the extent trigger, which looks at the bch_extent_rebalance field.
Scanning is still requrired after changing IO path options - either just for a given inode, or for the whole filesystem. We indicate that scanning is required by adding a KEY_TYPE_cookie key to the rebalance_work btree: the cookie counter is so that we can detect that scanning is still required when an option has been flipped mid-way through an existing scan.
Future possible work:
- Propagate options to indirect extents when being changed
- Add other IO path options - nr_replicas, ec, to rebalance_work so they can be applied in the background when they change
- Add a counter, for bcachefs fs usage output, showing the pending amount of rebalance work: we'll probably want to do this after the disk space accounting rewrite (moving it to a new btree)
--- fs/bcachefs/bcachefs.h | 1 + fs/bcachefs/bcachefs_format.h | 34 +-- fs/bcachefs/buckets.c | 10 + fs/bcachefs/compress.c | 18 +- fs/bcachefs/compress.h | 2 + fs/bcachefs/data_update.c | 11 +- fs/bcachefs/extents.c | 155 +++++++++- fs/bcachefs/extents.h | 20 ++ fs/bcachefs/io_misc.c | 11 +- fs/bcachefs/io_write.c | 20 +- fs/bcachefs/rebalance.c | 552 ++++++++++++++++++++-------------- fs/bcachefs/rebalance.h | 9 +- fs/bcachefs/rebalance_types.h | 31 +- fs/bcachefs/recovery.c | 1 + fs/bcachefs/recovery_types.h | 1 + fs/bcachefs/reflink.c | 19 +- fs/bcachefs/sysfs.c | 14 +- fs/bcachefs/xattr.c | 2 +- 18 files changed, 597 insertions(+), 314 deletions(-)
fs/bcachefs/bcachefs.h +1 -0
@@ -464,6 +464,7 @@ enum gc_phase { GC_PHASE_BTREE_snapshot_trees, GC_PHASE_BTREE_deleted_inodes, GC_PHASE_BTREE_logged_ops, + GC_PHASE_BTREE_rebalance_work, GC_PHASE_PENDING_DELETE, };
fs/bcachefs/bcachefs_format.h +12 -22
@@ -613,31 +613,17 @@ struct bch_extent_stripe_ptr {#endif }; -struct bch_extent_reservation { -#if defined(__LITTLE_ENDIAN_BITFIELD) -__u64 type:6 , - unused:22 , - replicas:4 , - generation:32 ; -#elif defined (__BIG_ENDIAN_BITFIELD) -__u64 generation:32 , - replicas:4 , - unused:22 , - type:6 ; -#endif -}; -struct bch_extent_rebalance {#if defined(__LITTLE_ENDIAN_BITFIELD) -__u64 type:7 , - unused:33 , - compression:8 , +__u64 type:6 , + unused:34 , + compression:8 ,/* enum bch_compression_opt */ target:16 ;#elif defined (__BIG_ENDIAN_BITFIELD)__u64 target:16 , compression:8 , - unused:33 , - type:7 ; + unused:34 , + type:6 ;#endif };
@@ -1682,7 +1668,9 @@ struct bch_sb_field_journal_seq_blacklist {x (snapshot_skiplists,BCH_VERSION (1 ,1 ), \ BIT_ULL(BCH_RECOVERY_PASS_check_snapshots)) \x (deleted_inodes,BCH_VERSION (1 ,2 ), \ - BIT_ULL(BCH_RECOVERY_PASS_check_inodes)) + BIT_ULL(BCH_RECOVERY_PASS_check_inodes)) \ +x (rebalance_work,BCH_VERSION (1 ,3 ), \ + BIT_ULL(BCH_RECOVERY_PASS_set_fs_needs_rebalance))enum bcachefs_metadata_version { bcachefs_metadata_version_min =9 ,
@@ -1693,7 +1681,7 @@ enum bcachefs_metadata_version { };static const __maybe_unused -unsigned bcachefs_metadata_required_upgrade_below = bcachefs_metadata_version_major_minor; +unsigned bcachefs_metadata_required_upgrade_below = bcachefs_metadata_version_rebalance_work;#define bcachefs_metadata_version_current (bcachefs_metadata_version_max - 1)
@@ -2306,7 +2294,9 @@ enum btree_id_flags { BIT_ULL(KEY_TYPE_set)) \ x(logged_ops, 17, 0, \ BIT_ULL(KEY_TYPE_logged_op_truncate)| \ - BIT_ULL(KEY_TYPE_logged_op_finsert)) + BIT_ULL(KEY_TYPE_logged_op_finsert)) \ + x(rebalance_work, 18, BTREE_ID_SNAPSHOTS, \ + BIT_ULL(KEY_TYPE_set)|BIT_ULL(KEY_TYPE_cookie)) enum btree_id { #define x(name, nr, ...) BTREE_ID_##name = nr,
fs/bcachefs/buckets.c +10 -0
@@ -1536,6 +1536,16 @@ int bch2_trans_mark_extent(struct btree_trans *trans, struct bkey_s_c old, struct bkey_i *new, unsigned flags) { + struct bch_fs *c = trans->c; +int mod = (int )bch2_bkey_needs_rebalance (c,bkey_i_to_s_c (new)) - + (int )bch2_bkey_needs_rebalance (c, old); + +if (mod) { +int ret =bch2_btree_bit_mod (trans, BTREE_ID_rebalance_work, new->k.p, mod >0 ); +if (ret) +return ret; + } +return trigger_run_overwrite_then_insert (__trans_mark_extent, trans, btree_id, level, old, new, flags); }
fs/bcachefs/compress.c +13 -5
@@ -697,18 +697,26 @@ int bch2_opt_compression_parse(struct bch_fs *c, const char *_val, u64 *res,return ret; } -void bch2_opt_compression_to_text (struct printbuf *out, -struct bch_fs *c, -struct bch_sb *sb, -u64 v) +void bch2_compression_opt_to_text (struct printbuf *out,u64 v) {struct bch_compression_opt opt =bch2_compression_decode (v); -prt_str (out, bch2_compression_opts[opt.type]); +if (opt.type <BCH_COMPRESSION_OPT_NR ) +prt_str (out, bch2_compression_opts[opt.type]); +else +prt_printf (out,"(unknown compression opt %u)" , opt.type);if (opt.level)prt_printf (out,":%u" , opt.level); } +void bch2_opt_compression_to_text (struct printbuf *out, +struct bch_fs *c, +struct bch_sb *sb, +u64 v) +{ +return bch2_compression_opt_to_text (out, v); +} +int bch2_opt_compression_validate (u64 v,struct printbuf *err) {if (!bch2_compression_opt_valid (v)) {
fs/bcachefs/compress.h +2 -0
@@ -58,6 +58,8 @@ int bch2_check_set_has_compressed_data(struct bch_fs *, unsigned);void bch2_fs_compress_exit (struct bch_fs *);int bch2_fs_compress_init (struct bch_fs *); +void bch2_compression_opt_to_text (struct printbuf *,u64 ); +int bch2_opt_compression_parse (struct bch_fs *,const char *,u64 *,struct printbuf *);void bch2_opt_compression_to_text (struct printbuf *,struct bch_fs *,struct bch_sb *,u64 );int bch2_opt_compression_validate (u64 ,struct printbuf *);
fs/bcachefs/data_update.c +6 -5
@@ -13,6 +13,7 @@#include "keylist.h" #include "move.h" #include "nocow_locking.h" +#include "rebalance.h" #include "subvolume.h" #include "trace.h"
@@ -251,11 +252,11 @@ static int __bch2_data_update_index_update(struct btree_trans *trans, ret =bch2_insert_snapshot_whiteouts (trans, m->btree_id, k.k->p,bkey_start_pos (&insert->k)) ?:bch2_insert_snapshot_whiteouts (trans, m->btree_id, - k.k->p, insert->k.p); -if (ret) - goto err; - - ret =bch2_trans_update (trans, &iter, insert, + k.k->p, insert->k.p) ?: +bch2_bkey_set_needs_rebalance (c, insert, + op->opts.background_target, + op->opts.background_compression) ?: +bch2_trans_update (trans, &iter, insert,BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE ) ?: bch2_trans_commit(trans, &op->res, NULL,
fs/bcachefs/extents.c +142 -13
187 lines not on this page · raw message
fs/bcachefs/extents.h +20 -0
@@ -89,6 +89,18 @@ static inline void __extent_entry_insert(struct bkey_i *k,memcpy_u64s_small (dst, new,extent_entry_u64s (new)); } +static inline void extent_entry_drop (struct bkey_s k,union bch_extent_entry *entry) +{ +union bch_extent_entry *next =extent_entry_next (entry); + +/* stripes have ptrs, but their layout doesn't work with this code */ +BUG_ON (k.k->type == KEY_TYPE_stripe); + +memmove_u64s_down (entry, next, + (u64 *)bkey_val_end (k) - (u64 *) next); + k.k->u64s -= (u64 *) next - (u64 *) entry; +} +static inline bool extent_entry_is_ptr (const union bch_extent_entry *e) {return extent_entry_type (e) == BCH_EXTENT_ENTRY_ptr;
@@ -698,6 +710,14 @@ int bch2_bkey_ptrs_invalid(const struct bch_fs *, struct bkey_s_c,void bch2_ptr_swab (struct bkey_s ); +const struct bch_extent_rebalance *bch2_bkey_rebalance_opts (struct bkey_s_c ); +unsigned bch2_bkey_ptrs_need_rebalance (struct bch_fs *,struct bkey_s_c , +unsigned ,unsigned ); +bool bch2_bkey_needs_rebalance (struct bch_fs *,struct bkey_s_c ); + +int bch2_bkey_set_needs_rebalance (struct bch_fs *,struct bkey_i *, +unsigned ,unsigned ); +/* Generic extent code: */ enum bch_extent_overlap {
fs/bcachefs/io_misc.c +10 -1
@@ -16,6 +16,7 @@#include "io_misc.h" #include "io_write.h" #include "logged_ops.h" +#include "rebalance.h" #include "subvolume.h" /* Overwrites whatever was present with zeroes: */
@@ -355,6 +356,7 @@ static int __bch2_resume_logged_op_finsert(struct btree_trans *trans,struct btree_iter iter;struct bkey_i_logged_op_finsert *op =bkey_i_to_logged_op_finsert (op_k);subvol_inum inum = {le32_to_cpu (op->v.subvol),le64_to_cpu (op->v.inum) }; +struct bch_io_opts opts;u64 dst_offset =le64_to_cpu (op->v.dst_offset);u64 src_offset =le64_to_cpu (op->v.src_offset);s64 shift = dst_offset - src_offset;
@@ -363,6 +365,10 @@ static int __bch2_resume_logged_op_finsert(struct btree_trans *trans,bool insert = shift >0 ;int ret =0 ; + ret =bch2_inum_opts_get (trans, inum, &opts); +if (ret) +return ret; +bch2_trans_iter_init (trans, &iter, BTREE_ID_extents,POS (inum.inum,0 ),BTREE_ITER_INTENT );
@@ -443,7 +449,10 @@ case LOGGED_OP_FINSERT_shift_extents: op->v.pos =cpu_to_le64 (insert ?bkey_start_offset (&delete.k) : delete.k.p.offset); - ret =bch2_btree_insert_trans (trans, BTREE_ID_extents, &delete,0 ) ?: + ret =bch2_bkey_set_needs_rebalance (c, copy, + opts.background_target, + opts.background_compression) ?: +bch2_btree_insert_trans (trans, BTREE_ID_extents, &delete,0 ) ?:bch2_btree_insert_trans (trans, BTREE_ID_extents, copy,0 ) ?:bch2_logged_op_update (trans, &op->k_i) ?:bch2_trans_commit (trans, &disk_res,NULL ,BTREE_INSERT_NOFAIL );
fs/bcachefs/io_write.c +7 -13
@@ -351,10 +351,13 @@ static int bch2_write_index_default(struct bch_write_op *op)bkey_start_pos (&sk.k->k), BTREE_ITER_SLOTS|BTREE_ITER_INTENT); - ret =bch2_extent_update (trans, inum, &iter, sk.k, - &op->res, - op->new_i_size, &op->i_sectors_delta, - op->flags &BCH_WRITE_CHECK_ENOSPC ); + ret =bch2_bkey_set_needs_rebalance (c, sk.k, + op->opts.background_target, + op->opts.background_compression) ?: +bch2_extent_update (trans, inum, &iter, sk.k, + &op->res, + op->new_i_size, &op->i_sectors_delta, + op->flags &BCH_WRITE_CHECK_ENOSPC );bch2_trans_iter_exit (trans, &iter);if (bch2_err_matches (ret, BCH_ERR_transaction_restart))
@@ -495,7 +498,6 @@ static void __bch2_write_index(struct bch_write_op *op) {struct bch_fs *c = op->c;struct keylist *keys = &op->insert_keys; -struct bkey_i *k;unsigned dev;int ret =0 ;
@@ -505,14 +507,6 @@ static void __bch2_write_index(struct bch_write_op *op) goto err; } -/* -* probably not the ideal place to hook this in, but I don't -* particularly want to plumb io_opts all the way through the btree -* update stack right now -*/ -for_each_keylist_key (keys, k) -bch2_rebalance_add_key (c,bkey_i_to_s_c (k), &op->opts); -if (!bch2_keylist_empty (keys)) {u64 sectors_start =keylist_sectors (keys);
fs/bcachefs/rebalance.c +326 -226
646 lines not on this page · raw message
fs/bcachefs/rebalance.h +4 -5
@@ -4,6 +4,9 @@#include "rebalance_types.h" +int bch2_set_rebalance_needs_scan (struct bch_fs *,u64 inum); +int bch2_set_fs_needs_rebalance (struct bch_fs *); +static inline void rebalance_wakeup (struct bch_fs *c) {struct task_struct *p;
@@ -15,11 +18,7 @@ static inline void rebalance_wakeup(struct bch_fs *c)rcu_read_unlock (); } -void bch2_rebalance_add_key (struct bch_fs *,struct bkey_s_c , -struct bch_io_opts *); -void bch2_rebalance_add_work (struct bch_fs *,u64 ); - -void bch2_rebalance_work_to_text (struct printbuf *,struct bch_fs *); +void bch2_rebalance_status_to_text (struct printbuf *,struct bch_fs *);void bch2_rebalance_stop (struct bch_fs *);int bch2_rebalance_start (struct bch_fs *);
fs/bcachefs/rebalance_types.h +21 -10
@@ -2,25 +2,36 @@#ifndef _BCACHEFS_REBALANCE_TYPES_H#define _BCACHEFS_REBALANCE_TYPES_H +#include "bbpos_types.h" #include "move_types.h" -enum rebalance_state { -REBALANCE_WAITING , -REBALANCE_THROTTLED , -REBALANCE_RUNNING , +#define BCH_REBALANCE_STATES () \ + x(waiting) \ + x(working) \ + x(scanning) + +enum bch_rebalance_states { +#define x(t) BCH_REBALANCE_##t, + BCH_REBALANCE_STATES() +#undef x };struct bch_fs_rebalance { -struct task_struct __rcu *thread; +struct task_struct __rcu *thread;struct bch_pd_controller pd; -atomic64_t work_unknown_dev; +enum bch_rebalance_states state; +u64 wait_iotime_start; +u64 wait_iotime_end; +u64 wait_wallclock_start; + +struct bch_move_stats work_stats; -enum rebalance_state state; -u64 throttled_until_iotime; -unsigned long throttled_until_cputime; +struct bbpos scan_start; +struct bbpos scan_end; +struct bch_move_stats scan_stats; -unsigned enabled:1 ; +unsigned enabled:1 ; };#endif /* _BCACHEFS_REBALANCE_TYPES_H */
fs/bcachefs/recovery.c +1 -0
@@ -23,6 +23,7 @@#include "logged_ops.h" #include "move.h" #include "quota.h" +#include "rebalance.h" #include "recovery.h" #include "replicas.h" #include "sb-clean.h"
fs/bcachefs/recovery_types.h +1 -0
@@ -42,6 +42,7 @@ x(check_nlinks, PASS_FSCK) \ x(delete_dead_inodes, PASS_FSCK|PASS_UNCLEAN) \ x(fix_reflink_p, 0) \ + x(set_fs_needs_rebalance, 0) \enum bch_recovery_pass {#define x(n, when) BCH_RECOVERY_PASS_##n,
fs/bcachefs/reflink.c +14 -5
@@ -7,6 +7,7 @@#include "inode.h" #include "io_misc.h" #include "io_write.h" +#include "rebalance.h" #include "reflink.h" #include "subvolume.h" #include "super-io.h"
@@ -252,6 +253,7 @@ s64 bch2_remap_range(struct bch_fs *c,struct bpos dst_start =POS (dst_inum.inum, dst_offset);struct bpos src_start =POS (src_inum.inum, src_offset);struct bpos dst_end = dst_start, src_end = src_start; +struct bch_io_opts opts;struct bpos src_want;u64 dst_done;u32 dst_snapshot, src_snapshot;
@@ -269,6 +271,10 @@ s64 bch2_remap_range(struct bch_fs *c,bch2_bkey_buf_init (&new_src); trans =bch2_trans_get (c); + ret =bch2_inum_opts_get (trans, src_inum, &opts); +if (ret) + goto err; +bch2_trans_iter_init (trans, &src_iter, BTREE_ID_extents, src_start,BTREE_ITER_INTENT ); bch2_trans_iter_init(trans, &dst_iter, BTREE_ID_extents, dst_start,
@@ -352,10 +358,13 @@ s64 bch2_remap_range(struct bch_fs *c,min (src_k.k->p.offset - src_want.offset, dst_end.offset - dst_iter.pos.offset)); - ret =bch2_extent_update (trans, dst_inum, &dst_iter, - new_dst.k, &disk_res, - new_i_size, i_sectors_delta, - true); + ret =bch2_bkey_set_needs_rebalance (c, new_dst.k, + opts.background_target, + opts.background_compression) ?: +bch2_extent_update (trans, dst_inum, &dst_iter, + new_dst.k, &disk_res, + new_i_size, i_sectors_delta, + true);bch2_disk_reservation_put (c, &disk_res); }bch2_trans_iter_exit (trans, &dst_iter);
@@ -386,7 +395,7 @@ s64 bch2_remap_range(struct bch_fs *c,bch2_trans_iter_exit (trans, &inode_iter); }while (bch2_err_matches (ret2, BCH_ERR_transaction_restart)); - +err:bch2_trans_put (trans);bch2_bkey_buf_exit (&new_src, c);bch2_bkey_buf_exit (&new_dst, c);
fs/bcachefs/sysfs.c +6 -8
@@ -212,7 +212,7 @@ read_attribute(copy_gc_wait);rw_attribute (rebalance_enabled);sysfs_pd_controller_attribute (rebalance); -read_attribute (rebalance_work); +read_attribute (rebalance_status);rw_attribute (promote_whole_extents);read_attribute (new_stripes);
@@ -386,8 +386,8 @@ SHOW(bch2_fs)if (attr == &sysfs_copy_gc_wait)bch2_copygc_wait_to_text (out, c); -if (attr == &sysfs_rebalance_work) -bch2_rebalance_work_to_text (out, c); +if (attr == &sysfs_rebalance_status) +bch2_rebalance_status_to_text (out, c);sysfs_print (promote_whole_extents, c->promote_whole_extents);
@@ -646,7 +646,7 @@ struct attribute *bch2_fs_internal_files[] = { &sysfs_copy_gc_wait, &sysfs_rebalance_enabled, - &sysfs_rebalance_work, + &sysfs_rebalance_status,sysfs_pd_controller_files (rebalance), &sysfs_moving_ctxts,
@@ -707,10 +707,8 @@ STORE(bch2_fs_opts_dir)bch2_opt_set_by_id (&c->opts, id, v);if ((id == Opt_background_target || - id == Opt_background_compression) && v) { -bch2_rebalance_add_work (c,S64_MAX ); -rebalance_wakeup (c); - } + id == Opt_background_compression) && v) +bch2_set_rebalance_needs_scan (c,0 ); ret = size; err:
fs/bcachefs/xattr.c +1 -1
@@ -590,7 +590,7 @@ static int bch2_xattr_bcachefs_set(const struct xattr_handler *handler,if (value && (opt_id == Opt_background_compression || opt_id == Opt_background_target)) -bch2_rebalance_add_work (c, inode->v.i_blocks); +bch2_set_rebalance_needs_scan (c, inode->ei_inode.bi_inum);return bch2_err_class (ret); }
Signature · 1 line
2.42.0
Re: [PATCH 6/6] bcachefs: rebalance_work
Hi Kent,
Quoted 33 lines · Kent Overstreet
This adds a new btree,
rebalance_work, to eliminate scanning required for finding extents that need work done on them in the background - i.e. for thebackground_targetandbackground_compressionoptions.
rebalance_workis a bitset btree, where aKEY_TYPE_setcorresponds to an extent in the extents or reflink btree at the same pos.A new extent field is added,
bch_extent_rebalance, which indicates that this extent has work that needs to be done in the background - and which options to use. This allows per-inode options to be propagated to indirect extents - at least in some circumstances. In this patch, changing IO options on a file will not propagate the new options to indirect extents pointed to by that file.Updating (setting/clearing) the
rebalance_workbtree is done by the extent trigger, which looks at thebch_extent_rebalancefield.Scanning is still requrired after changing IO path options - either just for a given inode, or for the whole filesystem. We indicate that scanning is required by adding a
KEY_TYPE_cookiekey to therebalance_workbtree: the cookie counter is so that we can detect that scanning is still required when an option has been flipped mid-way through an existing scan.Future possible work:
- Propagate options to indirect extents when being changed
- Add other IO path options -nr_replicas, ec, torebalance_workso they can be applied in the background when they change
- Add a counter, for bcachefs fs usage output, showing the pending amount of rebalance work: we'll probably want to do this after the disk space accounting rewrite (moving it to a new btree)Signed-off-by Kent Overstreet <[email protected]>
<snip>
Quoted 21 lines
fs/bcachefs/reflink.c +2
-0@@ -7,6 +7,7 @@#include "inode.h" #include "io_misc.h" #include "io_write.h" +#include "rebalance.h" #include "reflink.h" #include "subvolume.h" #include "super-io.h" @@ -252,6 +253,7 @@ s64 bch2_remap_range(struct bch_fs *c,struct bpos dst_start =POS (dst_inum.inum, dst_offset);struct bpos src_start =POS (src_inum.inum, src_offset);struct bpos dst_end = dst_start, src_end = src_start; +struct bch_io_opts opts;struct bpos src_want;u64 dst_done;u32 dst_snapshot, src_snapshot;
fs/bcachefs/reflink.c s64 bch2_remap_range(struct bch_fs *c, · line 277
Quoted 7 lines
fs/bcachefs/reflink.c +4
-0@@ -269,6 +271,10 @@ s64 bch2_remap_range(struct bch_fs *c,bch2_bkey_buf_init (&new_src); trans =bch2_trans_get (c); + ret =bch2_inum_opts_get (trans, src_inum, &opts); +if (ret) + goto err; +
Not sure if this has been reported or fixed yet but this appears to introduce a valid clang warning:
fs/bcachefs/reflink.c:275:6: error: variable 'dst_done' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
275 | if (ret)
| ^~~
fs/bcachefs/reflink.c:405:9: note: uninitialized use occurs here
405 | return dst_done ?: ret ?: ret2;
| ^~~~~~~~
fs/bcachefs/reflink.c:275:2: note: remove the 'if' if its condition is always false
275 | if (ret)
| ^~~~~~~~
276 | goto err;
| ~~~~~~~~
fs/bcachefs/reflink.c:258:14: note: initialize the variable 'dst_done' to silence this warning
258 | u64 dst_done;
| ^
| = 01 error generated.
I tried to reason my way through a patch but I am a little lost, hence just the report :)
Quoted 22 lines
fs/bcachefs/reflink.c +7
-4bch2_trans_iter_init (trans, &src_iter, BTREE_ID_extents, src_start,BTREE_ITER_INTENT ); bch2_trans_iter_init(trans, &dst_iter, BTREE_ID_extents, dst_start,@@ -352,10 +358,13 @@ s64 bch2_remap_range(struct bch_fs *c,min (src_k.k->p.offset - src_want.offset, dst_end.offset - dst_iter.pos.offset)); - ret =bch2_extent_update (trans, dst_inum, &dst_iter, - new_dst.k, &disk_res, - new_i_size, i_sectors_delta, - true); + ret =bch2_bkey_set_needs_rebalance (c, new_dst.k, + opts.background_target, + opts.background_compression) ?: +bch2_extent_update (trans, dst_inum, &dst_iter, + new_dst.k, &disk_res, + new_i_size, i_sectors_delta, + true);bch2_disk_reservation_put (c, &disk_res); }bch2_trans_iter_exit (trans, &dst_iter);
fs/bcachefs/reflink.c s64 bch2_remap_range(struct bch_fs *c, · line 401
Quoted 8 lines
fs/bcachefs/reflink.c +1
-1@@ -386,7 +395,7 @@ s64 bch2_remap_range(struct bch_fs *c,bch2_trans_iter_exit (trans, &inode_iter); }while (bch2_err_matches (ret2, BCH_ERR_transaction_restart)); - +err:bch2_trans_put (trans);bch2_bkey_buf_exit (&new_src, c);bch2_bkey_buf_exit (&new_dst, c);
Cheers,
Nathan
Re: [PATCH 6/6] bcachefs: rebalance_work
Quoted 86 lines · Nathan Chancellor
Hi Kent,
Quoted 33 lines · Kent Overstreet
This adds a new btree,
rebalance_work, to eliminate scanning required for finding extents that need work done on them in the background - i.e. for thebackground_targetandbackground_compressionoptions.
rebalance_workis a bitset btree, where aKEY_TYPE_setcorresponds to an extent in the extents or reflink btree at the same pos.A new extent field is added,
bch_extent_rebalance, which indicates that this extent has work that needs to be done in the background - and which options to use. This allows per-inode options to be propagated to indirect extents - at least in some circumstances. In this patch, changing IO options on a file will not propagate the new options to indirect extents pointed to by that file.Updating (setting/clearing) the
rebalance_workbtree is done by the extent trigger, which looks at thebch_extent_rebalancefield.Scanning is still requrired after changing IO path options - either just for a given inode, or for the whole filesystem. We indicate that scanning is required by adding a
KEY_TYPE_cookiekey to therebalance_workbtree: the cookie counter is so that we can detect that scanning is still required when an option has been flipped mid-way through an existing scan.Future possible work:
- Propagate options to indirect extents when being changed
- Add other IO path options -nr_replicas, ec, torebalance_workso they can be applied in the background when they change
- Add a counter, for bcachefs fs usage output, showing the pending amount of rebalance work: we'll probably want to do this after the disk space accounting rewrite (moving it to a new btree)Signed-off-by Kent Overstreet <[email protected]><snip>
Quoted 21 lines
fs/bcachefs/reflink.c +2
-0@@ -7,6 +7,7 @@#include "inode.h" #include "io_misc.h" #include "io_write.h" +#include "rebalance.h" #include "reflink.h" #include "subvolume.h" #include "super-io.h" @@ -252,6 +253,7 @@ s64 bch2_remap_range(struct bch_fs *c,struct bpos dst_start =POS (dst_inum.inum, dst_offset);struct bpos src_start =POS (src_inum.inum, src_offset);struct bpos dst_end = dst_start, src_end = src_start; +struct bch_io_opts opts;struct bpos src_want;u64 dst_done;u32 dst_snapshot, src_snapshot;fs/bcachefs/reflink.c s64 bch2_remap_range(struct bch_fs *c, · line 277
Quoted 7 lines
fs/bcachefs/reflink.c +4
-0@@ -269,6 +271,10 @@ s64 bch2_remap_range(struct bch_fs *c,bch2_bkey_buf_init (&new_src); trans =bch2_trans_get (c); + ret =bch2_inum_opts_get (trans, src_inum, &opts); +if (ret) + goto err; +Not sure if this has been reported or fixed yet but this appears to introduce a valid clang warning:
fs/bcachefs/reflink.c:275:6: error: variable 'dst_done' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]275 | if (ret) | ^~~ fs/bcachefs/reflink.c:405:9: note: uninitialized use occurs here 405 | return dst_done ?: ret ?: ret2; | ^~~~~~~~ fs/bcachefs/reflink.c:275:2: note: remove the 'if' if its condition is always false 275 | if (ret) | ^~~~~~~~ 276 | goto err; | ~~~~~~~~ fs/bcachefs/reflink.c:258:14: note: initialize the variable 'dst_done' to silence this warning 258 | u64 dst_done; | ^ | = 0
Quoted 4 lines
1 error generated.
I tried to reason my way through a patch but I am a little lost, hence just the report :)
Actually, it just seems like dst_done should be explicitly zero initialized, so that ret is used as the return value. Don't know why I was as confused as I was :) would you like a formal patch or to just squash it in?
fs/bcachefs/reflink.c +1 -1
@@ -255,7 +255,7 @@ s64 bch2_remap_range(struct bch_fs *c,struct bpos dst_end = dst_start, src_end = src_start;struct bch_io_opts opts;struct bpos src_want; -u64 dst_done; +u64 dst_done =0 ;u32 dst_snapshot, src_snapshot;int ret =0 , ret2 =0 ;
Quoted 34 lines
Quoted 22 lines
fs/bcachefs/reflink.c +7
-4bch2_trans_iter_init (trans, &src_iter, BTREE_ID_extents, src_start,BTREE_ITER_INTENT ); bch2_trans_iter_init(trans, &dst_iter, BTREE_ID_extents, dst_start,@@ -352,10 +358,13 @@ s64 bch2_remap_range(struct bch_fs *c,min (src_k.k->p.offset - src_want.offset, dst_end.offset - dst_iter.pos.offset)); - ret =bch2_extent_update (trans, dst_inum, &dst_iter, - new_dst.k, &disk_res, - new_i_size, i_sectors_delta, - true); + ret =bch2_bkey_set_needs_rebalance (c, new_dst.k, + opts.background_target, + opts.background_compression) ?: +bch2_extent_update (trans, dst_inum, &dst_iter, + new_dst.k, &disk_res, + new_i_size, i_sectors_delta, + true);bch2_disk_reservation_put (c, &disk_res); }bch2_trans_iter_exit (trans, &dst_iter);fs/bcachefs/reflink.c s64 bch2_remap_range(struct bch_fs *c, · line 401
Quoted 8 lines
fs/bcachefs/reflink.c +1
-1@@ -386,7 +395,7 @@ s64 bch2_remap_range(struct bch_fs *c,bch2_trans_iter_exit (trans, &inode_iter); }while (bch2_err_matches (ret2, BCH_ERR_transaction_restart)); - +err:bch2_trans_put (trans);bch2_bkey_buf_exit (&new_src, c);bch2_bkey_buf_exit (&new_dst, c);Cheers,
Nathan
Re: [PATCH 6/6] bcachefs: rebalance_work
Quoted 89 lines · Nathan Chancellor
Quoted 88 lines · Nathan Chancellor
Hi Kent,
Quoted 33 lines · Kent Overstreet
This adds a new btree,
rebalance_work, to eliminate scanning required for finding extents that need work done on them in the background - i.e. for thebackground_targetandbackground_compressionoptions.
rebalance_workis a bitset btree, where aKEY_TYPE_setcorresponds to an extent in the extents or reflink btree at the same pos.A new extent field is added,
bch_extent_rebalance, which indicates that this extent has work that needs to be done in the background - and which options to use. This allows per-inode options to be propagated to indirect extents - at least in some circumstances. In this patch, changing IO options on a file will not propagate the new options to indirect extents pointed to by that file.Updating (setting/clearing) the
rebalance_workbtree is done by the extent trigger, which looks at thebch_extent_rebalancefield.Scanning is still requrired after changing IO path options - either just for a given inode, or for the whole filesystem. We indicate that scanning is required by adding a
KEY_TYPE_cookiekey to therebalance_workbtree: the cookie counter is so that we can detect that scanning is still required when an option has been flipped mid-way through an existing scan.Future possible work:
- Propagate options to indirect extents when being changed
- Add other IO path options -nr_replicas, ec, torebalance_workso they can be applied in the background when they change
- Add a counter, for bcachefs fs usage output, showing the pending amount of rebalance work: we'll probably want to do this after the disk space accounting rewrite (moving it to a new btree)Signed-off-by Kent Overstreet <[email protected]><snip>
Quoted 21 lines
fs/bcachefs/reflink.c +2
-0@@ -7,6 +7,7 @@#include "inode.h" #include "io_misc.h" #include "io_write.h" +#include "rebalance.h" #include "reflink.h" #include "subvolume.h" #include "super-io.h" @@ -252,6 +253,7 @@ s64 bch2_remap_range(struct bch_fs *c,struct bpos dst_start =POS (dst_inum.inum, dst_offset);struct bpos src_start =POS (src_inum.inum, src_offset);struct bpos dst_end = dst_start, src_end = src_start; +struct bch_io_opts opts;struct bpos src_want;u64 dst_done;u32 dst_snapshot, src_snapshot;fs/bcachefs/reflink.c s64 bch2_remap_range(struct bch_fs *c, · line 277
Quoted 7 lines
fs/bcachefs/reflink.c +4
-0@@ -269,6 +271,10 @@ s64 bch2_remap_range(struct bch_fs *c,bch2_bkey_buf_init (&new_src); trans =bch2_trans_get (c); + ret =bch2_inum_opts_get (trans, src_inum, &opts); +if (ret) + goto err; +Not sure if this has been reported or fixed yet but this appears to introduce a valid clang warning:
fs/bcachefs/reflink.c:275:6: error: variable 'dst_done' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]275 | if (ret) | ^~~ fs/bcachefs/reflink.c:405:9: note: uninitialized use occurs here 405 | return dst_done ?: ret ?: ret2; | ^~~~~~~~ fs/bcachefs/reflink.c:275:2: note: remove the 'if' if its condition is always false 275 | if (ret) | ^~~~~~~~ 276 | goto err; | ~~~~~~~~ fs/bcachefs/reflink.c:258:14: note: initialize the variable 'dst_done' to silence this warning 258 | u64 dst_done; | ^ | = 01 error generated.
Quoted 7 lines
Quoted 2 lines
I tried to reason my way through a patch but I am a little lost, hence just the report :)
Actually, it just seems like
dst_doneshould be explicitly zero initialized, so that ret is used as the return value. Don't know why I was as confused as I was :) would you like a formal patch or to just squash it in?
Squashed it in, thanks :)