bcachefs: Improve trace_rebalance_extent
PATCH 1/1 bcachefs: Improve trace_rebalance_extent
We now say explicitly which pointers are being moved or compressed
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/extents.c | 35 +++-------------------------- fs/bcachefs/rebalance.c | 26 +++++++++++++++++----- fs/bcachefs/rebalance.h | 49 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 37 deletions(-)
fs/bcachefs/extents.c +3 -32
@@ -21,6 +21,7 @@#include "extents.h" #include "inode.h" #include "journal.h" +#include "rebalance.h" #include "replicas.h" #include "super.h" #include "super-io.h"
@@ -1406,39 +1407,9 @@ unsigned bch2_bkey_ptrs_need_rebalance(struct bch_fs *c, struct bkey_s_c k) {struct bkey_ptrs_c ptrs =bch2_bkey_ptrs_c (k); -unsigned rewrite_ptrs =0 ; -if (opts->background_compression) { -unsigned compression_type =bch2_compression_opt_to_type (opts->background_compression); -const union bch_extent_entry *entry; -struct extent_ptr_decoded p; -unsigned ptr_bit =1 ; - -bkey_for_each_ptr_decode (k.k, ptrs, p, entry) { -if (p.crc.compression_type == BCH_COMPRESSION_TYPE_incompressible || - p.ptr.unwritten) { - rewrite_ptrs =0 ; - goto incompressible; - } - -if (!p.ptr.cached && p.crc.compression_type != compression_type) - rewrite_ptrs |= ptr_bit; - ptr_bit <<=1 ; - } - } -incompressible: -if (opts->background_target && -bch2_target_accepts_data (c, BCH_DATA_user, opts->background_target)) { -unsigned ptr_bit =1 ; - -bkey_for_each_ptr (ptrs, ptr) { -if (!ptr->cached && !bch2_dev_in_target (c, ptr->dev, opts->background_target)) - rewrite_ptrs |= ptr_bit; - ptr_bit <<=1 ; - } - } - -return rewrite_ptrs; +return bch2_bkey_ptrs_need_compress (c, opts, k, ptrs) | +bch2_bkey_ptrs_need_move (c, opts, ptrs); }u64 bch2_bkey_sectors_need_rebalance (struct bch_fs *c,struct bkey_s_c k)
fs/bcachefs/rebalance.c +21 -5
@@ -177,12 +177,28 @@ static struct bkey_s_c next_rebalance_extent(struct btree_trans *trans,if (trace_rebalance_extent_enabled ()) {struct printbuf buf =PRINTBUF ; -prt_str (&buf,"target=" ); -bch2_target_to_text (&buf, c, io_opts->background_target); -prt_str (&buf," compression=" ); -bch2_compression_opt_to_text (&buf, io_opts->background_compression); -prt_str (&buf," " );bch2_bkey_val_to_text (&buf, c, k); +prt_newline (&buf); + +struct bkey_ptrs_c ptrs =bch2_bkey_ptrs_c (k); + +unsigned p =bch2_bkey_ptrs_need_compress (c, io_opts, k, ptrs); +if (p) { +prt_str (&buf,"compression=" ); +bch2_compression_opt_to_text (&buf, io_opts->background_compression); +prt_str (&buf," " ); +bch2_prt_u64_base2 (&buf, p); +prt_newline (&buf); + } + + p =bch2_bkey_ptrs_need_move (c, io_opts, ptrs); +if (p) { +prt_str (&buf,"move=" ); +bch2_target_to_text (&buf, c, io_opts->background_target); +prt_str (&buf," " ); +bch2_prt_u64_base2 (&buf, p); +prt_newline (&buf); + }trace_rebalance_extent (c, buf.buf);printbuf_exit (&buf);
fs/bcachefs/rebalance.h +49 -0
57 lines not on this page · raw message
Signature · 1 line
2.45.2