]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/rebalance.c
Update bcachefs sources to e67d924a90 bcachefs: Introduce bch2_journal_keys_peek_...
[bcachefs-tools-debian] / libbcachefs / rebalance.c
index 3fbe7b10be35a0f4b8ba7310b6b5b25b91323ba4..d914892f53396dc83c7c868dcbeaa7b4f13cb738 100644 (file)
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include "bcachefs.h"
 #include "alloc_foreground.h"
 #include <linux/sched/cputime.h>
 #include <trace/events/bcachefs.h>
 
-static inline bool rebalance_ptr_pred(struct bch_fs *c,
-                                     const struct bch_extent_ptr *ptr,
-                                     struct bch_extent_crc_unpacked crc,
-                                     struct bch_io_opts *io_opts)
+/*
+ * Check if an extent should be moved:
+ * returns -1 if it should not be moved, or
+ * device of pointer that should be moved, if known, or INT_MAX if unknown
+ */
+static int __bch2_rebalance_pred(struct bch_fs *c,
+                                struct bkey_s_c k,
+                                struct bch_io_opts *io_opts)
 {
-       if (io_opts->background_target &&
-           !bch2_dev_in_target(c, ptr->dev, io_opts->background_target) &&
-           !ptr->cached)
-               return true;
+       struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
+       const union bch_extent_entry *entry;
+       struct extent_ptr_decoded p;
 
        if (io_opts->background_compression &&
-           crc.compression_type !=
-           bch2_compression_opt_to_type[io_opts->background_compression])
-               return true;
-
-       return false;
+           !bch2_bkey_is_incompressible(k))
+               bkey_for_each_ptr_decode(k.k, ptrs, p, entry)
+                       if (!p.ptr.cached &&
+                           p.crc.compression_type !=
+                           bch2_compression_opt_to_type[io_opts->background_compression])
+                               return p.ptr.dev;
+
+       if (io_opts->background_target)
+               bkey_for_each_ptr_decode(k.k, ptrs, p, entry)
+                       if (!p.ptr.cached &&
+                           !bch2_dev_in_target(c, p.ptr.dev, io_opts->background_target))
+                               return p.ptr.dev;
+
+       return -1;
 }
 
 void bch2_rebalance_add_key(struct bch_fs *c,
                            struct bkey_s_c k,
                            struct bch_io_opts *io_opts)
 {
-       const struct bch_extent_ptr *ptr;
-       struct bch_extent_crc_unpacked crc;
-       struct bkey_s_c_extent e;
-
-       if (!bkey_extent_is_data(k.k))
-               return;
+       atomic64_t *counter;
+       int dev;
 
-       if (!io_opts->background_target &&
-           !io_opts->background_compression)
+       dev = __bch2_rebalance_pred(c, k, io_opts);
+       if (dev < 0)
                return;
 
-       e = bkey_s_c_to_extent(k);
-
-       extent_for_each_ptr_crc(e, ptr, crc)
-               if (rebalance_ptr_pred(c, ptr, crc, io_opts)) {
-                       struct bch_dev *ca = bch_dev_bkey_exists(c, ptr->dev);
+       counter = dev < INT_MAX
+               ? &bch_dev_bkey_exists(c, dev)->rebalance_work
+               : &c->rebalance.work_unknown_dev;
 
-                       if (atomic64_add_return(crc.compressed_size,
-                                               &ca->rebalance_work) ==
-                           crc.compressed_size)
-                               rebalance_wakeup(c);
-               }
-}
-
-void bch2_rebalance_add_work(struct bch_fs *c, u64 sectors)
-{
-       if (atomic64_add_return(sectors, &c->rebalance.work_unknown_dev) ==
-           sectors)
+       if (atomic64_add_return(k.k->size, counter) == k.k->size)
                rebalance_wakeup(c);
 }
 
 static enum data_cmd rebalance_pred(struct bch_fs *c, void *arg,
-                                   enum bkey_type type,
-                                   struct bkey_s_c_extent e,
+                                   struct bkey_s_c k,
                                    struct bch_io_opts *io_opts,
                                    struct data_opts *data_opts)
 {
-       const struct bch_extent_ptr *ptr;
-       struct bch_extent_crc_unpacked crc;
-
-       /* Make sure we have room to add a new pointer: */
-       if (bkey_val_u64s(e.k) + BKEY_EXTENT_PTR_U64s_MAX >
-           BKEY_EXTENT_VAL_U64s_MAX)
+       if (__bch2_rebalance_pred(c, k, io_opts) >= 0) {
+               data_opts->target               = io_opts->background_target;
+               data_opts->nr_replicas          = 1;
+               data_opts->btree_insert_flags   = 0;
+               return DATA_ADD_REPLICAS;
+       } else {
                return DATA_SKIP;
+       }
+}
 
-       extent_for_each_ptr_crc(e, ptr, crc)
-               if (rebalance_ptr_pred(c, ptr, crc, io_opts))
-                       goto found;
-
-       return DATA_SKIP;
-found:
-       data_opts->target               = io_opts->background_target;
-       data_opts->btree_insert_flags   = 0;
-       return DATA_ADD_REPLICAS;
+void bch2_rebalance_add_work(struct bch_fs *c, u64 sectors)
+{
+       if (atomic64_add_return(sectors, &c->rebalance.work_unknown_dev) ==
+           sectors)
+               rebalance_wakeup(c);
 }
 
 struct rebalance_work {
@@ -172,20 +166,24 @@ static int bch2_rebalance_thread(void *arg)
        struct bch_fs_rebalance *r = &c->rebalance;
        struct io_clock *clock = &c->io_clock[WRITE];
        struct rebalance_work w, p;
+       struct bch_move_stats move_stats;
        unsigned long start, prev_start;
        unsigned long prev_run_time, prev_run_cputime;
        unsigned long cputime, prev_cputime;
-       unsigned long io_start;
+       u64 io_start;
        long throttle;
 
        set_freezable();
 
-       io_start        = atomic_long_read(&clock->now);
+       io_start        = atomic64_read(&clock->now);
        p               = rebalance_work(c);
        prev_start      = jiffies;
        prev_cputime    = curr_cputime();
 
+       bch_move_stats_init(&move_stats, "rebalance");
        while (!kthread_wait_freezable(r->enabled)) {
+               cond_resched();
+
                start                   = jiffies;
                cputime                 = curr_cputime();
 
@@ -209,17 +207,21 @@ static int bch2_rebalance_thread(void *arg)
                        prev_run_time;
 
                if (w.dev_most_full_percent < 20 && throttle > 0) {
-                       r->state = REBALANCE_THROTTLED;
                        r->throttled_until_iotime = io_start +
                                div_u64(w.dev_most_full_capacity *
                                        (20 - w.dev_most_full_percent),
                                        50);
-                       r->throttled_until_cputime = start + throttle;
 
-                       bch2_kthread_io_clock_wait(clock,
-                               r->throttled_until_iotime,
-                               throttle);
-                       continue;
+                       if (atomic64_read(&clock->now) + clock->max_slop <
+                           r->throttled_until_iotime) {
+                               r->throttled_until_cputime = start + throttle;
+                               r->state = REBALANCE_THROTTLED;
+
+                               bch2_kthread_io_clock_wait(clock,
+                                       r->throttled_until_iotime,
+                                       throttle);
+                               continue;
+                       }
                }
 
                /* minimum 1 mb/sec: */
@@ -229,72 +231,73 @@ static int bch2_rebalance_thread(void *arg)
                              max(p.dev_most_full_percent, 1U) /
                              max(w.dev_most_full_percent, 1U));
 
-               io_start        = atomic_long_read(&clock->now);
+               io_start        = atomic64_read(&clock->now);
                p               = w;
                prev_start      = start;
                prev_cputime    = cputime;
 
                r->state = REBALANCE_RUNNING;
-               memset(&r->move_stats, 0, sizeof(r->move_stats));
+               memset(&move_stats, 0, sizeof(move_stats));
                rebalance_work_reset(c);
 
                bch2_move_data(c,
+                              0,               POS_MIN,
+                              BTREE_ID_NR,     POS_MAX,
                               /* ratelimiting disabled for now */
                               NULL, /*  &r->pd.rate, */
                               writepoint_ptr(&c->rebalance_write_point),
-                              POS_MIN, POS_MAX,
                               rebalance_pred, NULL,
-                              &r->move_stats);
+                              &move_stats);
        }
 
        return 0;
 }
 
-ssize_t bch2_rebalance_work_show(struct bch_fs *c, char *buf)
+void bch2_rebalance_work_to_text(struct printbuf *out, struct bch_fs *c)
 {
-       char *out = buf, *end = out + PAGE_SIZE;
        struct bch_fs_rebalance *r = &c->rebalance;
        struct rebalance_work w = rebalance_work(c);
-       char h1[21], h2[21];
 
-       bch2_hprint(h1, w.dev_most_full_work << 9);
-       bch2_hprint(h2, w.dev_most_full_capacity << 9);
-       out += scnprintf(out, end - out,
-                        "fullest_dev (%i):\t%s/%s\n",
-                        w.dev_most_full_idx, h1, h2);
+       out->tabstops[0] = 20;
 
-       bch2_hprint(h1, w.total_work << 9);
-       bch2_hprint(h2, c->capacity << 9);
-       out += scnprintf(out, end - out,
-                        "total work:\t\t%s/%s\n",
-                        h1, h2);
+       pr_buf(out, "fullest_dev (%i):", w.dev_most_full_idx);
+       pr_tab(out);
 
-       out += scnprintf(out, end - out,
-                        "rate:\t\t\t%u\n",
-                        r->pd.rate.rate);
+       bch2_hprint(out, w.dev_most_full_work << 9);
+       pr_buf(out, "/");
+       bch2_hprint(out, w.dev_most_full_capacity << 9);
+       pr_newline(out);
+
+       pr_buf(out, "total work:");
+       pr_tab(out);
+
+       bch2_hprint(out, w.total_work << 9);
+       pr_buf(out, "/");
+       bch2_hprint(out, c->capacity << 9);
+       pr_newline(out);
+
+       pr_buf(out, "rate:");
+       pr_tab(out);
+       pr_buf(out, "%u", r->pd.rate.rate);
+       pr_newline(out);
 
        switch (r->state) {
        case REBALANCE_WAITING:
-               out += scnprintf(out, end - out, "waiting\n");
+               pr_buf(out, "waiting");
                break;
        case REBALANCE_THROTTLED:
-               bch2_hprint(h1,
+               pr_buf(out, "throttled for %lu sec or ",
+                      (r->throttled_until_cputime - jiffies) / HZ);
+               bch2_hprint(out,
                            (r->throttled_until_iotime -
-                            atomic_long_read(&c->io_clock[WRITE].now)) << 9);
-               out += scnprintf(out, end - out,
-                                "throttled for %lu sec or %s io\n",
-                                (r->throttled_until_cputime - jiffies) / HZ,
-                                h1);
+                            atomic64_read(&c->io_clock[WRITE].now)) << 9);
+               pr_buf(out, " io");
                break;
        case REBALANCE_RUNNING:
-               out += scnprintf(out, end - out, "running\n");
-               out += scnprintf(out, end - out, "pos %llu:%llu\n",
-                                r->move_stats.iter.pos.inode,
-                                r->move_stats.iter.pos.offset);
+               pr_buf(out, "running");
                break;
        }
-
-       return out - buf;
+       pr_newline(out);
 }
 
 void bch2_rebalance_stop(struct bch_fs *c)
@@ -320,12 +323,17 @@ int bch2_rebalance_start(struct bch_fs *c)
 {
        struct task_struct *p;
 
+       if (c->rebalance.thread)
+               return 0;
+
        if (c->opts.nochanges)
                return 0;
 
-       p = kthread_create(bch2_rebalance_thread, c, "bch_rebalance");
-       if (IS_ERR(p))
+       p = kthread_create(bch2_rebalance_thread, c, "bch-rebalance/%s", c->name);
+       if (IS_ERR(p)) {
+               bch_err(c, "error creating rebalance thread: %li", PTR_ERR(p));
                return PTR_ERR(p);
+       }
 
        get_task_struct(p);
        rcu_assign_pointer(c->rebalance.thread, p);