]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/movinggc.c
Update bcachefs sources to dab31ca168 bcachefs: Add some logging for btree node rewri...
[bcachefs-tools-debian] / libbcachefs / movinggc.c
index 2acca0ddb6fd64a140fffe7735a3239661425b6f..f0ab65ffab7373dca455b4bec9528c31d6d0fbe3 100644 (file)
@@ -6,12 +6,14 @@
  */
 
 #include "bcachefs.h"
+#include "alloc_background.h"
 #include "alloc_foreground.h"
 #include "btree_iter.h"
 #include "btree_update.h"
 #include "buckets.h"
 #include "clock.h"
 #include "disk_groups.h"
+#include "errcode.h"
 #include "error.h"
 #include "extents.h"
 #include "eytzinger.h"
 #include <linux/sort.h>
 #include <linux/wait.h>
 
-/*
- * We can't use the entire copygc reserve in one iteration of copygc: we may
- * need the buckets we're freeing up to go back into the copygc reserve to make
- * forward progress, but if the copygc reserve is full they'll be available for
- * any allocation - and it's possible that in a given iteration, we free up most
- * of the buckets we're going to free before we allocate most of the buckets
- * we're going to allocate.
- *
- * If we only use half of the reserve per iteration, then in steady state we'll
- * always have room in the reserve for the buckets we're going to need in the
- * next iteration:
- */
-#define COPYGC_BUCKETS_PER_ITER(ca)                                    \
-       ((ca)->free[RESERVE_MOVINGGC].size / 2)
-
-static int bucket_offset_cmp(const void *_l, const void *_r, size_t size)
+static inline int fragmentation_cmp(copygc_heap *heap,
+                                  struct copygc_heap_entry l,
+                                  struct copygc_heap_entry r)
 {
-       const struct copygc_heap_entry *l = _l;
-       const struct copygc_heap_entry *r = _r;
-
-       return  cmp_int(l->dev,    r->dev) ?:
-               cmp_int(l->offset, r->offset);
+       return cmp_int(l.fragmentation, r.fragmentation);
 }
 
-static enum data_cmd copygc_pred(struct bch_fs *c, void *arg,
-                                struct bkey_s_c k,
-                                struct bch_io_opts *io_opts,
-                                struct data_opts *data_opts)
+static int find_buckets_to_copygc(struct bch_fs *c)
 {
        copygc_heap *h = &c->copygc_heap;
-       struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
-       const union bch_extent_entry *entry;
-       struct extent_ptr_decoded p = { 0 };
-
-       bkey_for_each_ptr_decode(k.k, ptrs, p, entry) {
-               struct bch_dev *ca = bch_dev_bkey_exists(c, p.ptr.dev);
-               struct copygc_heap_entry search = {
-                       .dev    = p.ptr.dev,
-                       .offset = p.ptr.offset,
-               };
+       struct btree_trans trans;
+       struct btree_iter iter;
+       struct bkey_s_c k;
+       int ret;
 
-               ssize_t i = eytzinger0_find_le(h->data, h->used,
-                                              sizeof(h->data[0]),
-                                              bucket_offset_cmp, &search);
-#if 0
-               /* eytzinger search verify code: */
-               ssize_t j = -1, k;
-
-               for (k = 0; k < h->used; k++)
-                       if (h->data[k].offset <= ptr->offset &&
-                           (j < 0 || h->data[k].offset > h->data[j].offset))
-                               j = k;
-
-               BUG_ON(i != j);
-#endif
-               if (i >= 0 &&
-                   p.ptr.offset < h->data[i].offset + ca->mi.bucket_size &&
-                   p.ptr.gen == h->data[i].gen) {
-                       /*
-                        * We need to use the journal reserve here, because
-                        *  - journal reclaim depends on btree key cache
-                        *    flushing to make forward progress,
-                        *  - which has to make forward progress when the
-                        *    journal is pre-reservation full,
-                        *  - and depends on allocation - meaning allocator and
-                        *    copygc
-                        */
-
-                       data_opts->target               = io_opts->background_target;
-                       data_opts->nr_replicas          = 1;
-                       data_opts->btree_insert_flags   = BTREE_INSERT_USE_RESERVE|
-                               BTREE_INSERT_JOURNAL_RESERVED;
-                       data_opts->rewrite_dev          = p.ptr.dev;
-
-                       if (p.has_ec)
-                               data_opts->nr_replicas += p.ec.redundancy;
-
-                       return DATA_REWRITE;
-               }
-       }
+       bch2_trans_init(&trans, c, 0, 0);
 
-       return DATA_SKIP;
-}
+       /*
+        * Find buckets with lowest sector counts, skipping completely
+        * empty buckets, by building a maxheap sorted by sector count,
+        * and repeatedly replacing the maximum element until all
+        * buckets have been visited.
+        */
+       h->used = 0;
 
-static bool have_copygc_reserve(struct bch_dev *ca)
-{
-       bool ret;
+       for_each_btree_key(&trans, iter, BTREE_ID_alloc, POS_MIN,
+                          BTREE_ITER_PREFETCH, k, ret) {
+               struct bch_dev *ca = bch_dev_bkey_exists(c, iter.pos.inode);
+               struct copygc_heap_entry e;
+               struct bch_alloc_v4 a_convert;
+               const struct bch_alloc_v4 *a;
 
-       spin_lock(&ca->fs->freelist_lock);
-       ret = fifo_full(&ca->free[RESERVE_MOVINGGC]) ||
-               ca->allocator_state != ALLOCATOR_running;
-       spin_unlock(&ca->fs->freelist_lock);
+               a = bch2_alloc_to_v4(k, &a_convert);
 
-       return ret;
-}
+               if ((a->data_type != BCH_DATA_btree &&
+                    a->data_type != BCH_DATA_user) ||
+                   a->dirty_sectors >= ca->mi.bucket_size ||
+                   bch2_bucket_is_open(c, iter.pos.inode, iter.pos.offset))
+                       continue;
 
-static inline int fragmentation_cmp(copygc_heap *heap,
-                                  struct copygc_heap_entry l,
-                                  struct copygc_heap_entry r)
-{
-       return cmp_int(l.fragmentation, r.fragmentation);
+               e = (struct copygc_heap_entry) {
+                       .dev            = iter.pos.inode,
+                       .gen            = a->gen,
+                       .replicas       = 1 + a->stripe_redundancy,
+                       .fragmentation  = div_u64((u64) a->dirty_sectors * (1ULL << 31),
+                                                 ca->mi.bucket_size),
+                       .sectors        = a->dirty_sectors,
+                       .bucket         = iter.pos.offset,
+               };
+               heap_add_or_replace(h, e, -fragmentation_cmp, NULL);
+
+       }
+       bch2_trans_iter_exit(&trans, &iter);
+
+       bch2_trans_exit(&trans);
+       return ret;
 }
 
 static int bch2_copygc(struct bch_fs *c)
 {
        copygc_heap *h = &c->copygc_heap;
-       struct copygc_heap_entry e, *i;
-       struct bucket_array *buckets;
+       struct copygc_heap_entry e;
        struct bch_move_stats move_stats;
-       u64 sectors_to_move = 0, sectors_not_moved = 0;
-       u64 sectors_reserved = 0;
-       u64 buckets_to_move, buckets_not_moved = 0;
        struct bch_dev *ca;
        unsigned dev_idx;
-       size_t b, heap_size = 0;
-       int ret;
+       size_t heap_size = 0;
+       struct moving_context ctxt;
+       struct data_update_opts data_opts = {
+               .btree_insert_flags = BTREE_INSERT_USE_RESERVE|JOURNAL_WATERMARK_copygc,
+       };
+       int ret = 0;
 
-       memset(&move_stats, 0, sizeof(move_stats));
-       /*
-        * Find buckets with lowest sector counts, skipping completely
-        * empty buckets, by building a maxheap sorted by sector count,
-        * and repeatedly replacing the maximum element until all
-        * buckets have been visited.
-        */
-       h->used = 0;
+       bch2_move_stats_init(&move_stats, "copygc");
 
        for_each_rw_member(ca, c, dev_idx)
                heap_size += ca->mi.nbuckets >> 7;
@@ -166,113 +116,58 @@ static int bch2_copygc(struct bch_fs *c)
                }
        }
 
-       for_each_rw_member(ca, c, dev_idx) {
-               closure_wait_event(&c->freelist_wait, have_copygc_reserve(ca));
-
-               spin_lock(&ca->fs->freelist_lock);
-               sectors_reserved += fifo_used(&ca->free[RESERVE_MOVINGGC]) * ca->mi.bucket_size;
-               spin_unlock(&ca->fs->freelist_lock);
-
-               down_read(&ca->bucket_lock);
-               buckets = bucket_array(ca);
-
-               for (b = buckets->first_bucket; b < buckets->nbuckets; b++) {
-                       struct bucket *g = buckets->b + b;
-                       struct bucket_mark m = READ_ONCE(g->mark);
-                       struct copygc_heap_entry e;
-
-                       if (m.owned_by_allocator ||
-                           m.data_type != BCH_DATA_user ||
-                           !bucket_sectors_used(m) ||
-                           bucket_sectors_used(m) >= ca->mi.bucket_size)
-                               continue;
-
-                       WARN_ON(m.stripe && !g->stripe_redundancy);
-
-                       e = (struct copygc_heap_entry) {
-                               .dev            = dev_idx,
-                               .gen            = m.gen,
-                               .replicas       = 1 + g->stripe_redundancy,
-                               .fragmentation  = bucket_sectors_used(m) * (1U << 15)
-                                       / ca->mi.bucket_size,
-                               .sectors        = bucket_sectors_used(m),
-                               .offset         = bucket_to_sector(ca, b),
-                       };
-                       heap_add_or_replace(h, e, -fragmentation_cmp, NULL);
-               }
-               up_read(&ca->bucket_lock);
-       }
-
-       if (!sectors_reserved) {
-               bch2_fs_fatal_error(c, "stuck, ran out of copygc reserve!");
-               return -1;
+       ret = find_buckets_to_copygc(c);
+       if (ret) {
+               bch2_fs_fatal_error(c, "error walking buckets to copygc!");
+               return ret;
        }
 
-       /*
-        * Our btree node allocations also come out of RESERVE_MOVINGGC:
-        */
-       sectors_to_move = (sectors_to_move * 3) / 4;
+       if (!h->used) {
+               s64 wait = S64_MAX, dev_wait;
+               u64 dev_min_wait_fragmented = 0;
+               u64 dev_min_wait_allowed = 0;
+               int dev_min_wait = -1;
 
-       for (i = h->data; i < h->data + h->used; i++)
-               sectors_to_move += i->sectors * i->replicas;
+               for_each_rw_member(ca, c, dev_idx) {
+                       struct bch_dev_usage usage = bch2_dev_usage_read(ca);
+                       s64 allowed = ((__dev_buckets_available(ca, usage, RESERVE_none) *
+                                              ca->mi.bucket_size) >> 1);
+                       s64 fragmented = usage.d[BCH_DATA_user].fragmented;
 
-       while (sectors_to_move > sectors_reserved) {
-               BUG_ON(!heap_pop(h, e, -fragmentation_cmp, NULL));
-               sectors_to_move -= e.sectors * e.replicas;
-       }
+                       dev_wait = max(0LL, allowed - fragmented);
 
-       buckets_to_move = h->used;
+                       if (dev_min_wait < 0 || dev_wait < wait) {
+                               dev_min_wait = dev_idx;
+                               dev_min_wait_fragmented = fragmented;
+                               dev_min_wait_allowed    = allowed;
+                       }
+               }
 
-       if (!buckets_to_move)
+               bch_err_ratelimited(c, "copygc requested to run but found no buckets to move! dev %u fragmented %llu allowed %llu",
+                                   dev_min_wait, dev_min_wait_fragmented, dev_min_wait_allowed);
                return 0;
+       }
 
-       eytzinger0_sort(h->data, h->used,
-                       sizeof(h->data[0]),
-                       bucket_offset_cmp, NULL);
+       heap_resort(h, fragmentation_cmp, NULL);
 
-       ret = bch2_move_data(c,
-                            0,                 POS_MIN,
-                            BTREE_ID_NR,       POS_MAX,
-                            NULL,
-                            writepoint_ptr(&c->copygc_write_point),
-                            copygc_pred, NULL,
-                            &move_stats);
+       bch2_moving_ctxt_init(&ctxt, c, NULL, &move_stats,
+                             writepoint_ptr(&c->copygc_write_point),
+                             false);
 
-       for_each_rw_member(ca, c, dev_idx) {
-               down_read(&ca->bucket_lock);
-               buckets = bucket_array(ca);
-               for (i = h->data; i < h->data + h->used; i++) {
-                       struct bucket_mark m;
-                       size_t b;
-
-                       if (i->dev != dev_idx)
-                               continue;
-
-                       b = sector_to_bucket(ca, i->offset);
-                       m = READ_ONCE(buckets->b[b].mark);
-
-                       if (i->gen == m.gen &&
-                           bucket_sectors_used(m)) {
-                               sectors_not_moved += bucket_sectors_used(m);
-                               buckets_not_moved++;
-                       }
-               }
-               up_read(&ca->bucket_lock);
+       /* not correct w.r.t. device removal */
+       while (h->used && !ret) {
+               BUG_ON(!heap_pop(h, e, -fragmentation_cmp, NULL));
+               ret = __bch2_evacuate_bucket(&ctxt, POS(e.dev, e.bucket), e.gen,
+                                            data_opts);
        }
 
-       if (sectors_not_moved && !ret)
-               bch_warn_ratelimited(c,
-                       "copygc finished but %llu/%llu sectors, %llu/%llu buckets not moved (move stats: moved %llu sectors, raced %llu keys, %llu sectors)",
-                        sectors_not_moved, sectors_to_move,
-                        buckets_not_moved, buckets_to_move,
-                        atomic64_read(&move_stats.sectors_moved),
-                        atomic64_read(&move_stats.keys_raced),
-                        atomic64_read(&move_stats.sectors_raced));
-
-       trace_copygc(c,
-                    atomic64_read(&move_stats.sectors_moved), sectors_not_moved,
-                    buckets_to_move, buckets_not_moved);
-       return 0;
+       bch2_moving_ctxt_exit(&ctxt);
+
+       if (ret < 0 && !bch2_err_matches(ret, EROFS))
+               bch_err(c, "error from bch2_move_data() in copygc: %s", bch2_err_str(ret));
+
+       trace_and_count(c, copygc, c, atomic64_read(&move_stats.sectors_moved), 0, 0, 0);
+       return ret;
 }
 
 /*
@@ -298,8 +193,8 @@ unsigned long bch2_copygc_wait_amount(struct bch_fs *c)
        for_each_rw_member(ca, c, dev_idx) {
                struct bch_dev_usage usage = bch2_dev_usage_read(ca);
 
-               fragmented_allowed = ((__dev_buckets_reclaimable(ca, usage) *
-                                       ca->mi.bucket_size) >> 1);
+               fragmented_allowed = ((__dev_buckets_available(ca, usage, RESERVE_none) *
+                                      ca->mi.bucket_size) >> 1);
                fragmented = usage.d[BCH_DATA_user].fragmented;
 
                wait = min(wait, max(0LL, fragmented_allowed - fragmented));
@@ -313,10 +208,11 @@ static int bch2_copygc_thread(void *arg)
        struct bch_fs *c = arg;
        struct io_clock *clock = &c->io_clock[WRITE];
        u64 last, wait;
+       int ret = 0;
 
        set_freezable();
 
-       while (!kthread_should_stop()) {
+       while (!ret && !kthread_should_stop()) {
                cond_resched();
 
                if (kthread_wait_freezable(c->copy_gc_enabled))
@@ -326,7 +222,7 @@ static int bch2_copygc_thread(void *arg)
                wait = bch2_copygc_wait_amount(c);
 
                if (wait > clock->max_slop) {
-                       trace_copygc_wait(c, wait, last + wait);
+                       trace_and_count(c, copygc_wait, c, wait, last + wait);
                        c->copygc_wait = last + wait;
                        bch2_kthread_io_clock_wait(clock, last + wait,
                                        MAX_SCHEDULE_TIMEOUT);
@@ -335,8 +231,11 @@ static int bch2_copygc_thread(void *arg)
 
                c->copygc_wait = 0;
 
-               if (bch2_copygc(c))
-                       break;
+               c->copygc_running = true;
+               ret = bch2_copygc(c);
+               c->copygc_running = false;
+
+               wake_up(&c->copygc_running_wq);
        }
 
        return 0;
@@ -354,6 +253,7 @@ void bch2_copygc_stop(struct bch_fs *c)
 int bch2_copygc_start(struct bch_fs *c)
 {
        struct task_struct *t;
+       int ret;
 
        if (c->copygc_thread)
                return 0;
@@ -365,9 +265,10 @@ int bch2_copygc_start(struct bch_fs *c)
                return -ENOMEM;
 
        t = kthread_create(bch2_copygc_thread, c, "bch-copygc/%s", c->name);
-       if (IS_ERR(t)) {
-               bch_err(c, "error creating copygc thread: %li", PTR_ERR(t));
-               return PTR_ERR(t);
+       ret = PTR_ERR_OR_ZERO(t);
+       if (ret) {
+               bch_err(c, "error creating copygc thread: %s", bch2_err_str(ret));
+               return ret;
        }
 
        get_task_struct(t);
@@ -380,4 +281,6 @@ int bch2_copygc_start(struct bch_fs *c)
 
 void bch2_fs_copygc_init(struct bch_fs *c)
 {
+       init_waitqueue_head(&c->copygc_running_wq);
+       c->copygc_running = false;
 }