Update bcachefs sources to ee560a3929 bcachefs: Print version, options earlier in...

[bcachefs-tools-debian] / libbcachefs / alloc_types.h

diff --git a/libbcachefs/alloc_types.h b/libbcachefs/alloc_types.h
index 330267346c639fda85f8fa8ea1f0c2e07f35217f..c33a29954e59a4f25f374f11a1003bed9c7dacfb 100644 (file)
--- a/libbcachefs/alloc_types.h
+++ b/libbcachefs/alloc_types.h
@@ -9,7 +9,6 @@
 #include "fifo.h"
 
 struct bucket_alloc_state {
-       u64     cur_bucket;
        u64     buckets_seen;
        u64     skipped_open;
        u64     skipped_need_journal_commit;
@@ -17,20 +16,24 @@ struct bucket_alloc_state {
        u64     skipped_nouse;
 };
 
-struct ec_bucket_buf;
-
-#define BCH_ALLOC_RESERVES()           \
-       x(btree_movinggc)               \
+#define BCH_WATERMARKS()               \
+       x(stripe)                       \
+       x(normal)                       \
+       x(copygc)                       \
        x(btree)                        \
-       x(movinggc)                     \
-       x(none)
+       x(btree_copygc)                 \
+       x(reclaim)
 
-enum alloc_reserve {
-#define x(name)        RESERVE_##name,
-       BCH_ALLOC_RESERVES()
+enum bch_watermark {
+#define x(name)        BCH_WATERMARK_##name,
+       BCH_WATERMARKS()
 #undef x
+       BCH_WATERMARK_NR,
 };
 
+#define BCH_WATERMARK_BITS     3
+#define BCH_WATERMARK_MASK     ~(~0 << BCH_WATERMARK_BITS)
+
 #define OPEN_BUCKETS_COUNT     1024
 
 #define WRITE_POINT_HASH_NR    32
@@ -52,10 +55,9 @@ struct open_bucket {
         * the block in the stripe this open_bucket corresponds to:
         */
        u8                      ec_idx;
-       enum bch_data_type      data_type:8;
+       enum bch_data_type      data_type:6;
        unsigned                valid:1;
        unsigned                on_partial_list:1;
-       unsigned                alloc_reserve:3;
 
        u8                      dev;
        u8                      gen;
@@ -75,6 +77,19 @@ struct dev_stripe_state {
        u64                     next_alloc[BCH_SB_MEMBERS_MAX];
 };
 
+#define WRITE_POINT_STATES()           \
+       x(stopped)                      \
+       x(waiting_io)                   \
+       x(waiting_work)                 \
+       x(running)
+
+enum write_point_state {
+#define x(n)   WRITE_POINT_##n,
+       WRITE_POINT_STATES()
+#undef x
+       WRITE_POINT_STATE_NR
+};
+
 struct write_point {
        struct {
                struct hlist_node       node;
@@ -88,6 +103,8 @@ struct write_point {
 
                struct open_buckets     ptrs;
                struct dev_stripe_state stripe;
+
+               u64                     sectors_allocated;
        } __attribute__((__aligned__(SMP_CACHE_BYTES)));
 
        struct {
@@ -95,6 +112,10 @@ struct write_point {
 
                struct list_head        writes;
                spinlock_t              writes_lock;
+
+               enum write_point_state  state;
+               u64                     last_state_change;
+               u64                     time[WRITE_POINT_STATE_NR];
        } __attribute__((__aligned__(SMP_CACHE_BYTES)));
 };