]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - include/trace/events/bcachefs.h
New upstream snapshot
[bcachefs-tools-debian] / include / trace / events / bcachefs.h
index a11bb5f7180eec21aafe49f7beb9c64d2cb96560..a21a39230a091b6076052007c14cdf0c872b87c1 100644 (file)
@@ -298,28 +298,6 @@ TRACE_EVENT(btree_reserve_get_fail,
                  __entry->required, __entry->cl)
 );
 
-TRACE_EVENT(btree_insert_key,
-       TP_PROTO(struct bch_fs *c, struct btree *b, struct bkey_i *k),
-       TP_ARGS(c, b, k),
-
-       TP_STRUCT__entry(
-               __field(u8,             id                      )
-               __field(u64,            inode                   )
-               __field(u64,            offset                  )
-               __field(u32,            size                    )
-       ),
-
-       TP_fast_assign(
-               __entry->id             = b->c.btree_id;
-               __entry->inode          = k->k.p.inode;
-               __entry->offset         = k->k.p.offset;
-               __entry->size           = k->k.size;
-       ),
-
-       TP_printk("btree %u: %llu:%llu len %u", __entry->id,
-                 __entry->inode, __entry->offset, __entry->size)
-);
-
 DEFINE_EVENT(btree_node, btree_split,
        TP_PROTO(struct bch_fs *c, struct btree *b),
        TP_ARGS(c, b)
@@ -340,6 +318,80 @@ DEFINE_EVENT(btree_node, btree_set_root,
        TP_ARGS(c, b)
 );
 
+TRACE_EVENT(btree_cache_scan,
+       TP_PROTO(unsigned long nr_to_scan_pages,
+                unsigned long nr_to_scan_nodes,
+                unsigned long can_free_nodes,
+                long ret),
+       TP_ARGS(nr_to_scan_pages, nr_to_scan_nodes, can_free_nodes, ret),
+
+       TP_STRUCT__entry(
+               __field(unsigned long,  nr_to_scan_pages        )
+               __field(unsigned long,  nr_to_scan_nodes        )
+               __field(unsigned long,  can_free_nodes          )
+               __field(long,           ret                     )
+       ),
+
+       TP_fast_assign(
+               __entry->nr_to_scan_pages       = nr_to_scan_pages;
+               __entry->nr_to_scan_nodes       = nr_to_scan_nodes;
+               __entry->can_free_nodes         = can_free_nodes;
+               __entry->ret                    = ret;
+       ),
+
+       TP_printk("scanned for %lu pages, %lu nodes, can free %lu nodes, ret %li",
+                 __entry->nr_to_scan_pages,
+                 __entry->nr_to_scan_nodes,
+                 __entry->can_free_nodes,
+                 __entry->ret)
+);
+
+TRACE_EVENT(btree_node_relock_fail,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos,
+                unsigned long node,
+                u32 iter_lock_seq,
+                u32 node_lock_seq),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos, node, iter_lock_seq, node_lock_seq),
+
+       TP_STRUCT__entry(
+               __array(char,                   trans_fn, 24    )
+               __field(unsigned long,          caller_ip       )
+               __field(u8,                     btree_id        )
+               __field(u64,                    pos_inode       )
+               __field(u64,                    pos_offset      )
+               __field(u32,                    pos_snapshot    )
+               __field(unsigned long,          node            )
+               __field(u32,                    iter_lock_seq   )
+               __field(u32,                    node_lock_seq   )
+       ),
+
+       TP_fast_assign(
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
+               __entry->caller_ip              = caller_ip;
+               __entry->btree_id               = btree_id;
+               __entry->pos_inode              = pos->inode;
+               __entry->pos_offset             = pos->offset;
+               __entry->pos_snapshot           = pos->snapshot;
+               __entry->node                   = node;
+               __entry->iter_lock_seq          = iter_lock_seq;
+               __entry->node_lock_seq          = node_lock_seq;
+       ),
+
+       TP_printk("%s %pS btree %u pos %llu:%llu:%u, node %lu iter seq %u lock seq %u",
+                 __entry->trans_fn,
+                 (void *) __entry->caller_ip,
+                 __entry->btree_id,
+                 __entry->pos_inode,
+                 __entry->pos_offset,
+                 __entry->pos_snapshot,
+                 __entry->node,
+                 __entry->iter_lock_seq,
+                 __entry->node_lock_seq)
+);
+
 /* Garbage collection */
 
 DEFINE_EVENT(btree_node, btree_gc_rewrite_node,
@@ -381,7 +433,7 @@ TRACE_EVENT(alloc_scan,
        ),
 
        TP_fast_assign(
-               __entry->dev            = ca->disk_sb.bdev->bd_dev;
+               __entry->dev            = ca->dev;
                __entry->found          = found;
                __entry->inc_gen        = inc_gen;
                __entry->inc_gen_skipped = inc_gen_skipped;
@@ -403,7 +455,7 @@ TRACE_EVENT(invalidate,
        ),
 
        TP_fast_assign(
-               __entry->dev            = ca->disk_sb.bdev->bd_dev;
+               __entry->dev            = ca->dev;
                __entry->offset         = offset,
                __entry->sectors        = sectors;
        ),
@@ -425,7 +477,7 @@ DECLARE_EVENT_CLASS(bucket_alloc,
        ),
 
        TP_fast_assign(
-               __entry->dev            = ca->disk_sb.bdev->bd_dev;
+               __entry->dev            = ca->dev;
                __entry->reserve        = reserve;
        ),
 
@@ -540,157 +592,87 @@ TRACE_EVENT(copygc_wait,
                  __entry->wait_amount, __entry->until)
 );
 
-TRACE_EVENT(trans_get_iter,
-       TP_PROTO(unsigned long trans_ip,
-                unsigned long caller_ip,
-                enum btree_id btree_id,
-                struct bpos *got_pos,
-                unsigned got_locks,
-                unsigned got_uptodate,
-                struct bpos *src_pos,
-                unsigned src_locks,
-                unsigned src_uptodate),
-       TP_ARGS(trans_ip, caller_ip, btree_id,
-               got_pos, got_locks, got_uptodate,
-               src_pos, src_locks, src_uptodate),
-
-       TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip                )
-               __field(unsigned long,          caller_ip               )
-               __field(u8,                     btree_id                )
-               __field(u64,                    got_pos_inode           )
-               __field(u64,                    got_pos_offset          )
-               __field(u32,                    got_pos_snapshot        )
-               __field(u8,                     got_locks               )
-               __field(u8,                     got_uptodate            )
-               __field(u64,                    src_pos_inode           )
-               __field(u64,                    src_pos_offset          )
-               __field(u32,                    src_pos_snapshot        )
-               __field(u8,                     src_locks               )
-               __field(u8,                     src_uptodate            )
-       ),
-
-       TP_fast_assign(
-               __entry->trans_ip               = trans_ip;
-               __entry->caller_ip              = caller_ip;
-               __entry->btree_id               = btree_id;
-               __entry->got_pos_inode          = got_pos->inode;
-               __entry->got_pos_offset         = got_pos->offset;
-               __entry->got_pos_snapshot       = got_pos->snapshot;
-               __entry->got_locks              = got_locks;
-               __entry->got_uptodate           = got_uptodate;
-               __entry->src_pos_inode          = src_pos->inode;
-               __entry->src_pos_offset         = src_pos->offset;
-               __entry->src_pos_snapshot       = src_pos->snapshot;
-               __entry->src_locks              = src_locks;
-               __entry->src_uptodate           = src_uptodate;
-       ),
-
-       TP_printk("%ps %pS btree %u got %llu:%llu:%u l %u u %u "
-                 "src %llu:%llu:%u l %u u %u",
-                 (void *) __entry->trans_ip,
-                 (void *) __entry->caller_ip,
-                 __entry->btree_id,
-                 __entry->got_pos_inode,
-                 __entry->got_pos_offset,
-                 __entry->got_pos_snapshot,
-                 __entry->got_locks,
-                 __entry->got_uptodate,
-                 __entry->src_pos_inode,
-                 __entry->src_pos_offset,
-                 __entry->src_pos_snapshot,
-                 __entry->src_locks,
-                 __entry->src_uptodate)
-);
-
-TRACE_EVENT(transaction_restart_ip,
-       TP_PROTO(unsigned long caller, unsigned long ip),
-       TP_ARGS(caller, ip),
-
-       TP_STRUCT__entry(
-               __field(unsigned long,          caller  )
-               __field(unsigned long,          ip      )
-       ),
-
-       TP_fast_assign(
-               __entry->caller = caller;
-               __entry->ip     = ip;
-       ),
-
-       TP_printk("%ps %pS", (void *) __entry->caller, (void *) __entry->ip)
-);
-
 DECLARE_EVENT_CLASS(transaction_restart,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip),
+       TP_ARGS(trans_fn, caller_ip),
 
        TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip        )
+               __array(char,                   trans_fn, 24    )
                __field(unsigned long,          caller_ip       )
        ),
 
        TP_fast_assign(
-               __entry->trans_ip               = trans_ip;
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
                __entry->caller_ip              = caller_ip;
        ),
 
-       TP_printk("%ps %pS",
-                 (void *) __entry->trans_ip,
-                 (void *) __entry->caller_ip)
+       TP_printk("%s %pS", __entry->trans_fn, (void *) __entry->caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart,      transaction_restart_ip,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DEFINE_EVENT(transaction_restart,      trans_blocked_journal_reclaim,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip)
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DEFINE_EVENT(transaction_restart,      trans_restart_journal_res_get,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip)
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DEFINE_EVENT(transaction_restart,      trans_restart_journal_preres_get,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip)
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DEFINE_EVENT(transaction_restart,      trans_restart_journal_reclaim,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip)
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DEFINE_EVENT(transaction_restart,      trans_restart_fault_inject,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip)
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DEFINE_EVENT(transaction_restart,      trans_traverse_all,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip)
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DEFINE_EVENT(transaction_restart,      trans_restart_mark_replicas,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_key_cache_raced,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip),
-       TP_ARGS(trans_ip, caller_ip)
+       TP_ARGS(trans_fn, caller_ip)
 );
 
 DECLARE_EVENT_CLASS(transaction_restart_iter,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos),
 
        TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip        )
+               __array(char,                   trans_fn, 24    )
                __field(unsigned long,          caller_ip       )
                __field(u8,                     btree_id        )
                __field(u64,                    pos_inode       )
@@ -699,7 +681,7 @@ DECLARE_EVENT_CLASS(transaction_restart_iter,
        ),
 
        TP_fast_assign(
-               __entry->trans_ip               = trans_ip;
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
                __entry->caller_ip              = caller_ip;
                __entry->btree_id               = btree_id;
                __entry->pos_inode              = pos->inode;
@@ -707,8 +689,8 @@ DECLARE_EVENT_CLASS(transaction_restart_iter,
                __entry->pos_snapshot           = pos->snapshot;
        ),
 
-       TP_printk("%ps %pS btree %u pos %llu:%llu:%u",
-                 (void *) __entry->trans_ip,
+       TP_printk("%s %pS btree %u pos %llu:%llu:%u",
+                 __entry->trans_fn,
                  (void *) __entry->caller_ip,
                  __entry->btree_id,
                  __entry->pos_inode,
@@ -717,153 +699,111 @@ DECLARE_EVENT_CLASS(transaction_restart_iter,
 );
 
 DEFINE_EVENT(transaction_restart_iter, trans_restart_btree_node_reused,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
 DEFINE_EVENT(transaction_restart_iter, trans_restart_btree_node_split,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
 DEFINE_EVENT(transaction_restart_iter, trans_restart_mark,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
 DEFINE_EVENT(transaction_restart_iter, trans_restart_upgrade,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
 DEFINE_EVENT(transaction_restart_iter, trans_restart_iter_upgrade,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
 DEFINE_EVENT(transaction_restart_iter, trans_restart_relock,
-       TP_PROTO(unsigned long trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
-DEFINE_EVENT(transaction_restart_iter, trans_restart_traverse,
-       TP_PROTO(unsigned long trans_ip,
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock_next_node,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
                 enum btree_id btree_id,
                 struct bpos *pos),
-       TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
-TRACE_EVENT(iter_traverse,
-       TP_PROTO(unsigned long  trans_ip,
-                unsigned long  caller_ip,
-                bool key_cache,
-                enum btree_id  btree_id,
-                struct bpos    *pos,
-                int ret),
-       TP_ARGS(trans_ip, caller_ip, key_cache, btree_id, pos, ret),
-
-       TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip        )
-               __field(unsigned long,          caller_ip       )
-               __field(u8,                     key_cache       )
-               __field(u8,                     btree_id        )
-               __field(u64,                    pos_inode       )
-               __field(u64,                    pos_offset      )
-               __field(u32,                    pos_snapshot    )
-               __field(s32,                    ret             )
-       ),
-
-       TP_fast_assign(
-               __entry->trans_ip               = trans_ip;
-               __entry->caller_ip              = caller_ip;
-               __entry->key_cache              = key_cache;
-               __entry->btree_id               = btree_id;
-               __entry->pos_inode              = pos->inode;
-               __entry->pos_offset             = pos->offset;
-               __entry->pos_snapshot           = pos->snapshot;
-               __entry->ret                    = ret;
-       ),
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock_parent_for_fill,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
+);
 
-       TP_printk("%ps %pS key cache %u btree %u %llu:%llu:%u ret %i",
-                 (void *) __entry->trans_ip,
-                 (void *) __entry->caller_ip,
-                 __entry->key_cache,
-                 __entry->btree_id,
-                 __entry->pos_inode,
-                 __entry->pos_offset,
-                 __entry->pos_snapshot,
-                 __entry->ret)
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock_after_fill,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
-TRACE_EVENT(iter_set_search_pos,
-       TP_PROTO(unsigned long  trans_ip,
-                unsigned long  caller_ip,
-                enum btree_id  btree_id,
-                struct bpos    *old_pos,
-                struct bpos    *new_pos,
-                unsigned       good_level),
-       TP_ARGS(trans_ip, caller_ip, btree_id, old_pos, new_pos, good_level),
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock_key_cache_fill,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
+);
 
-       TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip                )
-               __field(unsigned long,          caller_ip               )
-               __field(u8,                     btree_id                )
-               __field(u64,                    old_pos_inode           )
-               __field(u64,                    old_pos_offset          )
-               __field(u32,                    old_pos_snapshot        )
-               __field(u64,                    new_pos_inode           )
-               __field(u64,                    new_pos_offset          )
-               __field(u32,                    new_pos_snapshot        )
-               __field(u8,                     good_level              )
-       ),
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock_path,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
+);
 
-       TP_fast_assign(
-               __entry->trans_ip               = trans_ip;
-               __entry->caller_ip              = caller_ip;
-               __entry->btree_id               = btree_id;
-               __entry->old_pos_inode          = old_pos->inode;
-               __entry->old_pos_offset         = old_pos->offset;
-               __entry->old_pos_snapshot       = old_pos->snapshot;
-               __entry->new_pos_inode          = new_pos->inode;
-               __entry->new_pos_offset         = new_pos->offset;
-               __entry->new_pos_snapshot       = new_pos->snapshot;
-               __entry->good_level             = good_level;
-       ),
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock_path_intent,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
+);
 
-       TP_printk("%ps %pS btree %u old pos %llu:%llu:%u new pos %llu:%llu:%u l %u",
-                 (void *) __entry->trans_ip,
-                 (void *) __entry->caller_ip,
-                 __entry->btree_id,
-                 __entry->old_pos_inode,
-                 __entry->old_pos_offset,
-                 __entry->old_pos_snapshot,
-                 __entry->new_pos_inode,
-                 __entry->new_pos_offset,
-                 __entry->new_pos_snapshot,
-                 __entry->good_level)
+DEFINE_EVENT(transaction_restart_iter, trans_restart_traverse,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos)
 );
 
 TRACE_EVENT(trans_restart_would_deadlock,
-       TP_PROTO(unsigned long  trans_ip,
+       TP_PROTO(const char *trans_fn,
                 unsigned long  caller_ip,
                 bool           in_traverse_all,
                 unsigned       reason,
@@ -873,12 +813,12 @@ TRACE_EVENT(trans_restart_would_deadlock,
                 enum btree_id  want_btree_id,
                 unsigned       want_iter_type,
                 struct bpos    *want_pos),
-       TP_ARGS(trans_ip, caller_ip, in_traverse_all, reason,
+       TP_ARGS(trans_fn, caller_ip, in_traverse_all, reason,
                have_btree_id, have_iter_type, have_pos,
                want_btree_id, want_iter_type, want_pos),
 
        TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip        )
+               __array(char,                   trans_fn, 24    )
                __field(unsigned long,          caller_ip       )
                __field(u8,                     in_traverse_all )
                __field(u8,                     reason          )
@@ -896,7 +836,7 @@ TRACE_EVENT(trans_restart_would_deadlock,
        ),
 
        TP_fast_assign(
-               __entry->trans_ip               = trans_ip;
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
                __entry->caller_ip              = caller_ip;
                __entry->in_traverse_all        = in_traverse_all;
                __entry->reason                 = reason;
@@ -914,8 +854,8 @@ TRACE_EVENT(trans_restart_would_deadlock,
                __entry->want_pos_snapshot      = want_pos->snapshot;
        ),
 
-       TP_printk("%ps %pS traverse_all %u because %u have %u:%u %llu:%llu:%u want %u:%u %llu:%llu:%u",
-                 (void *) __entry->trans_ip,
+       TP_printk("%s %pS traverse_all %u because %u have %u:%u %llu:%llu:%u want %u:%u %llu:%llu:%u",
+                 __entry->trans_fn,
                  (void *) __entry->caller_ip,
                  __entry->in_traverse_all,
                  __entry->reason,
@@ -931,99 +871,43 @@ TRACE_EVENT(trans_restart_would_deadlock,
                  __entry->want_pos_snapshot)
 );
 
-TRACE_EVENT(trans_restart_mem_realloced,
-       TP_PROTO(unsigned long trans_ip, unsigned long caller_ip,
-                unsigned long bytes),
-       TP_ARGS(trans_ip, caller_ip, bytes),
+TRACE_EVENT(trans_restart_would_deadlock_write,
+       TP_PROTO(const char *trans_fn),
+       TP_ARGS(trans_fn),
 
        TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip        )
-               __field(unsigned long,          caller_ip       )
-               __field(unsigned long,          bytes           )
+               __array(char,                   trans_fn, 24    )
        ),
 
        TP_fast_assign(
-               __entry->trans_ip       = trans_ip;
-               __entry->caller_ip      = caller_ip;
-               __entry->bytes          = bytes;
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
        ),
 
-       TP_printk("%ps %pS bytes %lu",
-                 (void *) __entry->trans_ip,
-                 (void *) __entry->caller_ip,
-                 __entry->bytes)
+       TP_printk("%s", __entry->trans_fn)
 );
 
-DECLARE_EVENT_CLASS(node_lock_fail,
-       TP_PROTO(unsigned long trans_ip,
+TRACE_EVENT(trans_restart_mem_realloced,
+       TP_PROTO(const char *trans_fn,
                 unsigned long caller_ip,
-                bool key_cache,
-                enum btree_id btree_id,
-                struct bpos *pos,
-                unsigned level, u32 iter_seq, unsigned node, u32 node_seq),
-       TP_ARGS(trans_ip, caller_ip, key_cache, btree_id, pos,
-               level, iter_seq, node, node_seq),
+                unsigned long bytes),
+       TP_ARGS(trans_fn, caller_ip, bytes),
 
        TP_STRUCT__entry(
-               __field(unsigned long,          trans_ip        )
+               __array(char,                   trans_fn, 24    )
                __field(unsigned long,          caller_ip       )
-               __field(u8,                     key_cache       )
-               __field(u8,                     btree_id        )
-               __field(u64,                    pos_inode       )
-               __field(u64,                    pos_offset      )
-               __field(u32,                    pos_snapshot    )
-               __field(u32,                    level           )
-               __field(u32,                    iter_seq        )
-               __field(u32,                    node            )
-               __field(u32,                    node_seq        )
+               __field(unsigned long,          bytes           )
        ),
 
        TP_fast_assign(
-               __entry->trans_ip               = trans_ip;
-               __entry->caller_ip              = caller_ip;
-               __entry->key_cache              = key_cache;
-               __entry->btree_id               = btree_id;
-               __entry->pos_inode              = pos->inode;
-               __entry->pos_offset             = pos->offset;
-               __entry->pos_snapshot           = pos->snapshot;
-               __entry->level                  = level;
-               __entry->iter_seq               = iter_seq;
-               __entry->node                   = node;
-               __entry->node_seq               = node_seq;
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
+               __entry->caller_ip      = caller_ip;
+               __entry->bytes          = bytes;
        ),
 
-       TP_printk("%ps %pS key cache %u btree %u pos %llu:%llu:%u level %u iter seq %u node %u node seq %u",
-                 (void *) __entry->trans_ip,
+       TP_printk("%s %pS bytes %lu",
+                 __entry->trans_fn,
                  (void *) __entry->caller_ip,
-                 __entry->key_cache,
-                 __entry->btree_id,
-                 __entry->pos_inode,
-                 __entry->pos_offset,
-                 __entry->pos_snapshot,
-                 __entry->level, __entry->iter_seq,
-                 __entry->node, __entry->node_seq)
-);
-
-DEFINE_EVENT(node_lock_fail, node_upgrade_fail,
-       TP_PROTO(unsigned long trans_ip,
-                unsigned long caller_ip,
-                bool key_cache,
-                enum btree_id btree_id,
-                struct bpos *pos,
-                unsigned level, u32 iter_seq, unsigned node, u32 node_seq),
-       TP_ARGS(trans_ip, caller_ip, key_cache, btree_id, pos,
-               level, iter_seq, node, node_seq)
-);
-
-DEFINE_EVENT(node_lock_fail, node_relock_fail,
-       TP_PROTO(unsigned long trans_ip,
-                unsigned long caller_ip,
-                bool key_cache,
-                enum btree_id btree_id,
-                struct bpos *pos,
-                unsigned level, u32 iter_seq, unsigned node, u32 node_seq),
-       TP_ARGS(trans_ip, caller_ip, key_cache, btree_id, pos,
-               level, iter_seq, node, node_seq)
+                 __entry->bytes)
 );
 
 #endif /* _TRACE_BCACHE_H */