]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - include/trace/events/bcachefs.h
Update bcachefs sources to 3913e0cac3 bcachefs: Journal space calculation fix
[bcachefs-tools-debian] / include / trace / events / bcachefs.h
index a7be2d8222d89b3a48637045d4e2033811d097bb..7c90ba01510a756d0a0744d78492ccb515b4174a 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM bcachefs
 
@@ -7,7 +8,7 @@
 #include <linux/tracepoint.h>
 
 DECLARE_EVENT_CLASS(bpos,
-       TP_PROTO(struct bpos p),
+       TP_PROTO(struct bpos *p),
        TP_ARGS(p),
 
        TP_STRUCT__entry(
@@ -16,8 +17,8 @@ DECLARE_EVENT_CLASS(bpos,
        ),
 
        TP_fast_assign(
-               __entry->inode  = p.inode;
-               __entry->offset = p.offset;
+               __entry->inode  = p->inode;
+               __entry->offset = p->offset;
        ),
 
        TP_printk("%llu:%llu", __entry->inode, __entry->offset)
@@ -43,34 +44,19 @@ DECLARE_EVENT_CLASS(bkey,
                  __entry->offset, __entry->size)
 );
 
-DECLARE_EVENT_CLASS(bch_dev,
-       TP_PROTO(struct bch_dev *ca),
-       TP_ARGS(ca),
-
-       TP_STRUCT__entry(
-               __array(char,           uuid,   16      )
-       ),
-
-       TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
-       ),
-
-       TP_printk("%pU", __entry->uuid)
-);
-
 DECLARE_EVENT_CLASS(bch_fs,
        TP_PROTO(struct bch_fs *c),
        TP_ARGS(c),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,   16 )
+               __field(dev_t,          dev                     )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
+               __entry->dev            = c->dev;
        ),
 
-       TP_printk("%pU", __entry->uuid)
+       TP_printk("%d,%d", MAJOR(__entry->dev), MINOR(__entry->dev))
 );
 
 DECLARE_EVENT_CLASS(bio,
@@ -135,10 +121,71 @@ DEFINE_EVENT(bio, journal_write,
        TP_ARGS(bio)
 );
 
+TRACE_EVENT(journal_reclaim_start,
+       TP_PROTO(struct bch_fs *c, u64 min_nr,
+                u64 prereserved, u64 prereserved_total,
+                u64 btree_cache_dirty, u64 btree_cache_total,
+                u64 btree_key_cache_dirty, u64 btree_key_cache_total),
+       TP_ARGS(c, min_nr, prereserved, prereserved_total,
+               btree_cache_dirty, btree_cache_total,
+               btree_key_cache_dirty, btree_key_cache_total),
+
+       TP_STRUCT__entry(
+               __field(dev_t,          dev                     )
+               __field(u64,            min_nr                  )
+               __field(u64,            prereserved             )
+               __field(u64,            prereserved_total       )
+               __field(u64,            btree_cache_dirty       )
+               __field(u64,            btree_cache_total       )
+               __field(u64,            btree_key_cache_dirty   )
+               __field(u64,            btree_key_cache_total   )
+       ),
+
+       TP_fast_assign(
+               __entry->dev                    = c->dev;
+               __entry->min_nr                 = min_nr;
+               __entry->prereserved            = prereserved;
+               __entry->prereserved_total      = prereserved_total;
+               __entry->btree_cache_dirty      = btree_cache_dirty;
+               __entry->btree_cache_total      = btree_cache_total;
+               __entry->btree_key_cache_dirty  = btree_key_cache_dirty;
+               __entry->btree_key_cache_total  = btree_key_cache_total;
+       ),
+
+       TP_printk("%d,%d min %llu prereserved %llu/%llu btree cache %llu/%llu key cache %llu/%llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->min_nr,
+                 __entry->prereserved,
+                 __entry->prereserved_total,
+                 __entry->btree_cache_dirty,
+                 __entry->btree_cache_total,
+                 __entry->btree_key_cache_dirty,
+                 __entry->btree_key_cache_total)
+);
+
+TRACE_EVENT(journal_reclaim_finish,
+       TP_PROTO(struct bch_fs *c, u64 nr_flushed),
+       TP_ARGS(c, nr_flushed),
+
+       TP_STRUCT__entry(
+               __field(dev_t,          dev                     )
+               __field(u64,            nr_flushed              )
+       ),
+
+       TP_fast_assign(
+               __entry->dev            = c->dev;
+               __entry->nr_flushed     = nr_flushed;
+       ),
+
+       TP_printk("%d%d flushed %llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->nr_flushed)
+);
+
 /* bset.c: */
 
 DEFINE_EVENT(bpos, bkey_pack_pos_fail,
-       TP_PROTO(struct bpos p),
+       TP_PROTO(struct bpos *p),
        TP_ARGS(p)
 );
 
@@ -149,7 +196,7 @@ DECLARE_EVENT_CLASS(btree_node,
        TP_ARGS(c, b),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,           16      )
+               __field(dev_t,          dev                     )
                __field(u8,             level                   )
                __field(u8,             id                      )
                __field(u64,            inode                   )
@@ -157,15 +204,16 @@ DECLARE_EVENT_CLASS(btree_node,
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
-               __entry->level          = b->level;
-               __entry->id             = b->btree_id;
+               __entry->dev            = c->dev;
+               __entry->level          = b->c.level;
+               __entry->id             = b->c.btree_id;
                __entry->inode          = b->key.k.p.inode;
                __entry->offset         = b->key.k.p.offset;
        ),
 
-       TP_printk("%pU  %u id %u %llu:%llu",
-                 __entry->uuid, __entry->level, __entry->id,
+       TP_printk("%d,%d  %u id %u %llu:%llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->level, __entry->id,
                  __entry->inode, __entry->offset)
 );
 
@@ -179,7 +227,7 @@ TRACE_EVENT(btree_write,
        TP_ARGS(b, bytes, sectors),
 
        TP_STRUCT__entry(
-               __field(enum bkey_type, type)
+               __field(enum btree_node_type,   type)
                __field(unsigned,       bytes                   )
                __field(unsigned,       sectors                 )
        ),
@@ -209,32 +257,17 @@ DEFINE_EVENT(btree_node, btree_node_reap,
        TP_ARGS(c, b)
 );
 
-DECLARE_EVENT_CLASS(btree_node_cannibalize_lock,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c),
-
-       TP_STRUCT__entry(
-               __array(char,                   uuid,   16      )
-       ),
-
-       TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
-       ),
-
-       TP_printk("%pU", __entry->uuid)
-);
-
-DEFINE_EVENT(btree_node_cannibalize_lock, btree_node_cannibalize_lock_fail,
+DEFINE_EVENT(bch_fs, btree_node_cannibalize_lock_fail,
        TP_PROTO(struct bch_fs *c),
        TP_ARGS(c)
 );
 
-DEFINE_EVENT(btree_node_cannibalize_lock, btree_node_cannibalize_lock,
+DEFINE_EVENT(bch_fs, btree_node_cannibalize_lock,
        TP_PROTO(struct bch_fs *c),
        TP_ARGS(c)
 );
 
-DEFINE_EVENT(btree_node_cannibalize_lock, btree_node_cannibalize,
+DEFINE_EVENT(bch_fs, btree_node_cannibalize,
        TP_PROTO(struct bch_fs *c),
        TP_ARGS(c)
 );
@@ -249,18 +282,19 @@ TRACE_EVENT(btree_reserve_get_fail,
        TP_ARGS(c, required, cl),
 
        TP_STRUCT__entry(
-               __array(char,                   uuid,   16      )
+               __field(dev_t,          dev                     )
                __field(size_t,                 required        )
                __field(struct closure *,       cl              )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
+               __entry->dev            = c->dev;
                __entry->required = required;
                __entry->cl = cl;
        ),
 
-       TP_printk("%pU required %zu by %p", __entry->uuid,
+       TP_printk("%d,%d required %zu by %p",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->required, __entry->cl)
 );
 
@@ -276,7 +310,7 @@ TRACE_EVENT(btree_insert_key,
        ),
 
        TP_fast_assign(
-               __entry->id             = b->btree_id;
+               __entry->id             = b->c.btree_id;
                __entry->inode          = k->k.p.inode;
                __entry->offset         = k->k.p.offset;
                __entry->size           = k->k.size;
@@ -296,34 +330,17 @@ DEFINE_EVENT(btree_node, btree_compact,
        TP_ARGS(c, b)
 );
 
-DEFINE_EVENT(btree_node, btree_set_root,
+DEFINE_EVENT(btree_node, btree_merge,
        TP_PROTO(struct bch_fs *c, struct btree *b),
        TP_ARGS(c, b)
 );
 
-/* Garbage collection */
-
-DEFINE_EVENT(btree_node, btree_gc_coalesce,
+DEFINE_EVENT(btree_node, btree_set_root,
        TP_PROTO(struct bch_fs *c, struct btree *b),
        TP_ARGS(c, b)
 );
 
-TRACE_EVENT(btree_gc_coalesce_fail,
-       TP_PROTO(struct bch_fs *c, int reason),
-       TP_ARGS(c, reason),
-
-       TP_STRUCT__entry(
-               __field(u8,             reason                  )
-               __array(char,           uuid,   16              )
-       ),
-
-       TP_fast_assign(
-               __entry->reason         = reason;
-               memcpy(__entry->uuid, c->disk_sb->user_uuid.b, 16);
-       ),
-
-       TP_printk("%pU: %u", __entry->uuid, __entry->reason)
-);
+/* Garbage collection */
 
 DEFINE_EVENT(btree_node, btree_gc_rewrite_node,
        TP_PROTO(struct bch_fs *c, struct btree *b),
@@ -345,26 +362,6 @@ DEFINE_EVENT(bch_fs, gc_end,
        TP_ARGS(c)
 );
 
-DEFINE_EVENT(bch_fs, gc_coalesce_start,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
-);
-
-DEFINE_EVENT(bch_fs, gc_coalesce_end,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
-);
-
-DEFINE_EVENT(bch_dev, sectors_saturated,
-       TP_PROTO(struct bch_dev *ca),
-       TP_ARGS(ca)
-);
-
-DEFINE_EVENT(bch_fs, gc_sectors_saturated,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
-);
-
 DEFINE_EVENT(bch_fs, gc_cannot_inc_gens,
        TP_PROTO(struct bch_fs *c),
        TP_ARGS(c)
@@ -372,24 +369,27 @@ DEFINE_EVENT(bch_fs, gc_cannot_inc_gens,
 
 /* Allocator */
 
-TRACE_EVENT(alloc_batch,
-       TP_PROTO(struct bch_dev *ca, size_t free, size_t total),
-       TP_ARGS(ca, free, total),
+TRACE_EVENT(alloc_scan,
+       TP_PROTO(struct bch_dev *ca, u64 found, u64 inc_gen, u64 inc_gen_skipped),
+       TP_ARGS(ca, found, inc_gen, inc_gen_skipped),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,   16      )
-               __field(size_t,         free            )
-               __field(size_t,         total           )
+               __field(dev_t,          dev             )
+               __field(u64,            found           )
+               __field(u64,            inc_gen         )
+               __field(u64,            inc_gen_skipped )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
-               __entry->free = free;
-               __entry->total = total;
+               __entry->dev            = ca->disk_sb.bdev->bd_dev;
+               __entry->found          = found;
+               __entry->inc_gen        = inc_gen;
+               __entry->inc_gen_skipped = inc_gen_skipped;
        ),
 
-       TP_printk("%pU free %zu total %zu",
-               __entry->uuid, __entry->free, __entry->total)
+       TP_printk("%d,%d found %llu inc_gen %llu inc_gen_skipped %llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->found, __entry->inc_gen, __entry->inc_gen_skipped)
 );
 
 TRACE_EVENT(invalidate,
@@ -409,13 +409,10 @@ TRACE_EVENT(invalidate,
        ),
 
        TP_printk("invalidated %u sectors at %d,%d sector=%llu",
-                 __entry->sectors, MAJOR(__entry->dev),
-                 MINOR(__entry->dev), __entry->offset)
-);
-
-DEFINE_EVENT(bch_fs, rescale_prios,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
+                 __entry->sectors,
+                 MAJOR(__entry->dev),
+                 MINOR(__entry->dev),
+                 __entry->offset)
 );
 
 DECLARE_EVENT_CLASS(bucket_alloc,
@@ -423,16 +420,18 @@ DECLARE_EVENT_CLASS(bucket_alloc,
        TP_ARGS(ca, reserve),
 
        TP_STRUCT__entry(
-               __array(char,                   uuid,   16)
-               __field(enum alloc_reserve,     reserve   )
+               __field(dev_t,                  dev     )
+               __field(enum alloc_reserve,     reserve )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
-               __entry->reserve = reserve;
+               __entry->dev            = ca->disk_sb.bdev->bd_dev;
+               __entry->reserve        = reserve;
        ),
 
-       TP_printk("%pU reserve %d", __entry->uuid, __entry->reserve)
+       TP_printk("%d,%d reserve %d",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->reserve)
 );
 
 DEFINE_EVENT(bucket_alloc, bucket_alloc,
@@ -473,31 +472,32 @@ TRACE_EVENT(move_data,
        TP_ARGS(c, sectors_moved, keys_moved),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,   16      )
+               __field(dev_t,          dev                     )
                __field(u64,            sectors_moved   )
                __field(u64,            keys_moved      )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
+               __entry->dev                    = c->dev;
                __entry->sectors_moved = sectors_moved;
                __entry->keys_moved = keys_moved;
        ),
 
-       TP_printk("%pU sectors_moved %llu keys_moved %llu",
-               __entry->uuid, __entry->sectors_moved, __entry->keys_moved)
+       TP_printk("%d,%d sectors_moved %llu keys_moved %llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->sectors_moved, __entry->keys_moved)
 );
 
 TRACE_EVENT(copygc,
-       TP_PROTO(struct bch_dev *ca,
+       TP_PROTO(struct bch_fs *c,
                 u64 sectors_moved, u64 sectors_not_moved,
                 u64 buckets_moved, u64 buckets_not_moved),
-       TP_ARGS(ca,
+       TP_ARGS(c,
                sectors_moved, sectors_not_moved,
                buckets_moved, buckets_not_moved),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,   16              )
+               __field(dev_t,          dev                     )
                __field(u64,            sectors_moved           )
                __field(u64,            sectors_not_moved       )
                __field(u64,            buckets_moved           )
@@ -505,17 +505,322 @@ TRACE_EVENT(copygc,
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
+               __entry->dev                    = c->dev;
                __entry->sectors_moved          = sectors_moved;
                __entry->sectors_not_moved      = sectors_not_moved;
                __entry->buckets_moved          = buckets_moved;
                __entry->buckets_not_moved = buckets_moved;
        ),
 
-       TP_printk("%pU sectors moved %llu remain %llu buckets moved %llu remain %llu",
-               __entry->uuid,
-               __entry->sectors_moved, __entry->sectors_not_moved,
-               __entry->buckets_moved, __entry->buckets_not_moved)
+       TP_printk("%d,%d sectors moved %llu remain %llu buckets moved %llu remain %llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->sectors_moved, __entry->sectors_not_moved,
+                 __entry->buckets_moved, __entry->buckets_not_moved)
+);
+
+TRACE_EVENT(copygc_wait,
+       TP_PROTO(struct bch_fs *c,
+                u64 wait_amount, u64 until),
+       TP_ARGS(c, wait_amount, until),
+
+       TP_STRUCT__entry(
+               __field(dev_t,          dev                     )
+               __field(u64,            wait_amount             )
+               __field(u64,            until                   )
+       ),
+
+       TP_fast_assign(
+               __entry->dev            = c->dev;
+               __entry->wait_amount    = wait_amount;
+               __entry->until          = until;
+       ),
+
+       TP_printk("%d,%u waiting for %llu sectors until %llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->wait_amount, __entry->until)
+);
+
+TRACE_EVENT(trans_get_iter,
+       TP_PROTO(unsigned long caller, unsigned long ip,
+                enum btree_id btree_id,
+                struct bpos *pos_want,
+                unsigned locks_want,
+                struct bpos *pos_found,
+                unsigned locks_found,
+                unsigned uptodate),
+       TP_ARGS(caller, ip, btree_id,
+               pos_want, locks_want,
+               pos_found, locks_found,
+               uptodate),
+
+       TP_STRUCT__entry(
+               __field(unsigned long,  caller                  )
+               __field(unsigned long,  ip                      )
+               __field(u8,             btree_id                )
+               __field(u8,             uptodate                )
+               __field(u8,             locks_want              )
+               __field(u8,             locks_found             )
+               __field(u64,            pos_want_inode          )
+               __field(u64,            pos_want_offset         )
+               __field(u32,            pos_want_snapshot       )
+               __field(u64,            pos_found_inode         )
+               __field(u64,            pos_found_offset        )
+               __field(u32,            pos_found_snapshot      )
+       ),
+
+       TP_fast_assign(
+               __entry->caller                 = caller;
+               __entry->ip                     = ip;
+               __entry->btree_id               = btree_id;
+               __entry->uptodate               = uptodate;
+               __entry->pos_want_inode         = pos_want->inode;
+               __entry->pos_want_offset        = pos_want->offset;
+               __entry->pos_want_snapshot      = pos_want->snapshot;
+               __entry->pos_found_inode        = pos_found->inode;
+               __entry->pos_found_offset       = pos_found->offset;
+               __entry->pos_found_snapshot     = pos_found->snapshot;
+       ),
+
+       TP_printk("%ps %pS btree %u uptodate %u want %llu:%llu:%u locks %u found %llu:%llu:%u locks %u",
+                 (void *) __entry->caller,
+                 (void *) __entry->ip,
+                 __entry->btree_id,
+                 __entry->uptodate,
+                 __entry->pos_want_inode,
+                 __entry->pos_want_offset,
+                 __entry->pos_want_snapshot,
+                 __entry->locks_want,
+                 __entry->pos_found_inode,
+                 __entry->pos_found_offset,
+                 __entry->pos_found_snapshot,
+                 __entry->locks_found)
+);
+
+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 ip),
+       TP_ARGS(ip),
+
+       TP_STRUCT__entry(
+               __field(unsigned long,          ip      )
+       ),
+
+       TP_fast_assign(
+               __entry->ip = ip;
+       ),
+
+       TP_printk("%ps", (void *) __entry->ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_btree_node_reused,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_blocked_journal_reclaim,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+TRACE_EVENT(trans_restart_would_deadlock,
+       TP_PROTO(unsigned long  trans_ip,
+                unsigned long  caller_ip,
+                bool           in_traverse_all,
+                unsigned       reason,
+                enum btree_id  have_btree_id,
+                unsigned       have_iter_type,
+                struct bpos    *have_pos,
+                enum btree_id  want_btree_id,
+                unsigned       want_iter_type,
+                struct bpos    *want_pos),
+       TP_ARGS(trans_ip, 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        )
+               __field(unsigned long,          caller_ip       )
+               __field(u8,                     in_traverse_all )
+               __field(u8,                     reason          )
+               __field(u8,                     have_btree_id   )
+               __field(u8,                     have_iter_type  )
+               __field(u8,                     want_btree_id   )
+               __field(u8,                     want_iter_type  )
+
+               __field(u64,                    have_pos_inode  )
+               __field(u64,                    have_pos_offset )
+               __field(u32,                    have_pos_snapshot)
+               __field(u32,                    want_pos_snapshot)
+               __field(u64,                    want_pos_inode  )
+               __field(u64,                    want_pos_offset )
+       ),
+
+       TP_fast_assign(
+               __entry->trans_ip               = trans_ip;
+               __entry->caller_ip              = caller_ip;
+               __entry->in_traverse_all        = in_traverse_all;
+               __entry->reason                 = reason;
+               __entry->have_btree_id          = have_btree_id;
+               __entry->have_iter_type         = have_iter_type;
+               __entry->want_btree_id          = want_btree_id;
+               __entry->want_iter_type         = want_iter_type;
+
+               __entry->have_pos_inode         = have_pos->inode;
+               __entry->have_pos_offset        = have_pos->offset;
+               __entry->have_pos_snapshot      = have_pos->snapshot;
+
+               __entry->want_pos_inode         = want_pos->inode;
+               __entry->want_pos_offset        = want_pos->offset;
+               __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,
+                 (void *) __entry->caller_ip,
+                 __entry->in_traverse_all,
+                 __entry->reason,
+                 __entry->have_btree_id,
+                 __entry->have_iter_type,
+                 __entry->have_pos_inode,
+                 __entry->have_pos_offset,
+                 __entry->have_pos_snapshot,
+                 __entry->want_btree_id,
+                 __entry->want_iter_type,
+                 __entry->want_pos_inode,
+                 __entry->want_pos_offset,
+                 __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),
+
+       TP_STRUCT__entry(
+               __field(unsigned long,          trans_ip        )
+               __field(unsigned long,          caller_ip       )
+               __field(unsigned long,          bytes           )
+       ),
+
+       TP_fast_assign(
+               __entry->trans_ip       = trans_ip;
+               __entry->caller_ip      = caller_ip;
+               __entry->bytes          = bytes;
+       ),
+
+       TP_printk("%ps %pS bytes %lu",
+                 (void *) __entry->trans_ip,
+                 (void *) __entry->caller_ip,
+                 __entry->bytes)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_journal_res_get,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_journal_preres_get,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_journal_reclaim,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_mark_replicas,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_fault_inject,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_btree_node_split,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_mark,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_upgrade,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_iter_upgrade,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_relock,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_restart_traverse,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DEFINE_EVENT(transaction_restart,      trans_traverse_all,
+       TP_PROTO(unsigned long ip),
+       TP_ARGS(ip)
+);
+
+DECLARE_EVENT_CLASS(node_lock_fail,
+       TP_PROTO(unsigned level, u32 iter_seq, unsigned node, u32 node_seq),
+       TP_ARGS(level, iter_seq, node, node_seq),
+
+       TP_STRUCT__entry(
+               __field(u32,            level)
+               __field(u32,            iter_seq)
+               __field(u32,            node)
+               __field(u32,            node_seq)
+       ),
+
+       TP_fast_assign(
+               __entry->level          = level;
+               __entry->iter_seq       = iter_seq;
+               __entry->node           = node;
+               __entry->node_seq       = node_seq;
+       ),
+
+       TP_printk("level %u iter seq %u node %u node seq %u",
+                 __entry->level, __entry->iter_seq,
+                 __entry->node, __entry->node_seq)
+);
+
+DEFINE_EVENT(node_lock_fail, node_upgrade_fail,
+       TP_PROTO(unsigned level, u32 iter_seq, unsigned node, u32 node_seq),
+       TP_ARGS(level, iter_seq, node, node_seq)
+);
+
+DEFINE_EVENT(node_lock_fail, node_relock_fail,
+       TP_PROTO(unsigned level, u32 iter_seq, unsigned node, u32 node_seq),
+       TP_ARGS(level, iter_seq, node, node_seq)
 );
 
 #endif /* _TRACE_BCACHE_H */