]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/alloc_background.c
Update bcachefs sources to ab3b6e7dd6 bcachefs: Fix pr_buf() calls
[bcachefs-tools-debian] / libbcachefs / alloc_background.c
index 955caa217f69da31d60e829f11eb979fa70a79a0..e8a34eccac256f3a0d100569b1c855d7edb7b898 100644 (file)
@@ -1,17 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcachefs.h"
 #include "alloc_background.h"
 #include "alloc_foreground.h"
 #include "btree_cache.h"
 #include "btree_io.h"
+#include "btree_key_cache.h"
 #include "btree_update.h"
 #include "btree_update_interior.h"
 #include "btree_gc.h"
 #include "buckets.h"
+#include "buckets_waiting_for_journal.h"
 #include "clock.h"
 #include "debug.h"
 #include "ec.h"
 #include "error.h"
-#include "journal_io.h"
+#include "lru.h"
+#include "recovery.h"
+#include "varint.h"
 
 #include <linux/kthread.h>
 #include <linux/math64.h>
 #include <linux/sort.h>
 #include <trace/events/bcachefs.h>
 
-static const char * const bch2_alloc_field_names[] = {
-#define x(name, bytes) #name,
-       BCH_ALLOC_FIELDS()
+/* Persistent alloc info: */
+
+static const unsigned BCH_ALLOC_V1_FIELD_BYTES[] = {
+#define x(name, bits) [BCH_ALLOC_FIELD_V1_##name] = bits / 8,
+       BCH_ALLOC_FIELDS_V1()
 #undef x
-       NULL
 };
 
-static void bch2_recalc_oldest_io(struct bch_fs *, struct bch_dev *, int);
-
-/* Ratelimiting/PD controllers */
-
-static void pd_controllers_update(struct work_struct *work)
-{
-       struct bch_fs *c = container_of(to_delayed_work(work),
-                                          struct bch_fs,
-                                          pd_controllers_update);
-       struct bch_dev *ca;
-       unsigned i;
-
-       for_each_member_device(ca, c, i) {
-               struct bch_dev_usage stats = bch2_dev_usage_read(c, ca);
-
-               u64 free = bucket_to_sector(ca,
-                               __dev_buckets_free(ca, stats)) << 9;
-               /*
-                * Bytes of internal fragmentation, which can be
-                * reclaimed by copy GC
-                */
-               s64 fragmented = (bucket_to_sector(ca,
-                                       stats.buckets[BCH_DATA_USER] +
-                                       stats.buckets[BCH_DATA_CACHED]) -
-                                 (stats.sectors[BCH_DATA_USER] +
-                                  stats.sectors[BCH_DATA_CACHED])) << 9;
-
-               fragmented = max(0LL, fragmented);
-
-               bch2_pd_controller_update(&ca->copygc_pd,
-                                        free, fragmented, -1);
-       }
-
-       schedule_delayed_work(&c->pd_controllers_update,
-                             c->pd_controllers_update_seconds * HZ);
-}
+const char * const bch2_bucket_states[] = {
+       "free",
+       "need gc gens",
+       "need discard",
+       "cached",
+       "dirty",
+       NULL
+};
 
-/* Persistent alloc info: */
+struct bkey_alloc_unpacked {
+       u64             journal_seq;
+       u64             bucket;
+       u8              dev;
+       u8              gen;
+       u8              oldest_gen;
+       u8              data_type;
+       bool            need_discard:1;
+       bool            need_inc_gen:1;
+#define x(_name, _bits)        u##_bits _name;
+       BCH_ALLOC_FIELDS_V2()
+#undef  x
+};
 
-static inline u64 get_alloc_field(const struct bch_alloc *a,
-                                 const void **p, unsigned field)
+static inline u64 alloc_field_v1_get(const struct bch_alloc *a,
+                                    const void **p, unsigned field)
 {
-       unsigned bytes = BCH_ALLOC_FIELD_BYTES[field];
+       unsigned bytes = BCH_ALLOC_V1_FIELD_BYTES[field];
        u64 v;
 
        if (!(a->fields & (1 << field)))
@@ -98,10 +88,10 @@ static inline u64 get_alloc_field(const struct bch_alloc *a,
        return v;
 }
 
-static inline void put_alloc_field(struct bkey_i_alloc *a, void **p,
-                                  unsigned field, u64 v)
+static inline void alloc_field_v1_put(struct bkey_i_alloc *a, void **p,
+                                     unsigned field, u64 v)
 {
-       unsigned bytes = BCH_ALLOC_FIELD_BYTES[field];
+       unsigned bytes = BCH_ALLOC_V1_FIELD_BYTES[field];
 
        if (!v)
                return;
@@ -128,903 +118,1051 @@ static inline void put_alloc_field(struct bkey_i_alloc *a, void **p,
        *p += bytes;
 }
 
-static unsigned bch_alloc_val_u64s(const struct bch_alloc *a)
+static void bch2_alloc_unpack_v1(struct bkey_alloc_unpacked *out,
+                                struct bkey_s_c k)
 {
-       unsigned i, bytes = offsetof(struct bch_alloc, data);
+       const struct bch_alloc *in = bkey_s_c_to_alloc(k).v;
+       const void *d = in->data;
+       unsigned idx = 0;
 
-       for (i = 0; i < ARRAY_SIZE(BCH_ALLOC_FIELD_BYTES); i++)
-               if (a->fields & (1 << i))
-                       bytes += BCH_ALLOC_FIELD_BYTES[i];
+       out->gen = in->gen;
 
-       return DIV_ROUND_UP(bytes, sizeof(u64));
+#define x(_name, _bits) out->_name = alloc_field_v1_get(in, &d, idx++);
+       BCH_ALLOC_FIELDS_V1()
+#undef  x
 }
 
-const char *bch2_alloc_invalid(const struct bch_fs *c, struct bkey_s_c k)
+static int bch2_alloc_unpack_v2(struct bkey_alloc_unpacked *out,
+                               struct bkey_s_c k)
 {
-       struct bkey_s_c_alloc a = bkey_s_c_to_alloc(k);
-
-       if (k.k->p.inode >= c->sb.nr_devices ||
-           !c->devs[k.k->p.inode])
-               return "invalid device";
-
-       /* allow for unknown fields */
-       if (bkey_val_u64s(a.k) < bch_alloc_val_u64s(a.v))
-               return "incorrect value size";
+       struct bkey_s_c_alloc_v2 a = bkey_s_c_to_alloc_v2(k);
+       const u8 *in = a.v->data;
+       const u8 *end = bkey_val_end(a);
+       unsigned fieldnr = 0;
+       int ret;
+       u64 v;
 
-       return NULL;
+       out->gen        = a.v->gen;
+       out->oldest_gen = a.v->oldest_gen;
+       out->data_type  = a.v->data_type;
+
+#define x(_name, _bits)                                                        \
+       if (fieldnr < a.v->nr_fields) {                                 \
+               ret = bch2_varint_decode_fast(in, end, &v);             \
+               if (ret < 0)                                            \
+                       return ret;                                     \
+               in += ret;                                              \
+       } else {                                                        \
+               v = 0;                                                  \
+       }                                                               \
+       out->_name = v;                                                 \
+       if (v != out->_name)                                            \
+               return -1;                                              \
+       fieldnr++;
+
+       BCH_ALLOC_FIELDS_V2()
+#undef  x
+       return 0;
 }
 
-void bch2_alloc_to_text(struct printbuf *out, struct bch_fs *c,
-                       struct bkey_s_c k)
+static int bch2_alloc_unpack_v3(struct bkey_alloc_unpacked *out,
+                               struct bkey_s_c k)
 {
-       struct bkey_s_c_alloc a = bkey_s_c_to_alloc(k);
-       const void *d = a.v->data;
-       unsigned i;
-
-       pr_buf(out, "gen %u", a.v->gen);
+       struct bkey_s_c_alloc_v3 a = bkey_s_c_to_alloc_v3(k);
+       const u8 *in = a.v->data;
+       const u8 *end = bkey_val_end(a);
+       unsigned fieldnr = 0;
+       int ret;
+       u64 v;
 
-       for (i = 0; i < BCH_ALLOC_FIELD_NR; i++)
-               if (a.v->fields & (1 << i))
-                       pr_buf(out, " %s %llu",
-                              bch2_alloc_field_names[i],
-                              get_alloc_field(a.v, &d, i));
+       out->gen        = a.v->gen;
+       out->oldest_gen = a.v->oldest_gen;
+       out->data_type  = a.v->data_type;
+       out->need_discard = BCH_ALLOC_V3_NEED_DISCARD(a.v);
+       out->need_inc_gen = BCH_ALLOC_V3_NEED_INC_GEN(a.v);
+       out->journal_seq = le64_to_cpu(a.v->journal_seq);
+
+#define x(_name, _bits)                                                        \
+       if (fieldnr < a.v->nr_fields) {                                 \
+               ret = bch2_varint_decode_fast(in, end, &v);             \
+               if (ret < 0)                                            \
+                       return ret;                                     \
+               in += ret;                                              \
+       } else {                                                        \
+               v = 0;                                                  \
+       }                                                               \
+       out->_name = v;                                                 \
+       if (v != out->_name)                                            \
+               return -1;                                              \
+       fieldnr++;
+
+       BCH_ALLOC_FIELDS_V2()
+#undef  x
+       return 0;
 }
 
-static void __alloc_read_key(struct bucket *g, const struct bch_alloc *a)
+static struct bkey_alloc_unpacked bch2_alloc_unpack(struct bkey_s_c k)
 {
-       const void *d = a->data;
-       unsigned idx = 0;
+       struct bkey_alloc_unpacked ret = {
+               .dev    = k.k->p.inode,
+               .bucket = k.k->p.offset,
+               .gen    = 0,
+       };
+
+       switch (k.k->type) {
+       case KEY_TYPE_alloc:
+               bch2_alloc_unpack_v1(&ret, k);
+               break;
+       case KEY_TYPE_alloc_v2:
+               bch2_alloc_unpack_v2(&ret, k);
+               break;
+       case KEY_TYPE_alloc_v3:
+               bch2_alloc_unpack_v3(&ret, k);
+               break;
+       }
 
-       g->_mark.gen            = a->gen;
-       g->gen_valid            = 1;
-       g->io_time[READ]        = get_alloc_field(a, &d, idx++);
-       g->io_time[WRITE]       = get_alloc_field(a, &d, idx++);
-       g->_mark.data_type      = get_alloc_field(a, &d, idx++);
-       g->_mark.dirty_sectors  = get_alloc_field(a, &d, idx++);
-       g->_mark.cached_sectors = get_alloc_field(a, &d, idx++);
+       return ret;
 }
 
-static void __alloc_write_key(struct bkey_i_alloc *a, struct bucket *g,
-                             struct bucket_mark m)
+void bch2_alloc_to_v4(struct bkey_s_c k, struct bch_alloc_v4 *out)
 {
-       unsigned idx = 0;
-       void *d = a->v.data;
-
-       a->v.fields     = 0;
-       a->v.gen        = m.gen;
-
-       d = a->v.data;
-       put_alloc_field(a, &d, idx++, g->io_time[READ]);
-       put_alloc_field(a, &d, idx++, g->io_time[WRITE]);
-       put_alloc_field(a, &d, idx++, m.data_type);
-       put_alloc_field(a, &d, idx++, m.dirty_sectors);
-       put_alloc_field(a, &d, idx++, m.cached_sectors);
-
-       set_bkey_val_bytes(&a->k, (void *) d - (void *) &a->v);
+       if (k.k->type == KEY_TYPE_alloc_v4) {
+               *out = *bkey_s_c_to_alloc_v4(k).v;
+       } else {
+               struct bkey_alloc_unpacked u = bch2_alloc_unpack(k);
+
+               *out = (struct bch_alloc_v4) {
+                       .journal_seq            = u.journal_seq,
+                       .flags                  = u.need_discard,
+                       .gen                    = u.gen,
+                       .oldest_gen             = u.oldest_gen,
+                       .data_type              = u.data_type,
+                       .stripe_redundancy      = u.stripe_redundancy,
+                       .dirty_sectors          = u.dirty_sectors,
+                       .cached_sectors         = u.cached_sectors,
+                       .io_time[READ]          = u.read_time,
+                       .io_time[WRITE]         = u.write_time,
+                       .stripe                 = u.stripe,
+               };
+       }
 }
 
-static void bch2_alloc_read_key(struct bch_fs *c, struct bkey_s_c k)
+struct bkey_i_alloc_v4 *bch2_alloc_to_v4_mut(struct btree_trans *trans, struct bkey_s_c k)
 {
-       struct bch_dev *ca;
-       struct bkey_s_c_alloc a;
-
-       if (k.k->type != KEY_TYPE_alloc)
-               return;
-
-       a = bkey_s_c_to_alloc(k);
-       ca = bch_dev_bkey_exists(c, a.k->p.inode);
-
-       if (a.k->p.offset >= ca->mi.nbuckets)
-               return;
+       struct bkey_i_alloc_v4 *ret;
 
-       percpu_down_read_preempt_disable(&c->mark_lock);
-       __alloc_read_key(bucket(ca, a.k->p.offset), a.v);
-       percpu_up_read_preempt_enable(&c->mark_lock);
+       if (k.k->type == KEY_TYPE_alloc_v4) {
+               ret = bch2_trans_kmalloc(trans, bkey_bytes(k.k));
+               if (!IS_ERR(ret))
+                       bkey_reassemble(&ret->k_i, k);
+       } else {
+               ret = bch2_trans_kmalloc(trans, sizeof(*ret));
+               if (!IS_ERR(ret)) {
+                       bkey_alloc_v4_init(&ret->k_i);
+                       ret->k.p = k.k->p;
+                       bch2_alloc_to_v4(k, &ret->v);
+               }
+       }
+       return ret;
 }
 
-int bch2_alloc_read(struct bch_fs *c, struct list_head *journal_replay_list)
+struct bkey_i_alloc_v4 *
+bch2_trans_start_alloc_update(struct btree_trans *trans, struct btree_iter *iter,
+                             struct bpos pos)
 {
-       struct journal_replay *r;
-       struct btree_iter iter;
        struct bkey_s_c k;
-       struct bch_dev *ca;
-       unsigned i;
+       struct bkey_i_alloc_v4 *a;
        int ret;
 
-       for_each_btree_key(&iter, c, BTREE_ID_ALLOC, POS_MIN, 0, k) {
-               bch2_alloc_read_key(c, k);
-               bch2_btree_iter_cond_resched(&iter);
+       bch2_trans_iter_init(trans, iter, BTREE_ID_alloc, pos,
+                            BTREE_ITER_WITH_UPDATES|
+                            BTREE_ITER_CACHED|
+                            BTREE_ITER_INTENT);
+       k = bch2_btree_iter_peek_slot(iter);
+       ret = bkey_err(k);
+       if (ret) {
+               bch2_trans_iter_exit(trans, iter);
+               return ERR_PTR(ret);
        }
 
-       ret = bch2_btree_iter_unlock(&iter);
-       if (ret)
-               return ret;
-
-       list_for_each_entry(r, journal_replay_list, list) {
-               struct bkey_i *k, *n;
-               struct jset_entry *entry;
-
-               for_each_jset_key(k, n, entry, &r->j)
-                       if (entry->btree_id == BTREE_ID_ALLOC)
-                               bch2_alloc_read_key(c, bkey_i_to_s_c(k));
-       }
+       a = bch2_alloc_to_v4_mut(trans, k);
+       if (IS_ERR(a))
+               bch2_trans_iter_exit(trans, iter);
+       return a;
+}
 
-       mutex_lock(&c->bucket_clock[READ].lock);
-       for_each_member_device(ca, c, i) {
-               down_read(&ca->bucket_lock);
-               bch2_recalc_oldest_io(c, ca, READ);
-               up_read(&ca->bucket_lock);
-       }
-       mutex_unlock(&c->bucket_clock[READ].lock);
+static unsigned bch_alloc_v1_val_u64s(const struct bch_alloc *a)
+{
+       unsigned i, bytes = offsetof(struct bch_alloc, data);
 
-       mutex_lock(&c->bucket_clock[WRITE].lock);
-       for_each_member_device(ca, c, i) {
-               down_read(&ca->bucket_lock);
-               bch2_recalc_oldest_io(c, ca, WRITE);
-               up_read(&ca->bucket_lock);
-       }
-       mutex_unlock(&c->bucket_clock[WRITE].lock);
+       for (i = 0; i < ARRAY_SIZE(BCH_ALLOC_V1_FIELD_BYTES); i++)
+               if (a->fields & (1 << i))
+                       bytes += BCH_ALLOC_V1_FIELD_BYTES[i];
 
-       return 0;
+       return DIV_ROUND_UP(bytes, sizeof(u64));
 }
 
-static int __bch2_alloc_write_key(struct bch_fs *c, struct bch_dev *ca,
-                                 size_t b, struct btree_iter *iter,
-                                 u64 *journal_seq, unsigned flags)
+const char *bch2_alloc_v1_invalid(const struct bch_fs *c, struct bkey_s_c k)
 {
-       __BKEY_PADDED(k, BKEY_ALLOC_VAL_U64s_MAX) alloc_key;
-       struct bkey_i_alloc *a = bkey_alloc_init(&alloc_key.k);
-       struct bucket *g;
-       struct bucket_mark m;
-       int ret;
-
-       a->k.p = POS(ca->dev_idx, b);
+       struct bkey_s_c_alloc a = bkey_s_c_to_alloc(k);
 
-       percpu_down_read_preempt_disable(&c->mark_lock);
-       g = bucket(ca, b);
-       m = bucket_cmpxchg(g, m, m.dirty = false);
+       if (k.k->p.inode >= c->sb.nr_devices ||
+           !c->devs[k.k->p.inode])
+               return "invalid device";
 
-       __alloc_write_key(a, g, m);
-       percpu_up_read_preempt_enable(&c->mark_lock);
+       /* allow for unknown fields */
+       if (bkey_val_u64s(a.k) < bch_alloc_v1_val_u64s(a.v))
+               return "incorrect value size";
 
-       bch2_btree_iter_cond_resched(iter);
+       return NULL;
+}
 
-       bch2_btree_iter_set_pos(iter, a->k.p);
+const char *bch2_alloc_v2_invalid(const struct bch_fs *c, struct bkey_s_c k)
+{
+       struct bkey_alloc_unpacked u;
 
-       ret = bch2_btree_insert_at(c, NULL, journal_seq,
-                                  BTREE_INSERT_NOFAIL|
-                                  BTREE_INSERT_USE_RESERVE|
-                                  BTREE_INSERT_USE_ALLOC_RESERVE|
-                                  flags,
-                                  BTREE_INSERT_ENTRY(iter, &a->k_i));
+       if (k.k->p.inode >= c->sb.nr_devices ||
+           !c->devs[k.k->p.inode])
+               return "invalid device";
 
-       if (!ret && ca->buckets_written)
-               set_bit(b, ca->buckets_written);
+       if (bch2_alloc_unpack_v2(&u, k))
+               return "unpack error";
 
-       return ret;
+       return NULL;
 }
 
-int bch2_alloc_replay_key(struct bch_fs *c, struct bkey_i *k)
+const char *bch2_alloc_v3_invalid(const struct bch_fs *c, struct bkey_s_c k)
 {
+       struct bkey_alloc_unpacked u;
        struct bch_dev *ca;
-       struct btree_iter iter;
-       int ret;
-
-       if (k->k.p.inode >= c->sb.nr_devices ||
-           !c->devs[k->k.p.inode])
-               return 0;
-
-       ca = bch_dev_bkey_exists(c, k->k.p.inode);
 
-       if (k->k.p.offset >= ca->mi.nbuckets)
-               return 0;
+       if (k.k->p.inode >= c->sb.nr_devices ||
+           !c->devs[k.k->p.inode])
+               return "invalid device";
 
-       bch2_btree_iter_init(&iter, c, BTREE_ID_ALLOC, k->k.p,
-                            BTREE_ITER_INTENT);
+       ca = bch_dev_bkey_exists(c, k.k->p.inode);
 
-       ret = bch2_btree_iter_traverse(&iter);
-       if (ret)
-               goto err;
+       if (k.k->p.offset < ca->mi.first_bucket ||
+           k.k->p.offset >= ca->mi.nbuckets)
+               return "invalid bucket";
 
-       /* check buckets_written with btree node locked: */
+       if (bch2_alloc_unpack_v3(&u, k))
+               return "unpack error";
 
-       ret = test_bit(k->k.p.offset, ca->buckets_written)
-               ? 0
-               : bch2_btree_insert_at(c, NULL, NULL,
-                                      BTREE_INSERT_NOFAIL|
-                                      BTREE_INSERT_JOURNAL_REPLAY,
-                                      BTREE_INSERT_ENTRY(&iter, k));
-err:
-       bch2_btree_iter_unlock(&iter);
-       return ret;
+       return NULL;
 }
 
-int bch2_alloc_write(struct bch_fs *c)
+const char *bch2_alloc_v4_invalid(const struct bch_fs *c, struct bkey_s_c k)
 {
        struct bch_dev *ca;
-       unsigned i;
-       int ret = 0;
-
-       for_each_rw_member(ca, c, i) {
-               struct btree_iter iter;
-               struct bucket_array *buckets;
-               size_t b;
 
-               bch2_btree_iter_init(&iter, c, BTREE_ID_ALLOC, POS_MIN,
-                                    BTREE_ITER_SLOTS|BTREE_ITER_INTENT);
-
-               down_read(&ca->bucket_lock);
-               buckets = bucket_array(ca);
+       if (k.k->p.inode >= c->sb.nr_devices ||
+           !c->devs[k.k->p.inode])
+               return "invalid device";
 
-               for (b = buckets->first_bucket;
-                    b < buckets->nbuckets;
-                    b++) {
-                       if (!buckets->b[b].mark.dirty)
-                               continue;
+       ca = bch_dev_bkey_exists(c, k.k->p.inode);
 
-                       ret = __bch2_alloc_write_key(c, ca, b, &iter, NULL, 0);
-                       if (ret)
-                               break;
-               }
-               up_read(&ca->bucket_lock);
-               bch2_btree_iter_unlock(&iter);
+       if (k.k->p.offset < ca->mi.first_bucket ||
+           k.k->p.offset >= ca->mi.nbuckets)
+               return "invalid bucket";
 
-               if (ret) {
-                       percpu_ref_put(&ca->io_ref);
-                       break;
-               }
-       }
+       return NULL;
+}
 
-       return ret;
+void bch2_alloc_v4_swab(struct bkey_s k)
+{
+       struct bch_alloc_v4 *a = bkey_s_to_alloc_v4(k).v;
+
+       a->journal_seq          = swab64(a->journal_seq);
+       a->flags                = swab32(a->flags);
+       a->dirty_sectors        = swab32(a->dirty_sectors);
+       a->cached_sectors       = swab32(a->cached_sectors);
+       a->io_time[0]           = swab64(a->io_time[0]);
+       a->io_time[1]           = swab64(a->io_time[1]);
+       a->stripe               = swab32(a->stripe);
+       a->nr_external_backpointers = swab32(a->nr_external_backpointers);
 }
 
-/* Bucket IO clocks: */
+void bch2_alloc_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c k)
+{
+       struct bch_alloc_v4 a;
+
+       bch2_alloc_to_v4(k, &a);
+
+       pr_buf(out, "gen %u oldest_gen %u data_type %s journal_seq %llu need_discard %llu",
+              a.gen, a.oldest_gen, bch2_data_types[a.data_type],
+              a.journal_seq, BCH_ALLOC_V4_NEED_DISCARD(&a));
+       pr_buf(out, " dirty_sectors %u",        a.dirty_sectors);
+       pr_buf(out, " cached_sectors %u",       a.cached_sectors);
+       pr_buf(out, " stripe %u",               a.stripe);
+       pr_buf(out, " stripe_redundancy %u",    a.stripe_redundancy);
+       pr_buf(out, " read_time %llu",          a.io_time[READ]);
+       pr_buf(out, " write_time %llu",         a.io_time[WRITE]);
+}
 
-static void bch2_recalc_oldest_io(struct bch_fs *c, struct bch_dev *ca, int rw)
+int bch2_alloc_read(struct bch_fs *c)
 {
-       struct bucket_clock *clock = &c->bucket_clock[rw];
-       struct bucket_array *buckets = bucket_array(ca);
-       struct bucket *g;
-       u16 max_last_io = 0;
-       unsigned i;
+       struct btree_trans trans;
+       struct btree_iter iter;
+       struct bkey_s_c k;
+       struct bch_alloc_v4 a;
+       struct bch_dev *ca;
+       int ret;
 
-       lockdep_assert_held(&c->bucket_clock[rw].lock);
+       bch2_trans_init(&trans, c, 0, 0);
 
-       /* Recalculate max_last_io for this device: */
-       for_each_bucket(g, buckets)
-               max_last_io = max(max_last_io, bucket_last_io(c, g, rw));
+       for_each_btree_key(&trans, iter, BTREE_ID_alloc, POS_MIN,
+                          BTREE_ITER_PREFETCH, k, ret) {
+               ca = bch_dev_bkey_exists(c, k.k->p.inode);
+               bch2_alloc_to_v4(k, &a);
 
-       ca->max_last_bucket_io[rw] = max_last_io;
+               *bucket_gen(ca, k.k->p.offset) = a.gen;
+       }
+       bch2_trans_iter_exit(&trans, &iter);
 
-       /* Recalculate global max_last_io: */
-       max_last_io = 0;
+       bch2_trans_exit(&trans);
 
-       for_each_member_device(ca, c, i)
-               max_last_io = max(max_last_io, ca->max_last_bucket_io[rw]);
+       if (ret)
+               bch_err(c, "error reading alloc info: %i", ret);
 
-       clock->max_last_io = max_last_io;
+       return ret;
 }
 
-static void bch2_rescale_bucket_io_times(struct bch_fs *c, int rw)
+/* Free space/discard btree: */
+
+static int bch2_bucket_do_index(struct btree_trans *trans,
+                               struct bkey_s_c alloc_k,
+                               struct bch_alloc_v4 a,
+                               bool set)
 {
-       struct bucket_clock *clock = &c->bucket_clock[rw];
-       struct bucket_array *buckets;
-       struct bch_dev *ca;
-       struct bucket *g;
-       unsigned i;
+       struct bch_fs *c = trans->c;
+       struct bch_dev *ca = bch_dev_bkey_exists(c, alloc_k.k->p.inode);
+       struct btree_iter iter;
+       struct bkey_s_c old;
+       struct bkey_i *k;
+       enum bucket_state state = bucket_state(a);
+       enum btree_id btree;
+       enum bch_bkey_type old_type = !set ? KEY_TYPE_set : KEY_TYPE_deleted;
+       enum bch_bkey_type new_type =  set ? KEY_TYPE_set : KEY_TYPE_deleted;
+       struct printbuf buf = PRINTBUF;
+       int ret;
+
+       if (state != BUCKET_free &&
+           state != BUCKET_need_discard)
+               return 0;
 
-       trace_rescale_prios(c);
+       k = bch2_trans_kmalloc(trans, sizeof(*k));
+       if (IS_ERR(k))
+               return PTR_ERR(k);
 
-       for_each_member_device(ca, c, i) {
-               down_read(&ca->bucket_lock);
-               buckets = bucket_array(ca);
+       bkey_init(&k->k);
+       k->k.type = new_type;
 
-               for_each_bucket(g, buckets)
-                       g->io_time[rw] = clock->hand -
-                       bucket_last_io(c, g, rw) / 2;
+       switch (state) {
+       case BUCKET_free:
+               btree = BTREE_ID_freespace;
+               k->k.p = alloc_freespace_pos(alloc_k.k->p, a);
+               bch2_key_resize(&k->k, 1);
+               break;
+       case BUCKET_need_discard:
+               btree = BTREE_ID_need_discard;
+               k->k.p = alloc_k.k->p;
+               break;
+       default:
+               return 0;
+       }
 
-               bch2_recalc_oldest_io(c, ca, rw);
+       bch2_trans_iter_init(trans, &iter, btree,
+                            bkey_start_pos(&k->k),
+                            BTREE_ITER_INTENT);
+       old = bch2_btree_iter_peek_slot(&iter);
+       ret = bkey_err(old);
+       if (ret)
+               goto err;
 
-               up_read(&ca->bucket_lock);
+       if (ca->mi.freespace_initialized &&
+           bch2_fs_inconsistent_on(old.k->type != old_type, c,
+                       "incorrect key when %s %s btree (got %s should be %s)\n"
+                       "  for %s",
+                       set ? "setting" : "clearing",
+                       bch2_btree_ids[btree],
+                       bch2_bkey_types[old.k->type],
+                       bch2_bkey_types[old_type],
+                       (bch2_bkey_val_to_text(&buf, c, alloc_k), buf.buf))) {
+               ret = -EIO;
+               goto err;
        }
-}
 
-static inline u64 bucket_clock_freq(u64 capacity)
-{
-       return max(capacity >> 10, 2028ULL);
+       ret = bch2_trans_update(trans, &iter, k, 0);
+err:
+       bch2_trans_iter_exit(trans, &iter);
+       printbuf_exit(&buf);
+       return ret;
 }
 
-static void bch2_inc_clock_hand(struct io_timer *timer)
+int bch2_trans_mark_alloc(struct btree_trans *trans,
+                         struct bkey_s_c old, struct bkey_i *new,
+                         unsigned flags)
 {
-       struct bucket_clock *clock = container_of(timer,
-                                               struct bucket_clock, rescale);
-       struct bch_fs *c = container_of(clock,
-                                       struct bch_fs, bucket_clock[clock->rw]);
-       struct bch_dev *ca;
-       u64 capacity;
-       unsigned i;
+       struct bch_fs *c = trans->c;
+       struct bch_alloc_v4 old_a, *new_a;
+       u64 old_lru, new_lru;
+       int ret = 0;
 
-       mutex_lock(&clock->lock);
+       /*
+        * Deletion only happens in the device removal path, with
+        * BTREE_TRIGGER_NORUN:
+        */
+       BUG_ON(new->k.type != KEY_TYPE_alloc_v4);
 
-       /* if clock cannot be advanced more, rescale prio */
-       if (clock->max_last_io >= U16_MAX - 2)
-               bch2_rescale_bucket_io_times(c, clock->rw);
+       bch2_alloc_to_v4(old, &old_a);
+       new_a = &bkey_i_to_alloc_v4(new)->v;
 
-       BUG_ON(clock->max_last_io >= U16_MAX - 2);
+       if (new_a->dirty_sectors > old_a.dirty_sectors ||
+           new_a->cached_sectors > old_a.cached_sectors) {
+               new_a->io_time[READ] = max_t(u64, 1, atomic64_read(&c->io_clock[READ].now));
+               new_a->io_time[WRITE]= max_t(u64, 1, atomic64_read(&c->io_clock[WRITE].now));
+               SET_BCH_ALLOC_V4_NEED_INC_GEN(new_a, true);
+               SET_BCH_ALLOC_V4_NEED_DISCARD(new_a, true);
+       }
 
-       for_each_member_device(ca, c, i)
-               ca->max_last_bucket_io[clock->rw]++;
-       clock->max_last_io++;
-       clock->hand++;
+       if (old_a.data_type && !new_a->data_type &&
+           old_a.gen == new_a->gen &&
+           !bch2_bucket_is_open_safe(c, new->k.p.inode, new->k.p.offset)) {
+               new_a->gen++;
+               SET_BCH_ALLOC_V4_NEED_INC_GEN(new_a, false);
+       }
 
-       mutex_unlock(&clock->lock);
+       if (bucket_state(old_a) != bucket_state(*new_a) ||
+           (bucket_state(*new_a) == BUCKET_free &&
+            alloc_freespace_genbits(old_a) != alloc_freespace_genbits(*new_a))) {
+               ret =   bch2_bucket_do_index(trans, old, old_a, false) ?:
+                       bch2_bucket_do_index(trans, bkey_i_to_s_c(new), *new_a, true);
+               if (ret)
+                       return ret;
+       }
 
-       capacity = READ_ONCE(c->capacity);
+       old_lru = alloc_lru_idx(old_a);
+       new_lru = alloc_lru_idx(*new_a);
 
-       if (!capacity)
-               return;
+       if (old_lru != new_lru) {
+               ret = bch2_lru_change(trans, new->k.p.inode, new->k.p.offset,
+                                     old_lru, &new_lru);
+               if (ret)
+                       return ret;
 
-       /*
-        * we only increment when 0.1% of the filesystem capacity has been read
-        * or written too, this determines if it's time
-        *
-        * XXX: we shouldn't really be going off of the capacity of devices in
-        * RW mode (that will be 0 when we're RO, yet we can still service
-        * reads)
-        */
-       timer->expire += bucket_clock_freq(capacity);
+               if (new_lru && new_a->io_time[READ] != new_lru)
+                       new_a->io_time[READ] = new_lru;
+       }
 
-       bch2_io_timer_add(&c->io_clock[clock->rw], timer);
+       return 0;
 }
 
-static void bch2_bucket_clock_init(struct bch_fs *c, int rw)
+static int bch2_check_alloc_key(struct btree_trans *trans,
+                               struct btree_iter *alloc_iter)
 {
-       struct bucket_clock *clock = &c->bucket_clock[rw];
+       struct bch_fs *c = trans->c;
+       struct btree_iter discard_iter, freespace_iter, lru_iter;
+       struct bch_alloc_v4 a;
+       unsigned discard_key_type, freespace_key_type;
+       struct bkey_s_c alloc_k, k;
+       struct printbuf buf = PRINTBUF;
+       struct printbuf buf2 = PRINTBUF;
+       int ret;
 
-       clock->hand             = 1;
-       clock->rw               = rw;
-       clock->rescale.fn       = bch2_inc_clock_hand;
-       clock->rescale.expire   = bucket_clock_freq(c->capacity);
-       mutex_init(&clock->lock);
-}
+       alloc_k = bch2_btree_iter_peek(alloc_iter);
+       if (!alloc_k.k)
+               return 0;
 
-/* Background allocator thread: */
+       ret = bkey_err(alloc_k);
+       if (ret)
+               return ret;
 
-/*
- * Scans for buckets to be invalidated, invalidates them, rewrites prios/gens
- * (marking them as invalidated on disk), then optionally issues discard
- * commands to the newly free buckets, then puts them on the various freelists.
- */
+       bch2_alloc_to_v4(alloc_k, &a);
+       discard_key_type = bucket_state(a) == BUCKET_need_discard
+               ? KEY_TYPE_set : 0;
+       freespace_key_type = bucket_state(a) == BUCKET_free
+               ? KEY_TYPE_set : 0;
+
+       bch2_trans_iter_init(trans, &discard_iter, BTREE_ID_need_discard,
+                            alloc_k.k->p, 0);
+       bch2_trans_iter_init(trans, &freespace_iter, BTREE_ID_freespace,
+                            alloc_freespace_pos(alloc_k.k->p, a), 0);
+       bch2_trans_iter_init(trans, &lru_iter, BTREE_ID_lru,
+                            POS(alloc_k.k->p.inode, a.io_time[READ]), 0);
+
+       k = bch2_btree_iter_peek_slot(&discard_iter);
+       ret = bkey_err(k);
+       if (ret)
+               goto err;
 
-#define BUCKET_GC_GEN_MAX      96U
+       if (fsck_err_on(k.k->type != discard_key_type, c,
+                       "incorrect key in need_discard btree (got %s should be %s)\n"
+                       "  %s",
+                       bch2_bkey_types[k.k->type],
+                       bch2_bkey_types[discard_key_type],
+                       (bch2_bkey_val_to_text(&buf, c, alloc_k), buf.buf))) {
+               struct bkey_i *update =
+                       bch2_trans_kmalloc(trans, sizeof(*update));
 
-/**
- * wait_buckets_available - wait on reclaimable buckets
- *
- * If there aren't enough available buckets to fill up free_inc, wait until
- * there are.
- */
-static int wait_buckets_available(struct bch_fs *c, struct bch_dev *ca)
-{
-       unsigned long gc_count = c->gc_count;
-       int ret = 0;
+               ret = PTR_ERR_OR_ZERO(update);
+               if (ret)
+                       goto err;
 
-       while (1) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (kthread_should_stop()) {
-                       ret = 1;
-                       break;
-               }
+               bkey_init(&update->k);
+               update->k.type  = discard_key_type;
+               update->k.p     = discard_iter.pos;
 
-               if (gc_count != c->gc_count)
-                       ca->inc_gen_really_needs_gc = 0;
+               ret =   bch2_trans_update(trans, &discard_iter, update, 0) ?:
+                       bch2_trans_commit(trans, NULL, NULL, 0);
+               if (ret)
+                       goto err;
+       }
 
-               if ((ssize_t) (dev_buckets_available(c, ca) -
-                              ca->inc_gen_really_needs_gc) >=
-                   (ssize_t) fifo_free(&ca->free_inc))
-                       break;
+       k = bch2_btree_iter_peek_slot(&freespace_iter);
+       ret = bkey_err(k);
+       if (ret)
+               goto err;
 
-               up_read(&c->gc_lock);
-               schedule();
-               try_to_freeze();
-               down_read(&c->gc_lock);
+       if (fsck_err_on(k.k->type != freespace_key_type, c,
+                       "incorrect key in freespace btree (got %s should be %s)\n"
+                       "  %s",
+                       bch2_bkey_types[k.k->type],
+                       bch2_bkey_types[freespace_key_type],
+                       (printbuf_reset(&buf),
+                        bch2_bkey_val_to_text(&buf, c, alloc_k), buf.buf))) {
+               struct bkey_i *update =
+                       bch2_trans_kmalloc(trans, sizeof(*update));
+
+               ret = PTR_ERR_OR_ZERO(update);
+               if (ret)
+                       goto err;
+
+               bkey_init(&update->k);
+               update->k.type  = freespace_key_type;
+               update->k.p     = freespace_iter.pos;
+               bch2_key_resize(&update->k, 1);
+
+               ret   = bch2_trans_update(trans, &freespace_iter, update, 0) ?:
+                       bch2_trans_commit(trans, NULL, NULL, 0);
+               if (ret)
+                       goto err;
        }
 
-       __set_current_state(TASK_RUNNING);
+       if (bucket_state(a) == BUCKET_cached) {
+               k = bch2_btree_iter_peek_slot(&lru_iter);
+               ret = bkey_err(k);
+               if (ret)
+                       goto err;
+
+               if (fsck_err_on(!a.io_time[READ], c,
+                               "cached bucket with read_time 0\n"
+                               "  %s",
+                       (printbuf_reset(&buf),
+                        bch2_bkey_val_to_text(&buf, c, alloc_k), buf.buf)) ||
+                   fsck_err_on(k.k->type != KEY_TYPE_lru ||
+                               le64_to_cpu(bkey_s_c_to_lru(k).v->idx) != alloc_k.k->p.offset, c,
+                               "incorrect/missing lru entry\n"
+                               "  %s\n"
+                               "  %s",
+                               (printbuf_reset(&buf),
+                                bch2_bkey_val_to_text(&buf, c, alloc_k), buf.buf),
+                               (bch2_bkey_val_to_text(&buf2, c, k), buf2.buf))) {
+                       u64 read_time = a.io_time[READ];
+
+                       if (!a.io_time[READ])
+                               a.io_time[READ] = atomic64_read(&c->io_clock[READ].now);
+
+                       ret   = bch2_lru_change(trans,
+                                               alloc_k.k->p.inode,
+                                               alloc_k.k->p.offset,
+                                               0, &a.io_time[READ]);
+                       if (ret)
+                               goto err;
+
+                       if (a.io_time[READ] != read_time) {
+                               struct bkey_i_alloc_v4 *a_mut =
+                                       bch2_alloc_to_v4_mut(trans, alloc_k);
+                               ret = PTR_ERR_OR_ZERO(a_mut);
+                               if (ret)
+                                       goto err;
+
+                               a_mut->v.io_time[READ] = a.io_time[READ];
+                               ret = bch2_trans_update(trans, alloc_iter,
+                                                       &a_mut->k_i, BTREE_TRIGGER_NORUN);
+                               if (ret)
+                                       goto err;
+                       }
+
+                       ret = bch2_trans_commit(trans, NULL, NULL, 0);
+                       if (ret)
+                               goto err;
+               }
+       }
+err:
+fsck_err:
+       bch2_trans_iter_exit(trans, &lru_iter);
+       bch2_trans_iter_exit(trans, &freespace_iter);
+       bch2_trans_iter_exit(trans, &discard_iter);
+       printbuf_exit(&buf2);
+       printbuf_exit(&buf);
        return ret;
 }
 
-static bool bch2_can_invalidate_bucket(struct bch_dev *ca,
-                                      size_t bucket,
-                                      struct bucket_mark mark)
+static inline bool bch2_dev_bucket_exists(struct bch_fs *c, struct bpos pos)
 {
-       u8 gc_gen;
-
-       if (!is_available_bucket(mark))
-               return false;
+       struct bch_dev *ca;
 
-       if (ca->buckets_nouse &&
-           test_bit(bucket, ca->buckets_nouse))
+       if (pos.inode >= c->sb.nr_devices || !c->devs[pos.inode])
                return false;
 
-       gc_gen = bucket_gc_gen(ca, bucket);
-
-       if (gc_gen >= BUCKET_GC_GEN_MAX / 2)
-               ca->inc_gen_needs_gc++;
-
-       if (gc_gen >= BUCKET_GC_GEN_MAX)
-               ca->inc_gen_really_needs_gc++;
-
-       return gc_gen < BUCKET_GC_GEN_MAX;
+       ca = bch_dev_bkey_exists(c, pos.inode);
+       return pos.offset >= ca->mi.first_bucket &&
+               pos.offset < ca->mi.nbuckets;
 }
 
-/*
- * Determines what order we're going to reuse buckets, smallest bucket_key()
- * first.
- *
- *
- * - We take into account the read prio of the bucket, which gives us an
- *   indication of how hot the data is -- we scale the prio so that the prio
- *   farthest from the clock is worth 1/8th of the closest.
- *
- * - The number of sectors of cached data in the bucket, which gives us an
- *   indication of the cost in cache misses this eviction will cause.
- *
- * - If hotness * sectors used compares equal, we pick the bucket with the
- *   smallest bucket_gc_gen() - since incrementing the same bucket's generation
- *   number repeatedly forces us to run mark and sweep gc to avoid generation
- *   number wraparound.
- */
-
-static unsigned long bucket_sort_key(struct bch_fs *c, struct bch_dev *ca,
-                                    size_t b, struct bucket_mark m)
+static int bch2_check_freespace_key(struct btree_trans *trans,
+                                   struct btree_iter *freespace_iter,
+                                   bool initial)
 {
-       unsigned last_io = bucket_last_io(c, bucket(ca, b), READ);
-       unsigned max_last_io = ca->max_last_bucket_io[READ];
+       struct bch_fs *c = trans->c;
+       struct btree_iter alloc_iter;
+       struct bkey_s_c k, freespace_k;
+       struct bch_alloc_v4 a;
+       u64 genbits;
+       struct bpos pos;
+       struct bkey_i *update;
+       struct printbuf buf = PRINTBUF;
+       int ret;
 
-       /*
-        * Time since last read, scaled to [0, 8) where larger value indicates
-        * more recently read data:
-        */
-       unsigned long hotness = (max_last_io - last_io) * 7 / max_last_io;
+       freespace_k = bch2_btree_iter_peek(freespace_iter);
+       if (!freespace_k.k)
+               return 1;
 
-       /* How much we want to keep the data in this bucket: */
-       unsigned long data_wantness =
-               (hotness + 1) * bucket_sectors_used(m);
+       ret = bkey_err(freespace_k);
+       if (ret)
+               return ret;
 
-       unsigned long needs_journal_commit =
-               bucket_needs_journal_commit(m, c->journal.last_seq_ondisk);
+       pos = freespace_iter->pos;
+       pos.offset &= ~(~0ULL << 56);
+       genbits = freespace_iter->pos.offset & (~0ULL << 56);
 
-       return  (data_wantness << 9) |
-               (needs_journal_commit << 8) |
-               (bucket_gc_gen(ca, b) / 16);
-}
+       bch2_trans_iter_init(trans, &alloc_iter, BTREE_ID_alloc, pos, 0);
 
-static inline int bucket_alloc_cmp(alloc_heap *h,
-                                  struct alloc_heap_entry l,
-                                  struct alloc_heap_entry r)
-{
-       return (l.key > r.key) - (l.key < r.key) ?:
-               (l.nr < r.nr)  - (l.nr  > r.nr) ?:
-               (l.bucket > r.bucket) - (l.bucket < r.bucket);
-}
+       if (fsck_err_on(!bch2_dev_bucket_exists(c, pos), c,
+                       "%llu:%llu set in freespace btree but device or bucket does not exist",
+                       pos.inode, pos.offset))
+               goto delete;
 
-static inline int bucket_idx_cmp(const void *_l, const void *_r)
-{
-       const struct alloc_heap_entry *l = _l, *r = _r;
+       k = bch2_btree_iter_peek_slot(&alloc_iter);
+       ret = bkey_err(k);
+       if (ret)
+               goto err;
 
-       return (l->bucket > r->bucket) - (l->bucket < r->bucket);
-}
+       bch2_alloc_to_v4(k, &a);
 
-static void find_reclaimable_buckets_lru(struct bch_fs *c, struct bch_dev *ca)
-{
-       struct bucket_array *buckets;
-       struct alloc_heap_entry e = { 0 };
-       size_t b, i, nr = 0;
+       if (fsck_err_on(bucket_state(a) != BUCKET_free ||
+                       genbits != alloc_freespace_genbits(a), c,
+                       "%s\n  incorrectly set in freespace index (free %u, genbits %llu should be %llu)",
+                       (bch2_bkey_val_to_text(&buf, c, k), buf.buf),
+                       bucket_state(a) == BUCKET_free,
+                       genbits >> 56, alloc_freespace_genbits(a) >> 56))
+               goto delete;
+out:
+err:
+fsck_err:
+       bch2_trans_iter_exit(trans, &alloc_iter);
+       printbuf_exit(&buf);
+       return ret;
+delete:
+       update = bch2_trans_kmalloc(trans, sizeof(*update));
+       ret = PTR_ERR_OR_ZERO(update);
+       if (ret)
+               goto err;
 
-       ca->alloc_heap.used = 0;
+       bkey_init(&update->k);
+       update->k.p = freespace_iter->pos;
+       bch2_key_resize(&update->k, 1);
 
-       mutex_lock(&c->bucket_clock[READ].lock);
-       down_read(&ca->bucket_lock);
+       ret   = bch2_trans_update(trans, freespace_iter, update, 0) ?:
+               bch2_trans_commit(trans, NULL, NULL, 0);
+       goto out;
+}
 
-       buckets = bucket_array(ca);
+int bch2_check_alloc_info(struct bch_fs *c, bool initial)
+{
+       struct btree_trans trans;
+       struct btree_iter iter;
+       struct bkey_s_c k;
+       int ret = 0, last_dev = -1;
 
-       bch2_recalc_oldest_io(c, ca, READ);
+       bch2_trans_init(&trans, c, 0, 0);
 
-       /*
-        * Find buckets with lowest read priority, by building a maxheap sorted
-        * by read priority and repeatedly replacing the maximum element until
-        * all buckets have been visited.
-        */
-       for (b = ca->mi.first_bucket; b < ca->mi.nbuckets; b++) {
-               struct bucket_mark m = READ_ONCE(buckets->b[b].mark);
-               unsigned long key = bucket_sort_key(c, ca, b, m);
+       for_each_btree_key(&trans, iter, BTREE_ID_alloc, POS_MIN,
+                          BTREE_ITER_PREFETCH, k, ret) {
+               if (k.k->p.inode != last_dev) {
+                       struct bch_dev *ca = bch_dev_bkey_exists(c, k.k->p.inode);
 
-               if (!bch2_can_invalidate_bucket(ca, b, m))
-                       continue;
+                       if (!ca->mi.freespace_initialized) {
+                               bch2_btree_iter_set_pos(&iter, POS(k.k->p.inode + 1, 0));
+                               continue;
+                       }
 
-               if (e.nr && e.bucket + e.nr == b && e.key == key) {
-                       e.nr++;
-               } else {
-                       if (e.nr)
-                               heap_add_or_replace(&ca->alloc_heap, e,
-                                       -bucket_alloc_cmp, NULL);
-
-                       e = (struct alloc_heap_entry) {
-                               .bucket = b,
-                               .nr     = 1,
-                               .key    = key,
-                       };
+                       last_dev = k.k->p.inode;
                }
 
-               cond_resched();
+               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+                       bch2_check_alloc_key(&trans, &iter));
+               if (ret)
+                       break;
        }
+       bch2_trans_iter_exit(&trans, &iter);
 
-       if (e.nr)
-               heap_add_or_replace(&ca->alloc_heap, e,
-                               -bucket_alloc_cmp, NULL);
+       if (ret)
+               goto err;
 
-       for (i = 0; i < ca->alloc_heap.used; i++)
-               nr += ca->alloc_heap.data[i].nr;
+       bch2_trans_iter_init(&trans, &iter, BTREE_ID_freespace, POS_MIN,
+                            BTREE_ITER_PREFETCH);
+       while (1) {
+               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+                       bch2_check_freespace_key(&trans, &iter, initial));
+               if (ret)
+                       break;
 
-       while (nr - ca->alloc_heap.data[0].nr >= ALLOC_SCAN_BATCH(ca)) {
-               nr -= ca->alloc_heap.data[0].nr;
-               heap_pop(&ca->alloc_heap, e, -bucket_alloc_cmp, NULL);
+               bch2_btree_iter_set_pos(&iter, bpos_nosnap_successor(iter.pos));
        }
-
-       up_read(&ca->bucket_lock);
-       mutex_unlock(&c->bucket_clock[READ].lock);
+       bch2_trans_iter_exit(&trans, &iter);
+err:
+       bch2_trans_exit(&trans);
+       return ret < 0 ? ret : 0;
 }
 
-static void find_reclaimable_buckets_fifo(struct bch_fs *c, struct bch_dev *ca)
+static int bch2_clear_need_discard(struct btree_trans *trans, struct bpos pos,
+                                  struct bch_dev *ca, bool *discard_done)
 {
-       struct bucket_array *buckets = bucket_array(ca);
-       struct bucket_mark m;
-       size_t b, start;
+       struct bch_fs *c = trans->c;
+       struct btree_iter iter;
+       struct bkey_s_c k;
+       struct bkey_i_alloc_v4 *a;
+       struct printbuf buf = PRINTBUF;
+       int ret;
 
-       if (ca->fifo_last_bucket <  ca->mi.first_bucket ||
-           ca->fifo_last_bucket >= ca->mi.nbuckets)
-               ca->fifo_last_bucket = ca->mi.first_bucket;
+       bch2_trans_iter_init(trans, &iter, BTREE_ID_alloc, pos,
+                            BTREE_ITER_CACHED);
+       k = bch2_btree_iter_peek_slot(&iter);
+       ret = bkey_err(k);
+       if (ret)
+               goto out;
 
-       start = ca->fifo_last_bucket;
+       a = bch2_alloc_to_v4_mut(trans, k);
+       ret = PTR_ERR_OR_ZERO(a);
+       if (ret)
+               goto out;
 
-       do {
-               ca->fifo_last_bucket++;
-               if (ca->fifo_last_bucket == ca->mi.nbuckets)
-                       ca->fifo_last_bucket = ca->mi.first_bucket;
+       if (BCH_ALLOC_V4_NEED_INC_GEN(&a->v)) {
+               a->v.gen++;
+               SET_BCH_ALLOC_V4_NEED_INC_GEN(&a->v, false);
+               goto write;
+       }
 
-               b = ca->fifo_last_bucket;
-               m = READ_ONCE(buckets->b[b].mark);
+       BUG_ON(a->v.journal_seq > c->journal.flushed_seq_ondisk);
 
-               if (bch2_can_invalidate_bucket(ca, b, m)) {
-                       struct alloc_heap_entry e = { .bucket = b, .nr = 1, };
+       if (bch2_fs_inconsistent_on(!BCH_ALLOC_V4_NEED_DISCARD(&a->v), c,
+                       "%s\n  incorrectly set in need_discard btree",
+                       (bch2_bkey_val_to_text(&buf, c, k), buf.buf))) {
+               ret = -EIO;
+               goto out;
+       }
 
-                       heap_add(&ca->alloc_heap, e, bucket_alloc_cmp, NULL);
-                       if (heap_full(&ca->alloc_heap))
-                               break;
-               }
+       if (!*discard_done && ca->mi.discard && !c->opts.nochanges) {
+               /*
+                * This works without any other locks because this is the only
+                * thread that removes items from the need_discard tree
+                */
+               bch2_trans_unlock(trans);
+               blkdev_issue_discard(ca->disk_sb.bdev,
+                                    k.k->p.offset * ca->mi.bucket_size,
+                                    ca->mi.bucket_size,
+                                    GFP_KERNEL, 0);
+               *discard_done = true;
+
+               ret = bch2_trans_relock(trans) ? 0 : -EINTR;
+               if (ret)
+                       goto out;
+       }
 
-               cond_resched();
-       } while (ca->fifo_last_bucket != start);
+       SET_BCH_ALLOC_V4_NEED_DISCARD(&a->v, false);
+write:
+       ret = bch2_trans_update(trans, &iter, &a->k_i, 0);
+out:
+       bch2_trans_iter_exit(trans, &iter);
+       printbuf_exit(&buf);
+       return ret;
 }
 
-static void find_reclaimable_buckets_random(struct bch_fs *c, struct bch_dev *ca)
+static void bch2_do_discards_work(struct work_struct *work)
 {
-       struct bucket_array *buckets = bucket_array(ca);
-       struct bucket_mark m;
-       size_t checked, i;
-
-       for (checked = 0;
-            checked < ca->mi.nbuckets / 2;
-            checked++) {
-               size_t b = bch2_rand_range(ca->mi.nbuckets -
-                                          ca->mi.first_bucket) +
-                       ca->mi.first_bucket;
+       struct bch_fs *c = container_of(work, struct bch_fs, discard_work);
+       struct bch_dev *ca = NULL;
+       struct btree_trans trans;
+       struct btree_iter iter;
+       struct bkey_s_c k;
+       u64 seen = 0, open = 0, need_journal_commit = 0, discarded = 0;
+       int ret;
 
-               m = READ_ONCE(buckets->b[b].mark);
+       bch2_trans_init(&trans, c, 0, 0);
 
-               if (bch2_can_invalidate_bucket(ca, b, m)) {
-                       struct alloc_heap_entry e = { .bucket = b, .nr = 1, };
+       for_each_btree_key(&trans, iter, BTREE_ID_need_discard,
+                          POS_MIN, 0, k, ret) {
+               bool discard_done = false;
 
-                       heap_add(&ca->alloc_heap, e, bucket_alloc_cmp, NULL);
-                       if (heap_full(&ca->alloc_heap))
-                               break;
+               if (ca && k.k->p.inode != ca->dev_idx) {
+                       percpu_ref_put(&ca->io_ref);
+                       ca = NULL;
                }
 
-               cond_resched();
-       }
+               if (!ca) {
+                       ca = bch_dev_bkey_exists(c, k.k->p.inode);
+                       if (!percpu_ref_tryget(&ca->io_ref)) {
+                               ca = NULL;
+                               bch2_btree_iter_set_pos(&iter, POS(k.k->p.inode + 1, 0));
+                               continue;
+                       }
+               }
 
-       sort(ca->alloc_heap.data,
-            ca->alloc_heap.used,
-            sizeof(ca->alloc_heap.data[0]),
-            bucket_idx_cmp, NULL);
+               seen++;
 
-       /* remove duplicates: */
-       for (i = 0; i + 1 < ca->alloc_heap.used; i++)
-               if (ca->alloc_heap.data[i].bucket ==
-                   ca->alloc_heap.data[i + 1].bucket)
-                       ca->alloc_heap.data[i].nr = 0;
-}
+               if (bch2_bucket_is_open_safe(c, k.k->p.inode, k.k->p.offset)) {
+                       open++;
+                       continue;
+               }
 
-static size_t find_reclaimable_buckets(struct bch_fs *c, struct bch_dev *ca)
-{
-       size_t i, nr = 0;
+               if (bch2_bucket_needs_journal_commit(&c->buckets_waiting_for_journal,
+                               c->journal.flushed_seq_ondisk,
+                               k.k->p.inode, k.k->p.offset)) {
+                       need_journal_commit++;
+                       continue;
+               }
 
-       ca->inc_gen_needs_gc                    = 0;
+               ret = __bch2_trans_do(&trans, NULL, NULL,
+                                     BTREE_INSERT_USE_RESERVE|
+                                     BTREE_INSERT_NOFAIL,
+                               bch2_clear_need_discard(&trans, k.k->p, ca, &discard_done));
+               if (ret)
+                       break;
 
-       switch (ca->mi.replacement) {
-       case CACHE_REPLACEMENT_LRU:
-               find_reclaimable_buckets_lru(c, ca);
-               break;
-       case CACHE_REPLACEMENT_FIFO:
-               find_reclaimable_buckets_fifo(c, ca);
-               break;
-       case CACHE_REPLACEMENT_RANDOM:
-               find_reclaimable_buckets_random(c, ca);
-               break;
+               discarded++;
        }
+       bch2_trans_iter_exit(&trans, &iter);
 
-       heap_resort(&ca->alloc_heap, bucket_alloc_cmp, NULL);
+       if (ca)
+               percpu_ref_put(&ca->io_ref);
 
-       for (i = 0; i < ca->alloc_heap.used; i++)
-               nr += ca->alloc_heap.data[i].nr;
+       bch2_trans_exit(&trans);
 
-       return nr;
-}
+       if (need_journal_commit * 2 > seen)
+               bch2_journal_flush_async(&c->journal, NULL);
 
-static inline long next_alloc_bucket(struct bch_dev *ca)
-{
-       struct alloc_heap_entry e, *top = ca->alloc_heap.data;
-
-       while (ca->alloc_heap.used) {
-               if (top->nr) {
-                       size_t b = top->bucket;
-
-                       top->bucket++;
-                       top->nr--;
-                       return b;
-               }
+       percpu_ref_put(&c->writes);
 
-               heap_pop(&ca->alloc_heap, e, bucket_alloc_cmp, NULL);
-       }
-
-       return -1;
+       trace_do_discards(c, seen, open, need_journal_commit, discarded, ret);
 }
 
-static bool bch2_invalidate_one_bucket(struct bch_fs *c, struct bch_dev *ca,
-                                      size_t bucket, u64 *flush_seq)
+void bch2_do_discards(struct bch_fs *c)
 {
-       struct bucket_mark m;
-
-       percpu_down_read_preempt_disable(&c->mark_lock);
-       spin_lock(&c->freelist_lock);
+       if (percpu_ref_tryget(&c->writes) &&
+           !queue_work(system_long_wq, &c->discard_work))
+               percpu_ref_put(&c->writes);
+}
 
-       bch2_invalidate_bucket(c, ca, bucket, &m);
+static int invalidate_one_bucket(struct btree_trans *trans, struct bch_dev *ca)
+{
+       struct bch_fs *c = trans->c;
+       struct btree_iter lru_iter, alloc_iter = { NULL };
+       struct bkey_s_c k;
+       struct bkey_i_alloc_v4 *a;
+       u64 bucket, idx;
+       int ret;
 
-       verify_not_on_freelist(c, ca, bucket);
-       BUG_ON(!fifo_push(&ca->free_inc, bucket));
+       bch2_trans_iter_init(trans, &lru_iter, BTREE_ID_lru,
+                            POS(ca->dev_idx, 0), 0);
+       k = bch2_btree_iter_peek(&lru_iter);
+       ret = bkey_err(k);
+       if (ret)
+               goto out;
 
-       spin_unlock(&c->freelist_lock);
+       if (!k.k || k.k->p.inode != ca->dev_idx)
+               goto out;
 
-       bucket_io_clock_reset(c, ca, bucket, READ);
-       bucket_io_clock_reset(c, ca, bucket, WRITE);
+       if (bch2_fs_inconsistent_on(k.k->type != KEY_TYPE_lru, c,
+                                   "non lru key in lru btree"))
+               goto out;
 
-       percpu_up_read_preempt_enable(&c->mark_lock);
+       idx     = k.k->p.offset;
+       bucket  = le64_to_cpu(bkey_s_c_to_lru(k).v->idx);
 
-       if (m.journal_seq_valid) {
-               u64 journal_seq = atomic64_read(&c->journal.seq);
-               u64 bucket_seq  = journal_seq;
+       a = bch2_trans_start_alloc_update(trans, &alloc_iter,
+                                         POS(ca->dev_idx, bucket));
+       ret = PTR_ERR_OR_ZERO(a);
+       if (ret)
+               goto out;
+
+       if (bch2_fs_inconsistent_on(idx != alloc_lru_idx(a->v), c,
+                       "invalidating bucket with wrong lru idx (got %llu should be %llu",
+                       idx, alloc_lru_idx(a->v)))
+               goto out;
+
+       SET_BCH_ALLOC_V4_NEED_INC_GEN(&a->v, false);
+       a->v.gen++;
+       a->v.data_type          = 0;
+       a->v.dirty_sectors      = 0;
+       a->v.cached_sectors     = 0;
+       a->v.io_time[READ]      = atomic64_read(&c->io_clock[READ].now);
+       a->v.io_time[WRITE]     = atomic64_read(&c->io_clock[WRITE].now);
+
+       ret = bch2_trans_update(trans, &alloc_iter, &a->k_i,
+                               BTREE_TRIGGER_BUCKET_INVALIDATE);
+out:
+       bch2_trans_iter_exit(trans, &alloc_iter);
+       bch2_trans_iter_exit(trans, &lru_iter);
+       return ret;
+}
 
-               bucket_seq &= ~((u64) U16_MAX);
-               bucket_seq |= m.journal_seq;
+static void bch2_do_invalidates_work(struct work_struct *work)
+{
+       struct bch_fs *c = container_of(work, struct bch_fs, invalidate_work);
+       struct bch_dev *ca;
+       struct btree_trans trans;
+       unsigned i;
+       int ret = 0;
 
-               if (bucket_seq > journal_seq)
-                       bucket_seq -= 1 << 16;
+       bch2_trans_init(&trans, c, 0, 0);
 
-               *flush_seq = max(*flush_seq, bucket_seq);
-       }
+       for_each_member_device(ca, c, i)
+               while (!ret && should_invalidate_buckets(ca))
+                       ret = __bch2_trans_do(&trans, NULL, NULL,
+                                             BTREE_INSERT_USE_RESERVE|
+                                             BTREE_INSERT_NOFAIL,
+                                       invalidate_one_bucket(&trans, ca));
+
+       bch2_trans_exit(&trans);
+       percpu_ref_put(&c->writes);
+}
 
-       return m.cached_sectors != 0;
+void bch2_do_invalidates(struct bch_fs *c)
+{
+       if (percpu_ref_tryget(&c->writes))
+               queue_work(system_long_wq, &c->invalidate_work);
 }
 
-/*
- * Pull buckets off ca->alloc_heap, invalidate them, move them to ca->free_inc:
- */
-static int bch2_invalidate_buckets(struct bch_fs *c, struct bch_dev *ca)
+static int bch2_dev_freespace_init(struct bch_fs *c, struct bch_dev *ca)
 {
+       struct btree_trans trans;
        struct btree_iter iter;
-       u64 journal_seq = 0;
-       int ret = 0;
-       long b;
+       struct bkey_s_c k;
+       struct bch_alloc_v4 a;
+       struct bch_member *m;
+       int ret;
 
-       bch2_btree_iter_init(&iter, c, BTREE_ID_ALLOC, POS(ca->dev_idx, 0),
-                            BTREE_ITER_SLOTS|BTREE_ITER_INTENT);
+       bch2_trans_init(&trans, c, 0, 0);
 
-       /* Only use nowait if we've already invalidated at least one bucket: */
-       while (!ret &&
-              !fifo_full(&ca->free_inc) &&
-              (b = next_alloc_bucket(ca)) >= 0) {
-               bool must_flush =
-                       bch2_invalidate_one_bucket(c, ca, b, &journal_seq);
+       for_each_btree_key(&trans, iter, BTREE_ID_alloc,
+                          POS(ca->dev_idx, ca->mi.first_bucket),
+                          BTREE_ITER_SLOTS|
+                          BTREE_ITER_PREFETCH, k, ret) {
+               if (iter.pos.offset >= ca->mi.nbuckets)
+                       break;
 
-               ret = __bch2_alloc_write_key(c, ca, b, &iter,
-                               must_flush ? &journal_seq : NULL,
-                               !fifo_empty(&ca->free_inc) ? BTREE_INSERT_NOWAIT : 0);
+               bch2_alloc_to_v4(k, &a);
+               ret = __bch2_trans_do(&trans, NULL, NULL,
+                                     BTREE_INSERT_LAZY_RW,
+                                bch2_bucket_do_index(&trans, k, a, true));
+               if (ret)
+                       break;
        }
+       bch2_trans_iter_exit(&trans, &iter);
 
-       bch2_btree_iter_unlock(&iter);
+       bch2_trans_exit(&trans);
 
-       /* If we used NOWAIT, don't return the error: */
-       if (!fifo_empty(&ca->free_inc))
-               ret = 0;
        if (ret) {
-               bch_err(ca, "error invalidating buckets: %i", ret);
+               bch_err(ca, "error initializing free space: %i", ret);
                return ret;
        }
 
-       if (journal_seq)
-               ret = bch2_journal_flush_seq(&c->journal, journal_seq);
-       if (ret) {
-               bch_err(ca, "journal error: %i", ret);
-               return ret;
-       }
+       mutex_lock(&c->sb_lock);
+       m = bch2_sb_get_members(c->disk_sb.sb)->members + ca->dev_idx;
+       SET_BCH_MEMBER_FREESPACE_INITIALIZED(m, true);
+       mutex_unlock(&c->sb_lock);
 
-       return 0;
+       return ret;
 }
 
-static int push_invalidated_bucket(struct bch_fs *c, struct bch_dev *ca, size_t bucket)
+int bch2_fs_freespace_init(struct bch_fs *c)
 {
+       struct bch_dev *ca;
        unsigned i;
        int ret = 0;
+       bool doing_init = false;
 
-       while (1) {
-               set_current_state(TASK_INTERRUPTIBLE);
+       /*
+        * We can crash during the device add path, so we need to check this on
+        * every mount:
+        */
 
-               spin_lock(&c->freelist_lock);
-               for (i = 0; i < RESERVE_NR; i++)
-                       if (fifo_push(&ca->free[i], bucket)) {
-                               fifo_pop(&ca->free_inc, bucket);
-                               closure_wake_up(&c->freelist_wait);
-                               spin_unlock(&c->freelist_lock);
-                               goto out;
-                       }
-               spin_unlock(&c->freelist_lock);
+       for_each_member_device(ca, c, i) {
+               if (ca->mi.freespace_initialized)
+                       continue;
 
-               if ((current->flags & PF_KTHREAD) &&
-                   kthread_should_stop()) {
-                       ret = 1;
-                       break;
+               if (!doing_init) {
+                       bch_info(c, "initializing freespace");
+                       doing_init = true;
                }
 
-               schedule();
-               try_to_freeze();
+               ret = bch2_dev_freespace_init(c, ca);
+               if (ret) {
+                       percpu_ref_put(&ca->ref);
+                       return ret;
+               }
        }
-out:
-       __set_current_state(TASK_RUNNING);
-       return ret;
-}
-
-/*
- * Pulls buckets off free_inc, discards them (if enabled), then adds them to
- * freelists, waiting until there's room if necessary:
- */
-static int discard_invalidated_buckets(struct bch_fs *c, struct bch_dev *ca)
-{
-       while (!fifo_empty(&ca->free_inc)) {
-               size_t bucket = fifo_peek(&ca->free_inc);
 
-               if (ca->mi.discard &&
-                   blk_queue_discard(bdev_get_queue(ca->disk_sb.bdev)))
-                       blkdev_issue_discard(ca->disk_sb.bdev,
-                                            bucket_to_sector(ca, bucket),
-                                            ca->mi.bucket_size, GFP_NOIO, 0);
+       if (doing_init) {
+               mutex_lock(&c->sb_lock);
+               bch2_write_super(c);
+               mutex_unlock(&c->sb_lock);
 
-               if (push_invalidated_bucket(c, ca, bucket))
-                       return 1;
+               bch_verbose(c, "done initializing freespace");
        }
 
-       return 0;
+       return ret;
 }
 
-/**
- * bch_allocator_thread - move buckets from free_inc to reserves
- *
- * The free_inc FIFO is populated by find_reclaimable_buckets(), and
- * the reserves are depleted by bucket allocation. When we run out
- * of free_inc, try to invalidate some buckets and write out
- * prios and gens.
- */
-static int bch2_allocator_thread(void *arg)
-{
-       struct bch_dev *ca = arg;
-       struct bch_fs *c = ca->fs;
-       size_t nr;
-       int ret;
-
-       set_freezable();
-
-       while (1) {
-               cond_resched();
-
-               pr_debug("discarding %zu invalidated buckets",
-                        fifo_used(&ca->free_inc));
-
-               ret = discard_invalidated_buckets(c, ca);
-               if (ret)
-                       goto stop;
-
-               down_read(&c->gc_lock);
-
-               ret = bch2_invalidate_buckets(c, ca);
-               if (ret) {
-                       up_read(&c->gc_lock);
-                       goto stop;
-               }
-
-               if (!fifo_empty(&ca->free_inc)) {
-                       up_read(&c->gc_lock);
-                       continue;
-               }
-
-               pr_debug("free_inc now empty");
-
-               do {
-                       /*
-                        * Find some buckets that we can invalidate, either
-                        * they're completely unused, or only contain clean data
-                        * that's been written back to the backing device or
-                        * another cache tier
-                        */
-
-                       pr_debug("scanning for reclaimable buckets");
-
-                       nr = find_reclaimable_buckets(c, ca);
-
-                       pr_debug("found %zu buckets", nr);
-
-                       trace_alloc_batch(ca, nr, ca->alloc_heap.size);
-
-                       if ((ca->inc_gen_needs_gc >= ALLOC_SCAN_BATCH(ca) ||
-                            ca->inc_gen_really_needs_gc) &&
-                           c->gc_thread) {
-                               atomic_inc(&c->kick_gc);
-                               wake_up_process(c->gc_thread);
-                       }
+/* Bucket IO clocks: */
 
-                       /*
-                        * If we found any buckets, we have to invalidate them
-                        * before we scan for more - but if we didn't find very
-                        * many we may want to wait on more buckets being
-                        * available so we don't spin:
-                        */
-                       if (!nr ||
-                           (nr < ALLOC_SCAN_BATCH(ca) &&
-                            !fifo_full(&ca->free[RESERVE_MOVINGGC]))) {
-                               ca->allocator_blocked = true;
-                               closure_wake_up(&c->freelist_wait);
-
-                               ret = wait_buckets_available(c, ca);
-                               if (ret) {
-                                       up_read(&c->gc_lock);
-                                       goto stop;
-                               }
-                       }
-               } while (!nr);
+int bch2_bucket_io_time_reset(struct btree_trans *trans, unsigned dev,
+                             size_t bucket_nr, int rw)
+{
+       struct bch_fs *c = trans->c;
+       struct btree_iter iter;
+       struct bkey_i_alloc_v4 *a;
+       u64 now;
+       int ret = 0;
 
-               ca->allocator_blocked = false;
-               up_read(&c->gc_lock);
+       a = bch2_trans_start_alloc_update(trans, &iter,  POS(dev, bucket_nr));
+       ret = PTR_ERR_OR_ZERO(a);
+       if (ret)
+               return ret;
 
-               pr_debug("%zu buckets to invalidate", nr);
+       now = atomic64_read(&c->io_clock[rw].now);
+       if (a->v.io_time[rw] == now)
+               goto out;
 
-               /*
-                * alloc_heap is now full of newly-invalidated buckets: next,
-                * write out the new bucket gens:
-                */
-       }
+       a->v.io_time[rw] = now;
 
-stop:
-       pr_debug("alloc thread stopping (ret %i)", ret);
-       return 0;
+       ret   = bch2_trans_update(trans, &iter, &a->k_i, 0) ?:
+               bch2_trans_commit(trans, NULL, NULL, 0);
+out:
+       bch2_trans_iter_exit(trans, &iter);
+       return ret;
 }
 
 /* Startup/shutdown (ro/rw): */
@@ -1035,12 +1173,12 @@ void bch2_recalc_capacity(struct bch_fs *c)
        u64 capacity = 0, reserved_sectors = 0, gc_reserve;
        unsigned bucket_size_max = 0;
        unsigned long ra_pages = 0;
-       unsigned i, j;
+       unsigned i;
 
        lockdep_assert_held(&c->state_lock);
 
        for_each_online_member(ca, c, i) {
-               struct backing_dev_info *bdi = ca->disk_sb.bdev->bd_bdi;
+               struct backing_dev_info *bdi = ca->disk_sb.bdev->bd_disk->bdi;
 
                ra_pages += bdi->ra_pages;
        }
@@ -1066,8 +1204,9 @@ void bch2_recalc_capacity(struct bch_fs *c)
                 * allocations for foreground writes must wait -
                 * not -ENOSPC calculations.
                 */
-               for (j = 0; j < RESERVE_NONE; j++)
-                       dev_reserve += ca->free[j].size;
+
+               dev_reserve += ca->nr_btree_reserve * 2;
+               dev_reserve += ca->mi.nbuckets >> 6; /* copygc reserve */
 
                dev_reserve += 1;       /* btree write point */
                dev_reserve += 1;       /* copygc write point */
@@ -1075,8 +1214,6 @@ void bch2_recalc_capacity(struct bch_fs *c)
 
                dev_reserve *= ca->mi.bucket_size;
 
-               ca->copygc_threshold = dev_reserve;
-
                capacity += bucket_to_sector(ca, ca->mi.nbuckets -
                                             ca->mi.first_bucket);
 
@@ -1098,18 +1235,6 @@ void bch2_recalc_capacity(struct bch_fs *c)
 
        c->bucket_size_max = bucket_size_max;
 
-       if (c->capacity) {
-               bch2_io_timer_add(&c->io_clock[READ],
-                                &c->bucket_clock[READ].rescale);
-               bch2_io_timer_add(&c->io_clock[WRITE],
-                                &c->bucket_clock[WRITE].rescale);
-       } else {
-               bch2_io_timer_del(&c->io_clock[READ],
-                                &c->bucket_clock[READ].rescale);
-               bch2_io_timer_del(&c->io_clock[WRITE],
-                                &c->bucket_clock[WRITE].rescale);
-       }
-
        /* Wake up case someone was waiting for buckets */
        closure_wake_up(&c->freelist_wait);
 }
@@ -1124,7 +1249,7 @@ static bool bch2_dev_has_open_write_point(struct bch_fs *c, struct bch_dev *ca)
             ob++) {
                spin_lock(&ob->lock);
                if (ob->valid && !ob->on_partial_list &&
-                   ob->ptr.dev == ca->dev_idx)
+                   ob->dev == ca->dev_idx)
                        ret = true;
                spin_unlock(&ob->lock);
        }
@@ -1137,8 +1262,6 @@ void bch2_dev_allocator_remove(struct bch_fs *c, struct bch_dev *ca)
 {
        unsigned i;
 
-       BUG_ON(ca->alloc_thread);
-
        /* First, remove device from allocation groups: */
 
        for (i = 0; i < ARRAY_SIZE(c->rw_devs); i++)
@@ -1153,7 +1276,7 @@ void bch2_dev_allocator_remove(struct bch_fs *c, struct bch_dev *ca)
        for (i = 0; i < ARRAY_SIZE(c->write_points); i++)
                bch2_writepoint_stop(c, ca, &c->write_points[i]);
 
-       bch2_writepoint_stop(c, ca, &ca->copygc_write_point);
+       bch2_writepoint_stop(c, ca, &c->copygc_write_point);
        bch2_writepoint_stop(c, ca, &c->rebalance_write_point);
        bch2_writepoint_stop(c, ca, &c->btree_write_point);
 
@@ -1212,260 +1335,9 @@ void bch2_dev_allocator_add(struct bch_fs *c, struct bch_dev *ca)
                        set_bit(ca->dev_idx, c->rw_devs[i].d);
 }
 
-/* stop allocator thread: */
-void bch2_dev_allocator_stop(struct bch_dev *ca)
-{
-       struct task_struct *p;
-
-       p = rcu_dereference_protected(ca->alloc_thread, 1);
-       ca->alloc_thread = NULL;
-
-       /*
-        * We need an rcu barrier between setting ca->alloc_thread = NULL and
-        * the thread shutting down to avoid bch2_wake_allocator() racing:
-        *
-        * XXX: it would be better to have the rcu barrier be asynchronous
-        * instead of blocking us here
-        */
-       synchronize_rcu();
-
-       if (p) {
-               kthread_stop(p);
-               put_task_struct(p);
-       }
-}
-
-/* start allocator thread: */
-int bch2_dev_allocator_start(struct bch_dev *ca)
-{
-       struct task_struct *p;
-
-       /*
-        * allocator thread already started?
-        */
-       if (ca->alloc_thread)
-               return 0;
-
-       p = kthread_create(bch2_allocator_thread, ca,
-                          "bch_alloc[%s]", ca->name);
-       if (IS_ERR(p))
-               return PTR_ERR(p);
-
-       get_task_struct(p);
-       rcu_assign_pointer(ca->alloc_thread, p);
-       wake_up_process(p);
-       return 0;
-}
-
-static void flush_held_btree_writes(struct bch_fs *c)
-{
-       struct bucket_table *tbl;
-       struct rhash_head *pos;
-       struct btree *b;
-       bool flush_updates;
-       size_t i, nr_pending_updates;
-
-       clear_bit(BCH_FS_HOLD_BTREE_WRITES, &c->flags);
-again:
-       pr_debug("flushing dirty btree nodes");
-       cond_resched();
-
-       flush_updates = false;
-       nr_pending_updates = bch2_btree_interior_updates_nr_pending(c);
-
-       rcu_read_lock();
-       for_each_cached_btree(b, c, tbl, i, pos)
-               if (btree_node_dirty(b) && (!b->written || b->level)) {
-                       if (btree_node_may_write(b)) {
-                               rcu_read_unlock();
-                               btree_node_lock_type(c, b, SIX_LOCK_read);
-                               bch2_btree_node_write(c, b, SIX_LOCK_read);
-                               six_unlock_read(&b->lock);
-                               goto again;
-                       } else {
-                               flush_updates = true;
-                       }
-               }
-       rcu_read_unlock();
-
-       if (c->btree_roots_dirty)
-               bch2_journal_meta(&c->journal);
-
-       /*
-        * This is ugly, but it's needed to flush btree node writes
-        * without spinning...
-        */
-       if (flush_updates) {
-               closure_wait_event(&c->btree_interior_update_wait,
-                                  bch2_btree_interior_updates_nr_pending(c) <
-                                  nr_pending_updates);
-               goto again;
-       }
-
-}
-
-static void allocator_start_issue_discards(struct bch_fs *c)
-{
-       struct bch_dev *ca;
-       unsigned dev_iter;
-       size_t bu;
-
-       for_each_rw_member(ca, c, dev_iter)
-               while (fifo_pop(&ca->free_inc, bu))
-                       blkdev_issue_discard(ca->disk_sb.bdev,
-                                            bucket_to_sector(ca, bu),
-                                            ca->mi.bucket_size, GFP_NOIO, 0);
-}
-
-static int __bch2_fs_allocator_start(struct bch_fs *c)
-{
-       struct bch_dev *ca;
-       unsigned dev_iter;
-       u64 journal_seq = 0;
-       long bu;
-       bool invalidating_data = false;
-       int ret = 0;
-
-       if (test_alloc_startup(c)) {
-               invalidating_data = true;
-               goto not_enough;
-       }
-
-       /* Scan for buckets that are already invalidated: */
-       for_each_rw_member(ca, c, dev_iter) {
-               struct bucket_array *buckets;
-               struct bucket_mark m;
-
-               down_read(&ca->bucket_lock);
-               percpu_down_read_preempt_disable(&c->mark_lock);
-
-               buckets = bucket_array(ca);
-
-               for (bu = buckets->first_bucket;
-                    bu < buckets->nbuckets; bu++) {
-                       m = READ_ONCE(buckets->b[bu].mark);
-
-                       if (!buckets->b[bu].gen_valid ||
-                           !test_bit(bu, ca->buckets_nouse) ||
-                           !is_available_bucket(m) ||
-                           m.cached_sectors)
-                               continue;
-
-                       bch2_mark_alloc_bucket(c, ca, bu, true,
-                                       gc_pos_alloc(c, NULL), 0);
-
-                       fifo_push(&ca->free_inc, bu);
-
-                       discard_invalidated_buckets(c, ca);
-
-                       if (fifo_full(&ca->free[RESERVE_BTREE]))
-                               break;
-               }
-               percpu_up_read_preempt_enable(&c->mark_lock);
-               up_read(&ca->bucket_lock);
-       }
-
-       /* did we find enough buckets? */
-       for_each_rw_member(ca, c, dev_iter)
-               if (!fifo_full(&ca->free[RESERVE_BTREE])) {
-                       percpu_ref_put(&ca->io_ref);
-                       goto not_enough;
-               }
-
-       return 0;
-not_enough:
-       pr_debug("not enough empty buckets; scanning for reclaimable buckets");
-
-       for_each_rw_member(ca, c, dev_iter) {
-               find_reclaimable_buckets(c, ca);
-
-               while (!fifo_full(&ca->free[RESERVE_BTREE]) &&
-                      (bu = next_alloc_bucket(ca)) >= 0) {
-                       invalidating_data |=
-                               bch2_invalidate_one_bucket(c, ca, bu, &journal_seq);
-
-                       fifo_push(&ca->free[RESERVE_BTREE], bu);
-                       bucket_set_dirty(ca, bu);
-               }
-       }
-
-       pr_debug("done scanning for reclaimable buckets");
-
-       /*
-        * We're moving buckets to freelists _before_ they've been marked as
-        * invalidated on disk - we have to so that we can allocate new btree
-        * nodes to mark them as invalidated on disk.
-        *
-        * However, we can't _write_ to any of these buckets yet - they might
-        * have cached data in them, which is live until they're marked as
-        * invalidated on disk:
-        */
-       if (invalidating_data) {
-               pr_debug("invalidating existing data");
-               set_bit(BCH_FS_HOLD_BTREE_WRITES, &c->flags);
-       } else {
-               pr_debug("issuing discards");
-               allocator_start_issue_discards(c);
-       }
-
-       /*
-        * XXX: it's possible for this to deadlock waiting on journal reclaim,
-        * since we're holding btree writes. What then?
-        */
-       ret = bch2_alloc_write(c);
-       if (ret)
-               return ret;
-
-       if (invalidating_data) {
-               pr_debug("flushing journal");
-
-               ret = bch2_journal_flush_seq(&c->journal, journal_seq);
-               if (ret)
-                       return ret;
-
-               pr_debug("issuing discards");
-               allocator_start_issue_discards(c);
-       }
-
-       set_bit(BCH_FS_ALLOCATOR_STARTED, &c->flags);
-
-       /* now flush dirty btree nodes: */
-       if (invalidating_data)
-               flush_held_btree_writes(c);
-
-       return 0;
-}
-
-int bch2_fs_allocator_start(struct bch_fs *c)
-{
-       struct bch_dev *ca;
-       unsigned i;
-       int ret;
-
-       down_read(&c->gc_lock);
-       ret = __bch2_fs_allocator_start(c);
-       up_read(&c->gc_lock);
-
-       if (ret)
-               return ret;
-
-       for_each_rw_member(ca, c, i) {
-               ret = bch2_dev_allocator_start(ca);
-               if (ret) {
-                       percpu_ref_put(&ca->io_ref);
-                       return ret;
-               }
-       }
-
-       return bch2_alloc_write(c);
-}
-
 void bch2_fs_allocator_background_init(struct bch_fs *c)
 {
        spin_lock_init(&c->freelist_lock);
-       bch2_bucket_clock_init(c, READ);
-       bch2_bucket_clock_init(c, WRITE);
-
-       c->pd_controllers_update_seconds = 5;
-       INIT_DELAYED_WORK(&c->pd_controllers_update, pd_controllers_update);
+       INIT_WORK(&c->discard_work, bch2_do_discards_work);
+       INIT_WORK(&c->invalidate_work, bch2_do_invalidates_work);
 }