Update bcachefs sources to 4837f82ee1 bcachefs: Use cached iterators for alloc btree

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

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index 20757d0c3e536d9b9b8cf1e6a3c39bc9d6d555a4..ba47f51263f9686aa73da6d1025111bc4783d27a 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -53,7 +53,6 @@ struct bset_tree {
 
 struct btree_write {
        struct journal_entry_pin        journal;
-       struct closure_waitlist         wait;
 };
 
 struct btree_alloc {
@@ -61,17 +60,20 @@ struct btree_alloc {
        BKEY_PADDED(k);
 };
 
+struct btree_bkey_cached_common {
+       struct six_lock         lock;
+       u8                      level;
+       u8                      btree_id;
+};
+
 struct btree {
-       /* Hottest entries first */
+       struct btree_bkey_cached_common c;
+
        struct rhash_head       hash;
        u64                     hash_val;
 
-       struct six_lock         lock;
-
        unsigned long           flags;
        u16                     written;
-       u8                      level;
-       u8                      btree_id;
        u8                      nsets;
        u8                      nr_key_bits;
 
@@ -181,6 +183,7 @@ struct btree_node_iter {
 enum btree_iter_type {
        BTREE_ITER_KEYS,
        BTREE_ITER_NODES,
+       BTREE_ITER_CACHED,
 };
 
 #define BTREE_ITER_TYPE                        ((1 << 2) - 1)
@@ -212,6 +215,15 @@ enum btree_iter_type {
 #define BTREE_ITER_IS_EXTENTS          (1 << 6)
 #define BTREE_ITER_ERROR               (1 << 7)
 #define BTREE_ITER_SET_POS_AFTER_COMMIT        (1 << 8)
+#define BTREE_ITER_CACHED_NOFILL       (1 << 9)
+#define BTREE_ITER_CACHED_NOCREATE     (1 << 10)
+
+#define BTREE_ITER_USER_FLAGS                          \
+       (BTREE_ITER_SLOTS                               \
+       |BTREE_ITER_INTENT                              \
+       |BTREE_ITER_PREFETCH                            \
+       |BTREE_ITER_CACHED_NOFILL                       \
+       |BTREE_ITER_CACHED_NOCREATE)
 
 enum btree_iter_uptodate {
        BTREE_ITER_UPTODATE             = 0,
@@ -220,6 +232,14 @@ enum btree_iter_uptodate {
        BTREE_ITER_NEED_TRAVERSE        = 3,
 };
 
+#define BTREE_ITER_NO_NODE_GET_LOCKS   ((struct btree *) 1)
+#define BTREE_ITER_NO_NODE_DROP                ((struct btree *) 2)
+#define BTREE_ITER_NO_NODE_LOCK_ROOT   ((struct btree *) 3)
+#define BTREE_ITER_NO_NODE_UP          ((struct btree *) 4)
+#define BTREE_ITER_NO_NODE_DOWN                ((struct btree *) 5)
+#define BTREE_ITER_NO_NODE_INIT                ((struct btree *) 6)
+#define BTREE_ITER_NO_NODE_ERROR       ((struct btree *) 7)
+
 /*
  * @pos                        - iterator's current position
  * @level              - current btree depth
@@ -235,9 +255,10 @@ struct btree_iter {
        u16                     flags;
        u8                      idx;
 
-       enum btree_iter_uptodate uptodate:4;
        enum btree_id           btree_id:4;
+       enum btree_iter_uptodate uptodate:4;
        unsigned                level:4,
+                               min_depth:4,
                                locks_want:4,
                                nodes_locked:4,
                                nodes_intent_locked:4;
@@ -253,13 +274,51 @@ struct btree_iter {
         * bch2_btree_iter_next_slot() can correctly advance pos.
         */
        struct bkey             k;
+       unsigned long           ip_allocated;
 };
 
-static inline enum btree_iter_type btree_iter_type(struct btree_iter *iter)
+static inline enum btree_iter_type
+btree_iter_type(const struct btree_iter *iter)
 {
        return iter->flags & BTREE_ITER_TYPE;
 }
 
+static inline struct btree_iter_level *iter_l(struct btree_iter *iter)
+{
+       return iter->l + iter->level;
+}
+
+struct btree_key_cache {
+       struct mutex            lock;
+       struct rhashtable       table;
+       struct list_head        freed;
+       struct list_head        clean;
+};
+
+struct bkey_cached_key {
+       u32                     btree_id;
+       struct bpos             pos;
+} __packed;
+
+#define BKEY_CACHED_DIRTY              0
+
+struct bkey_cached {
+       struct btree_bkey_cached_common c;
+
+       unsigned long           flags;
+       u8                      u64s;
+       bool                    valid;
+       struct bkey_cached_key  key;
+
+       struct rhash_head       hash;
+       struct list_head        list;
+
+       struct journal_preres   res;
+       struct journal_entry_pin journal;
+
+       struct bkey_i           *k;
+};
+
 struct btree_insert_entry {
        unsigned                trigger_flags;
        unsigned                trans_triggers_run:1;
@@ -267,10 +326,23 @@ struct btree_insert_entry {
        struct btree_iter       *iter;
 };
 
+#ifndef CONFIG_LOCKDEP
 #define BTREE_ITER_MAX         64
+#else
+#define BTREE_ITER_MAX         32
+#endif
 
 struct btree_trans {
        struct bch_fs           *c;
+#ifdef CONFIG_BCACHEFS_DEBUG
+       struct list_head        list;
+       struct btree            *locking;
+       unsigned                locking_iter_idx;
+       struct bpos             locking_pos;
+       u8                      locking_btree_id;
+       u8                      locking_level;
+       pid_t                   pid;
+#endif
        unsigned long           ip;
 
        u64                     iters_linked;
@@ -279,11 +351,13 @@ struct btree_trans {
 
        u8                      nr_iters;
        u8                      nr_updates;
+       u8                      nr_updates2;
        u8                      size;
        unsigned                used_mempool:1;
        unsigned                error:1;
        unsigned                nounlock:1;
        unsigned                need_reset:1;
+       unsigned                in_traverse_all:1;
 
        unsigned                mem_top;
        unsigned                mem_bytes;
@@ -291,8 +365,13 @@ struct btree_trans {
 
        struct btree_iter       *iters;
        struct btree_insert_entry *updates;
+       struct btree_insert_entry *updates2;
 
        /* update path: */
+       struct jset_entry       *extra_journal_entries;
+       unsigned                extra_journal_entry_u64s;
+       struct journal_entry_pin *journal_pin;
+
        struct journal_res      journal_res;
        struct journal_preres   journal_preres;
        u64                     *journal_seq;
@@ -304,6 +383,7 @@ struct btree_trans {
 
        struct btree_iter       iters_onstack[2];
        struct btree_insert_entry updates_onstack[2];
+       struct btree_insert_entry updates2_onstack[2];
 };
 
 #define BTREE_FLAG(flag)                                               \
@@ -469,7 +549,7 @@ static inline enum btree_node_type __btree_node_type(unsigned level, enum btree_
 /* Type of keys @b contains: */
 static inline enum btree_node_type btree_node_type(struct btree *b)
 {
-       return __btree_node_type(b->level, b->btree_id);
+       return __btree_node_type(b->c.level, b->c.btree_id);
 }
 
 static inline bool btree_node_type_is_extents(enum btree_node_type type)
@@ -535,8 +615,6 @@ static inline bool btree_node_type_needs_gc(enum btree_node_type type)
 struct btree_root {
        struct btree            *b;
 
-       struct btree_update     *as;
-
        /* On disk root - see async splits: */
        __BKEY_PADDED(key, BKEY_BTREE_PTR_VAL_U64s_MAX);
        u8                      level;