Update bcachefs sources to 070ec8d07b bcachefs: Snapshot depth, skiplist fields

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

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index 13a930251ab3d767ea9f9536e0b8daf1d3e22dc1..4efc69492612edac9e82d867fdc2900ba0bc6e68 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -9,7 +9,9 @@
 //#include "bkey_methods.h"
 #include "buckets_types.h"
 #include "darray.h"
+#include "errcode.h"
 #include "journal_types.h"
+#include "replicas_types.h"
 
 struct open_bucket;
 struct btree_update;
@@ -192,31 +194,34 @@ struct btree_node_iter {
 /*
  * Iterate over all possible positions, synthesizing deleted keys for holes:
  */
-#define BTREE_ITER_SLOTS               (1 << 0)
-#define BTREE_ITER_ALL_LEVELS          (1 << 1)
+static const u16 BTREE_ITER_SLOTS              = 1 << 0;
+static const u16 BTREE_ITER_ALL_LEVELS         = 1 << 1;
 /*
  * Indicates that intent locks should be taken on leaf nodes, because we expect
  * to be doing updates:
  */
-#define BTREE_ITER_INTENT              (1 << 2)
+static const u16 BTREE_ITER_INTENT             = 1 << 2;
 /*
  * Causes the btree iterator code to prefetch additional btree nodes from disk:
  */
-#define BTREE_ITER_PREFETCH            (1 << 3)
+static const 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
  */
-#define BTREE_ITER_IS_EXTENTS          (1 << 4)
-#define BTREE_ITER_NOT_EXTENTS         (1 << 5)
-#define BTREE_ITER_CACHED              (1 << 6)
-#define BTREE_ITER_WITH_KEY_CACHE      (1 << 7)
-#define BTREE_ITER_WITH_UPDATES                (1 << 8)
-#define BTREE_ITER_WITH_JOURNAL                (1 << 9)
-#define __BTREE_ITER_ALL_SNAPSHOTS     (1 << 10)
-#define BTREE_ITER_ALL_SNAPSHOTS       (1 << 11)
-#define BTREE_ITER_FILTER_SNAPSHOTS    (1 << 12)
-#define BTREE_ITER_NOPRESERVE          (1 << 13)
+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
 
 enum btree_path_uptodate {
        BTREE_ITER_UPTODATE             = 0,
@@ -224,6 +229,10 @@ enum btree_path_uptodate {
        BTREE_ITER_NEED_TRAVERSE        = 2,
 };
 
+#if defined(CONFIG_BCACHEFS_LOCK_TIME_STATS) || defined(CONFIG_BCACHEFS_DEBUG)
+#define TRACK_PATH_ALLOCATED
+#endif
+
 struct btree_path {
        u8                      idx;
        u8                      sorted_idx;
@@ -254,7 +263,7 @@ struct btree_path {
                u64             lock_taken_time;
 #endif
        }                       l[BTREE_MAX_DEPTH];
-#ifdef CONFIG_BCACHEFS_DEBUG
+#ifdef TRACK_PATH_ALLOCATED
        unsigned long           ip_allocated;
 #endif
 };
@@ -264,6 +273,15 @@ static inline struct btree_path_level *path_l(struct btree_path *path)
        return path->l + path->level;
 }
 
+static inline unsigned long btree_path_ip_allocated(struct btree_path *path)
+{
+#ifdef TRACK_PATH_ALLOCATED
+       return path->ip_allocated;
+#else
+       return _THIS_IP_;
+#endif
+}
+
 /*
  * @pos                        - iterator's current position
  * @level              - current btree depth
@@ -297,7 +315,7 @@ struct btree_iter {
        /* BTREE_ITER_WITH_JOURNAL: */
        size_t                  journal_idx;
        struct bpos             journal_pos;
-#ifdef CONFIG_BCACHEFS_DEBUG
+#ifdef TRACK_PATH_ALLOCATED
        unsigned long           ip_allocated;
 #endif
 };
@@ -344,6 +362,7 @@ struct bkey_cached {
 
        struct journal_preres   res;
        struct journal_entry_pin journal;
+       u64                     seq;
 
        struct bkey_i           *k;
 };
@@ -377,11 +396,7 @@ struct btree_insert_entry {
        unsigned long           ip_allocated;
 };
 
-#ifndef CONFIG_LOCKDEP
 #define BTREE_ITER_MAX         64
-#else
-#define BTREE_ITER_MAX         32
-#endif
 
 struct btree_trans_commit_hook;
 typedef int (btree_trans_commit_hook_fn)(struct btree_trans *, struct btree_trans_commit_hook *);
@@ -412,15 +427,21 @@ struct btree_trans {
        u8                      fn_idx;
        u8                      nr_sorted;
        u8                      nr_updates;
-       u8                      traverse_all_idx;
+       u8                      nr_wb_updates;
+       u8                      wb_updates_size;
        bool                    used_mempool:1;
        bool                    in_traverse_all:1;
+       bool                    paths_sorted:1;
        bool                    memory_allocation_failure:1;
-       bool                    is_initial_gc:1;
+       bool                    journal_transaction_names:1;
        bool                    journal_replay_not_finished:1;
+       bool                    is_initial_gc:1;
+       bool                    notrace_relock_fail:1;
        enum bch_errcode        restarted:16;
        u32                     restart_count;
+       unsigned long           last_begin_ip;
        unsigned long           last_restarted_ip;
+       unsigned long           srcu_lock_time;
 
        /*
         * For when bch2_trans_update notices we'll be splitting a compressed
@@ -436,20 +457,20 @@ struct btree_trans {
        unsigned                mem_bytes;
        void                    *mem;
 
-       u8                      sorted[BTREE_ITER_MAX];
+       u8                      sorted[BTREE_ITER_MAX + 8];
        struct btree_path       *paths;
        struct btree_insert_entry *updates;
+       struct btree_write_buffered_key *wb_updates;
 
        /* update path: */
        struct btree_trans_commit_hook *hooks;
-       DARRAY(u64)             extra_journal_entries;
+       darray_u64              extra_journal_entries;
        struct journal_entry_pin *journal_pin;
 
        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;
@@ -667,6 +688,11 @@ static inline bool btree_node_type_is_extents(enum btree_node_type type)
        return (1U << type) & BTREE_ID_IS_EXTENTS;
 }
 
+static inline bool btree_id_is_extents(enum btree_id btree)
+{
+       return btree_node_type_is_extents((enum btree_node_type) btree);
+}
+
 #define BTREE_ID_HAS_SNAPSHOTS                         \
        ((1U << BTREE_ID_extents)|                      \
         (1U << BTREE_ID_inodes)|                       \