]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/btree_types.h
Update bcachefs sources to cfb41d25c7 bcachefs: Add an assertion to track down a...
[bcachefs-tools-debian] / libbcachefs / btree_types.h
index dce4ed385e8e3fc8ecef2b3a8c25d45d0124fca8..2a5b70c72a13af4105f9ba5701ef09d979c4144c 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_BTREE_TYPES_H
 #define _BCACHEFS_BTREE_TYPES_H
 
@@ -6,10 +7,12 @@
 #include <linux/six.h>
 
 #include "bkey_methods.h"
+#include "buckets_types.h"
 #include "journal_types.h"
 
 struct open_bucket;
 struct btree_update;
+struct btree_trans;
 
 #define MAX_BSETS              3U
 
@@ -91,7 +94,6 @@ struct btree {
        struct btree_nr_keys    nr;
        u16                     sib_u64s[2];
        u16                     whiteout_u64s;
-       u16                     uncompacted_whiteout_u64s;
        u8                      page_order;
        u8                      unpack_fn_len;
 
@@ -177,21 +179,21 @@ struct btree_node_iter {
 
 enum btree_iter_type {
        BTREE_ITER_KEYS,
-       BTREE_ITER_SLOTS,
        BTREE_ITER_NODES,
 };
 
 #define BTREE_ITER_TYPE                        ((1 << 2) - 1)
 
-#define BTREE_ITER_INTENT              (1 << 2)
-#define BTREE_ITER_PREFETCH            (1 << 3)
+#define BTREE_ITER_SLOTS               (1 << 2)
+#define BTREE_ITER_INTENT              (1 << 3)
+#define BTREE_ITER_PREFETCH            (1 << 4)
+#define BTREE_ITER_KEEP_UNTIL_COMMIT   (1 << 5)
 /*
  * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for
  * @pos or the first key strictly greater than @pos
  */
-#define BTREE_ITER_IS_EXTENTS          (1 << 4)
-#define BTREE_ITER_ERROR               (1 << 5)
-#define BTREE_ITER_NOUNLOCK            (1 << 6)
+#define BTREE_ITER_IS_EXTENTS          (1 << 6)
+#define BTREE_ITER_ERROR               (1 << 7)
 
 enum btree_iter_uptodate {
        BTREE_ITER_UPTODATE             = 0,
@@ -208,7 +210,9 @@ enum btree_iter_uptodate {
  * @nodes_intent_locked        - bitmask indicating which locks are intent locks
  */
 struct btree_iter {
-       struct bch_fs           *c;
+       u8                      idx;
+
+       struct btree_trans      *trans;
        struct bpos             pos;
 
        u8                      flags;
@@ -230,63 +234,56 @@ struct btree_iter {
         * bch2_btree_iter_next_slot() can correctly advance pos.
         */
        struct bkey             k;
-
-       /*
-        * Circular linked list of linked iterators: linked iterators share
-        * locks (e.g. two linked iterators may have the same node intent
-        * locked, or read and write locked, at the same time), and insertions
-        * through one iterator won't invalidate the other linked iterators.
-        */
-
-       /* Must come last: */
-       struct btree_iter       *next;
 };
 
-#define BTREE_ITER_MAX         8
-
-struct deferred_update {
-       struct journal_entry_pin journal;
-
-       spinlock_t              lock;
-       unsigned                gen;
-
-       u8                      allocated_u64s;
-       enum btree_id           btree_id;
-
-       /* must be last: */
-       struct bkey_i           k;
-};
+static inline enum btree_iter_type btree_iter_type(struct btree_iter *iter)
+{
+       return iter->flags & BTREE_ITER_TYPE;
+}
 
 struct btree_insert_entry {
        struct bkey_i           *k;
-
-       union {
        struct btree_iter       *iter;
-       struct deferred_update  *d;
-       };
-
-       bool                    deferred;
 };
 
+#define BTREE_ITER_MAX         64
+
 struct btree_trans {
        struct bch_fs           *c;
-       size_t                  nr_restarts;
+       unsigned long           ip;
+
+       u64                     iters_linked;
+       u64                     iters_live;
+       u64                     iters_touched;
 
        u8                      nr_iters;
-       u8                      iters_live;
-       u8                      iters_linked;
        u8                      nr_updates;
+       u8                      size;
+       unsigned                used_mempool:1;
+       unsigned                error:1;
+       unsigned                nounlock:1;
 
        unsigned                mem_top;
        unsigned                mem_bytes;
        void                    *mem;
 
        struct btree_iter       *iters;
-       u64                     iter_ids[BTREE_ITER_MAX];
-
-       struct btree_insert_entry updates[BTREE_ITER_MAX];
+       struct btree_insert_entry *updates;
+       u8                      *updates_sorted;
+
+       /* update path: */
+       struct journal_res      journal_res;
+       struct journal_preres   journal_preres;
+       u64                     *journal_seq;
+       struct disk_reservation *disk_res;
+       unsigned                flags;
+       unsigned                journal_u64s;
+       unsigned                journal_preres_u64s;
+       struct replicas_delta_list *fs_usage_deltas;
 
        struct btree_iter       iters_onstack[2];
+       struct btree_insert_entry updates_onstack[6];
+       u8                      updates_sorted_onstack[6];
 };
 
 #define BTREE_FLAG(flag)                                               \
@@ -418,6 +415,17 @@ static inline unsigned btree_bkey_first_offset(const struct bset_tree *t)
        __btree_node_offset_to_key(_b, (_t)->end_offset);               \
 })
 
+static inline unsigned bset_u64s(struct bset_tree *t)
+{
+       return t->end_offset - t->data_offset -
+               sizeof(struct bset) / sizeof(u64);
+}
+
+static inline unsigned bset_dead_u64s(struct btree *b, struct bset_tree *t)
+{
+       return bset_u64s(t) - b->nr.bset_u64s[t - b->set];
+}
+
 static inline unsigned bset_byte_offset(struct btree *b, void *i)
 {
        return i - (void *) b->data;
@@ -444,7 +452,13 @@ static inline enum btree_node_type btree_node_type(struct btree *b)
 
 static inline bool btree_node_type_is_extents(enum btree_node_type type)
 {
-       return type == BKEY_TYPE_EXTENTS;
+       switch (type) {
+       case BKEY_TYPE_EXTENTS:
+       case BKEY_TYPE_REFLINK:
+               return true;
+       default:
+               return false;
+       }
 }
 
 static inline bool btree_node_is_extents(struct btree *b)
@@ -452,17 +466,22 @@ static inline bool btree_node_is_extents(struct btree *b)
        return btree_node_type_is_extents(btree_node_type(b));
 }
 
+#define BTREE_NODE_TYPE_HAS_TRIGGERS                   \
+       ((1U << BKEY_TYPE_EXTENTS)|                     \
+        (1U << BKEY_TYPE_ALLOC)|                       \
+        (1U << BKEY_TYPE_INODES)|                      \
+        (1U << BKEY_TYPE_REFLINK)|                     \
+        (1U << BKEY_TYPE_EC)|                          \
+        (1U << BKEY_TYPE_BTREE))
+
+#define BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS             \
+       ((1U << BKEY_TYPE_EXTENTS)|                     \
+        (1U << BKEY_TYPE_INODES)|                      \
+        (1U << BKEY_TYPE_REFLINK))
+
 static inline bool btree_node_type_needs_gc(enum btree_node_type type)
 {
-       switch (type) {
-       case BKEY_TYPE_BTREE:
-       case BKEY_TYPE_EXTENTS:
-       case BKEY_TYPE_INODES:
-       case BKEY_TYPE_EC:
-               return true;
-       default:
-               return false;
-       }
+       return BTREE_NODE_TYPE_HAS_TRIGGERS & (1U << type);
 }
 
 struct btree_root {
@@ -474,6 +493,7 @@ struct btree_root {
        __BKEY_PADDED(key, BKEY_BTREE_PTR_VAL_U64s_MAX);
        u8                      level;
        u8                      alive;
+       s8                      error;
 };
 
 /*
@@ -483,13 +503,11 @@ struct btree_root {
 
 enum btree_insert_ret {
        BTREE_INSERT_OK,
-       /* extent spanned multiple leaf nodes: have to traverse to next node: */
-       BTREE_INSERT_NEED_TRAVERSE,
        /* leaf node needs to be split */
        BTREE_INSERT_BTREE_NODE_FULL,
        BTREE_INSERT_ENOSPC,
-       BTREE_INSERT_NEED_GC_LOCK,
        BTREE_INSERT_NEED_MARK_REPLICAS,
+       BTREE_INSERT_NEED_JOURNAL_RES,
 };
 
 enum btree_gc_coalesce_fail_reason {