Update bcachefs sources to 24c6361e20 bcachefs: Fix a trans path overflow in bch2_btr...

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

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index 5382f2b85e194aeab13e361f45061c4cc95e40da..af226eed818bc5d0b2072ae95fa70f824ce0d81c 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -63,6 +63,7 @@ struct btree_bkey_cached_common {
        struct six_lock         lock;
        u8                      level;
        u8                      btree_id;
+       bool                    cached;
 };
 
 struct btree {
@@ -199,15 +200,13 @@ struct btree_node_iter {
 #define BTREE_ITER_IS_EXTENTS          (1 << 4)
 #define BTREE_ITER_NOT_EXTENTS         (1 << 5)
 #define BTREE_ITER_CACHED              (1 << 6)
-#define BTREE_ITER_CACHED_NOFILL       (1 << 7)
-#define BTREE_ITER_CACHED_NOCREATE     (1 << 8)
-#define BTREE_ITER_WITH_KEY_CACHE      (1 << 9)
-#define BTREE_ITER_WITH_UPDATES                (1 << 10)
-#define BTREE_ITER_WITH_JOURNAL                (1 << 11)
-#define __BTREE_ITER_ALL_SNAPSHOTS     (1 << 12)
-#define BTREE_ITER_ALL_SNAPSHOTS       (1 << 13)
-#define BTREE_ITER_FILTER_SNAPSHOTS    (1 << 14)
-#define BTREE_ITER_NOPRESERVE          (1 << 15)
+#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)
 
 enum btree_path_uptodate {
        BTREE_ITER_UPTODATE             = 0,
@@ -215,15 +214,6 @@ enum btree_path_uptodate {
        BTREE_ITER_NEED_TRAVERSE        = 2,
 };
 
-#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)
-#define BTREE_ITER_NO_NODE_CACHED      ((struct btree *) 8)
-
 struct btree_path {
        u8                      idx;
        u8                      sorted_idx;
@@ -243,14 +233,16 @@ struct btree_path {
         */
        bool                    should_be_locked:1;
        unsigned                level:3,
-                               locks_want:4,
-                               nodes_locked:4,
-                               nodes_intent_locked:4;
+                               locks_want:4;
+       u8                      nodes_locked;
 
        struct btree_path_level {
                struct btree    *b;
                struct btree_node_iter iter;
                u32             lock_seq;
+#ifdef CONFIG_BCACHEFS_LOCK_TIME_STATS
+               u64             lock_taken_time;
+#endif
        }                       l[BTREE_MAX_DEPTH];
 #ifdef CONFIG_BCACHEFS_DEBUG
        unsigned long           ip_allocated;
@@ -301,15 +293,22 @@ struct btree_iter {
 #endif
 };
 
+struct btree_key_cache_freelist {
+       struct bkey_cached      *objs[16];
+       unsigned                nr;
+};
+
 struct btree_key_cache {
        struct mutex            lock;
        struct rhashtable       table;
        bool                    table_init_done;
-       struct list_head        freed;
+       struct list_head        freed_pcpu;
+       struct list_head        freed_nonpcpu;
        struct shrinker         shrink;
        unsigned                shrink_iter;
+       struct btree_key_cache_freelist __percpu *pcpu_freed;
 
-       size_t                  nr_freed;
+       atomic_long_t           nr_freed;
        atomic_long_t           nr_keys;
        atomic_long_t           nr_dirty;
 };
@@ -340,6 +339,13 @@ struct bkey_cached {
        struct bkey_i           *k;
 };
 
+static inline struct bpos btree_node_pos(struct btree_bkey_cached_common *b)
+{
+       return !b->cached
+               ? container_of(b, struct btree, c)->key.k.p
+               : container_of(b, struct bkey_cached, c)->key.pos;
+}
+
 struct btree_insert_entry {
        unsigned                flags;
        u8                      bkey_type;
@@ -378,36 +384,45 @@ struct btree_trans_commit_hook {
 
 #define BTREE_TRANS_MEM_MAX    (1U << 16)
 
+#define BTREE_TRANS_MAX_LOCK_HOLD_TIME_NS      10000
+
 struct btree_trans {
        struct bch_fs           *c;
        const char              *fn;
+       struct closure          ref;
        struct list_head        list;
-       struct btree            *locking;
-       unsigned                locking_path_idx;
-       struct bpos             locking_pos;
-       u8                      locking_btree_id;
-       u8                      locking_level;
-       u8                      locking_lock_type;
-       pid_t                   pid;
+       u64                     last_begin_time;
+
+       u8                      lock_may_not_fail;
+       u8                      lock_must_abort;
+       struct btree_bkey_cached_common *locking;
+       struct six_lock_waiter  locking_wait;
+
        int                     srcu_idx;
 
+       u8                      fn_idx;
        u8                      nr_sorted;
        u8                      nr_updates;
        u8                      traverse_all_idx;
        bool                    used_mempool:1;
        bool                    in_traverse_all:1;
-       bool                    restarted:1;
        bool                    memory_allocation_failure:1;
        bool                    is_initial_gc:1;
+       enum bch_errcode        restarted:16;
+       u32                     restart_count;
+       unsigned long           last_restarted_ip;
+
        /*
         * For when bch2_trans_update notices we'll be splitting a compressed
         * extent:
         */
        unsigned                extra_journal_res;
+       unsigned                nr_max_paths;
 
        u64                     paths_allocated;
 
        unsigned                mem_top;
+       unsigned                mem_max;
        unsigned                mem_bytes;
        void                    *mem;