]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/btree_types.h
btree_write_buffer: ensure atomic64_sub_return_release availability
[bcachefs-tools-debian] / libbcachefs / btree_types.h
index 4efc69492612edac9e82d867fdc2900ba0bc6e68..4b9cc61a4a6098f122c4d04a7657699ec20959dd 100644 (file)
@@ -4,7 +4,6 @@
 
 #include <linux/list.h>
 #include <linux/rhashtable.h>
-#include <linux/six.h>
 
 //#include "bkey_methods.h"
 #include "buckets_types.h"
@@ -12,6 +11,7 @@
 #include "errcode.h"
 #include "journal_types.h"
 #include "replicas_types.h"
+#include "six.h"
 
 struct open_bucket;
 struct btree_update;
@@ -194,34 +194,34 @@ struct btree_node_iter {
 /*
  * Iterate over all possible positions, synthesizing deleted keys for holes:
  */
-static const u16 BTREE_ITER_SLOTS              = 1 << 0;
-static const u16 BTREE_ITER_ALL_LEVELS         = 1 << 1;
+static const __maybe_unused u16 BTREE_ITER_SLOTS               = 1 << 0;
+static const __maybe_unused u16 BTREE_ITER_ALL_LEVELS          = 1 << 1;
 /*
  * Indicates that intent locks should be taken on leaf nodes, because we expect
  * to be doing updates:
  */
-static const u16 BTREE_ITER_INTENT             = 1 << 2;
+static const __maybe_unused u16 BTREE_ITER_INTENT              = 1 << 2;
 /*
  * Causes the btree iterator code to prefetch additional btree nodes from disk:
  */
-static const u16 BTREE_ITER_PREFETCH           = 1 << 3;
+static const __maybe_unused u16 BTREE_ITER_PREFETCH            = 1 << 3;
 /*
  * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for
  * @pos or the first key strictly greater than @pos
  */
-static const u16 BTREE_ITER_IS_EXTENTS         = 1 << 4;
-static const u16 BTREE_ITER_NOT_EXTENTS                = 1 << 5;
-static const u16 BTREE_ITER_CACHED             = 1 << 6;
-static const u16 BTREE_ITER_WITH_KEY_CACHE     = 1 << 7;
-static const u16 BTREE_ITER_WITH_UPDATES       = 1 << 8;
-static const u16 BTREE_ITER_WITH_JOURNAL       = 1 << 9;
-static const u16 __BTREE_ITER_ALL_SNAPSHOTS    = 1 << 10;
-static const u16 BTREE_ITER_ALL_SNAPSHOTS      = 1 << 11;
-static const u16 BTREE_ITER_FILTER_SNAPSHOTS   = 1 << 12;
-static const u16 BTREE_ITER_NOPRESERVE         = 1 << 13;
-static const u16 BTREE_ITER_CACHED_NOFILL      = 1 << 14;
-static const u16 BTREE_ITER_KEY_CACHE_FILL     = 1 << 15;
-#define __BTREE_ITER_FLAGS_END                        16
+static const __maybe_unused u16 BTREE_ITER_IS_EXTENTS          = 1 << 4;
+static const __maybe_unused u16 BTREE_ITER_NOT_EXTENTS         = 1 << 5;
+static const __maybe_unused u16 BTREE_ITER_CACHED              = 1 << 6;
+static const __maybe_unused u16 BTREE_ITER_WITH_KEY_CACHE      = 1 << 7;
+static const __maybe_unused u16 BTREE_ITER_WITH_UPDATES                = 1 << 8;
+static const __maybe_unused u16 BTREE_ITER_WITH_JOURNAL                = 1 << 9;
+static const __maybe_unused u16 __BTREE_ITER_ALL_SNAPSHOTS     = 1 << 10;
+static const __maybe_unused u16 BTREE_ITER_ALL_SNAPSHOTS       = 1 << 11;
+static const __maybe_unused u16 BTREE_ITER_FILTER_SNAPSHOTS    = 1 << 12;
+static const __maybe_unused u16 BTREE_ITER_NOPRESERVE          = 1 << 13;
+static const __maybe_unused u16 BTREE_ITER_CACHED_NOFILL       = 1 << 14;
+static const __maybe_unused u16 BTREE_ITER_KEY_CACHE_FILL      = 1 << 15;
+#define __BTREE_ITER_FLAGS_END                                        16
 
 enum btree_path_uptodate {
        BTREE_ITER_UPTODATE             = 0,
@@ -238,6 +238,8 @@ struct btree_path {
        u8                      sorted_idx;
        u8                      ref;
        u8                      intent_ref;
+       u32                     alloc_seq;
+       u32                     downgrade_seq;
 
        /* btree_iter_copy starts here: */
        struct bpos             pos;
@@ -390,6 +392,7 @@ struct btree_insert_entry {
        u8                      old_btree_u64s;
        struct bkey_i           *k;
        struct btree_path       *path;
+       u64                     seq;
        /* key being overwritten: */
        struct bkey             old_k;
        const struct bch_val    *old_v;
@@ -429,6 +432,7 @@ struct btree_trans {
        u8                      nr_updates;
        u8                      nr_wb_updates;
        u8                      wb_updates_size;
+       bool                    srcu_held:1;
        bool                    used_mempool:1;
        bool                    in_traverse_all:1;
        bool                    paths_sorted:1;
@@ -458,8 +462,8 @@ struct btree_trans {
        void                    *mem;
 
        u8                      sorted[BTREE_ITER_MAX + 8];
-       struct btree_path       *paths;
-       struct btree_insert_entry *updates;
+       struct btree_path       paths[BTREE_ITER_MAX];
+       struct btree_insert_entry updates[BTREE_ITER_MAX];
        struct btree_write_buffered_key *wb_updates;
 
        /* update path: */
@@ -642,16 +646,17 @@ static inline unsigned bset_byte_offset(struct btree *b, void *i)
 }
 
 enum btree_node_type {
-#define x(kwd, val) BKEY_TYPE_##kwd = val,
+       BKEY_TYPE_btree,
+#define x(kwd, val, ...) BKEY_TYPE_##kwd = val + 1,
        BCH_BTREE_IDS()
 #undef x
-       BKEY_TYPE_btree,
+       BKEY_TYPE_NR
 };
 
 /* Type of a key in btree @id at level @level: */
 static inline enum btree_node_type __btree_node_type(unsigned level, enum btree_id id)
 {
-       return level ? BKEY_TYPE_btree : (enum btree_node_type) id;
+       return level ? BKEY_TYPE_btree : (unsigned) id + 1;
 }
 
 /* Type of keys @b contains: */
@@ -660,62 +665,67 @@ static inline enum btree_node_type btree_node_type(struct btree *b)
        return __btree_node_type(b->c.level, b->c.btree_id);
 }
 
+const char *bch2_btree_node_type_str(enum btree_node_type);
+
 #define BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS             \
-       ((1U << BKEY_TYPE_extents)|                     \
-        (1U << BKEY_TYPE_alloc)|                       \
-        (1U << BKEY_TYPE_inodes)|                      \
-        (1U << BKEY_TYPE_stripes)|                     \
-        (1U << BKEY_TYPE_reflink)|                     \
-        (1U << BKEY_TYPE_btree))
+       (BIT_ULL(BKEY_TYPE_extents)|                    \
+        BIT_ULL(BKEY_TYPE_alloc)|                      \
+        BIT_ULL(BKEY_TYPE_inodes)|                     \
+        BIT_ULL(BKEY_TYPE_stripes)|                    \
+        BIT_ULL(BKEY_TYPE_reflink)|                    \
+        BIT_ULL(BKEY_TYPE_btree))
 
 #define BTREE_NODE_TYPE_HAS_MEM_TRIGGERS               \
-       ((1U << BKEY_TYPE_alloc)|                       \
-        (1U << BKEY_TYPE_inodes)|                      \
-        (1U << BKEY_TYPE_stripes)|                     \
-        (1U << BKEY_TYPE_snapshots))
+       (BIT_ULL(BKEY_TYPE_alloc)|                      \
+        BIT_ULL(BKEY_TYPE_inodes)|                     \
+        BIT_ULL(BKEY_TYPE_stripes)|                    \
+        BIT_ULL(BKEY_TYPE_snapshots))
 
 #define BTREE_NODE_TYPE_HAS_TRIGGERS                   \
        (BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS|            \
         BTREE_NODE_TYPE_HAS_MEM_TRIGGERS)
 
-#define BTREE_ID_IS_EXTENTS                            \
-       ((1U << BTREE_ID_extents)|                      \
-        (1U << BTREE_ID_reflink)|                      \
-        (1U << BTREE_ID_freespace))
+static inline bool btree_node_type_needs_gc(enum btree_node_type type)
+{
+       return BTREE_NODE_TYPE_HAS_TRIGGERS & BIT_ULL(type);
+}
 
 static inline bool btree_node_type_is_extents(enum btree_node_type type)
 {
-       return (1U << type) & BTREE_ID_IS_EXTENTS;
+       const unsigned mask = 0
+#define x(name, nr, flags, ...)        |((!!((flags) & BTREE_ID_EXTENTS)) << (nr + 1))
+       BCH_BTREE_IDS()
+#undef x
+       ;
+
+       return (1U << type) & mask;
 }
 
 static inline bool btree_id_is_extents(enum btree_id btree)
 {
-       return btree_node_type_is_extents((enum btree_node_type) btree);
+       return btree_node_type_is_extents(__btree_node_type(0, btree));
 }
 
-#define BTREE_ID_HAS_SNAPSHOTS                         \
-       ((1U << BTREE_ID_extents)|                      \
-        (1U << BTREE_ID_inodes)|                       \
-        (1U << BTREE_ID_dirents)|                      \
-        (1U << BTREE_ID_xattrs))
-
-#define BTREE_ID_HAS_PTRS                              \
-       ((1U << BTREE_ID_extents)|                      \
-        (1U << BTREE_ID_reflink))
-
 static inline bool btree_type_has_snapshots(enum btree_id id)
 {
-       return (1 << id) & BTREE_ID_HAS_SNAPSHOTS;
+       const unsigned mask = 0
+#define x(name, nr, flags, ...)        |((!!((flags) & BTREE_ID_SNAPSHOTS)) << nr)
+       BCH_BTREE_IDS()
+#undef x
+       ;
+
+       return (1U << id) & mask;
 }
 
 static inline bool btree_type_has_ptrs(enum btree_id id)
 {
-       return (1 << id) & BTREE_ID_HAS_PTRS;
-}
+       const unsigned mask = 0
+#define x(name, nr, flags, ...)        |((!!((flags) & BTREE_ID_DATA)) << nr)
+       BCH_BTREE_IDS()
+#undef x
+       ;
 
-static inline bool btree_node_type_needs_gc(enum btree_node_type type)
-{
-       return BTREE_NODE_TYPE_HAS_TRIGGERS & (1U << type);
+       return (1U << id) & mask;
 }
 
 struct btree_root {