]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - include/trace/events/bcachefs.h
Update bcachefs sources to bdf6d7c135 fixup! bcachefs: Kill journal buf bloom filter
[bcachefs-tools-debian] / include / trace / events / bcachefs.h
index 0c9f3de5288de6def0afb63b7badf81c970c8371..b96b25741b68a01d94c5994157cbb70c36139634 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,36 +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      )
-               __field(unsigned,       tier            )
-       ),
-
-       TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
-               __entry->tier = ca->mi.tier;
-       ),
-
-       TP_printk("%pU tier %u", __entry->uuid, __entry->tier)
-);
-
 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,
@@ -87,10 +71,10 @@ DECLARE_EVENT_CLASS(bio,
        ),
 
        TP_fast_assign(
-               __entry->dev            = bio->bi_bdev ? bio->bi_bdev->bd_dev : 0;
+               __entry->dev            = bio->bi_bdev ? bio_dev(bio) : 0;
                __entry->sector         = bio->bi_iter.bi_sector;
                __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
-               blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+               blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
        ),
 
        TP_printk("%d,%d  %s %llu + %u",
@@ -98,21 +82,24 @@ DECLARE_EVENT_CLASS(bio,
                  (unsigned long long)__entry->sector, __entry->nr_sector)
 );
 
-DECLARE_EVENT_CLASS(page_alloc_fail,
-       TP_PROTO(struct bch_fs *c, u64 size),
-       TP_ARGS(c, size),
+/* super-io.c: */
+TRACE_EVENT(write_super,
+       TP_PROTO(struct bch_fs *c, unsigned long ip),
+       TP_ARGS(c, ip),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,   16      )
-               __field(u64,            size            )
+               __field(dev_t,          dev     )
+               __field(unsigned long,  ip      )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
-               __entry->size = size;
+               __entry->dev            = c->dev;
+               __entry->ip             = ip;
        ),
 
-       TP_printk("%pU size %llu", __entry->uuid, __entry->size)
+       TP_printk("%d,%d for %pS",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 (void *) __entry->ip)
 );
 
 /* io.c: */
@@ -137,34 +124,6 @@ DEFINE_EVENT(bio, promote,
        TP_ARGS(bio)
 );
 
-TRACE_EVENT(write_throttle,
-       TP_PROTO(struct bch_fs *c, u64 inode, struct bio *bio, u64 delay),
-       TP_ARGS(c, inode, bio, delay),
-
-       TP_STRUCT__entry(
-               __array(char,           uuid,   16              )
-               __field(u64,            inode                   )
-               __field(sector_t,       sector                  )
-               __field(unsigned int,   nr_sector               )
-               __array(char,           rwbs,   6               )
-               __field(u64,            delay                   )
-       ),
-
-       TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
-               __entry->inode          = inode;
-               __entry->sector         = bio->bi_iter.bi_sector;
-               __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
-               blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
-               __entry->delay          = delay;
-       ),
-
-       TP_printk("%pU inode %llu  %s %llu + %u delay %llu",
-                 __entry->uuid, __entry->inode,
-                 __entry->rwbs, (unsigned long long)__entry->sector,
-                 __entry->nr_sector, __entry->delay)
-);
-
 /* Journal */
 
 DEFINE_EVENT(bch_fs, journal_full,
@@ -182,10 +141,83 @@ DEFINE_EVENT(bio, journal_write,
        TP_ARGS(bio)
 );
 
+TRACE_EVENT(journal_reclaim_start,
+       TP_PROTO(struct bch_fs *c, bool direct, bool kicked,
+                u64 min_nr, u64 min_key_cache,
+                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, direct, kicked, min_nr, min_key_cache, 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(bool,           direct                  )
+               __field(bool,           kicked                  )
+               __field(u64,            min_nr                  )
+               __field(u64,            min_key_cache           )
+               __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->direct                 = direct;
+               __entry->kicked                 = kicked;
+               __entry->min_nr                 = min_nr;
+               __entry->min_key_cache          = min_key_cache;
+               __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 direct %u kicked %u min %llu key cache %llu prereserved %llu/%llu btree cache %llu/%llu key cache %llu/%llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->direct,
+                 __entry->kicked,
+                 __entry->min_nr,
+                 __entry->min_key_cache,
+                 __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)
+);
+
+/* allocator: */
+
 /* bset.c: */
 
 DEFINE_EVENT(bpos, bkey_pack_pos_fail,
-       TP_PROTO(struct bpos p),
+       TP_PROTO(struct bpos *p),
        TP_ARGS(p)
 );
 
@@ -196,7 +228,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                   )
@@ -204,15 +236,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)
 );
 
@@ -226,7 +259,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                 )
        ),
@@ -256,32 +289,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)
 );
@@ -296,43 +314,22 @@ 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)
 );
 
-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->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)
@@ -343,333 +340,675 @@ 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_rewrite,
+       TP_PROTO(struct bch_fs *c, struct btree *b),
+       TP_ARGS(c, b)
+);
 
-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),
+TRACE_EVENT(btree_cache_scan,
+       TP_PROTO(long nr_to_scan, long can_free, long ret),
+       TP_ARGS(nr_to_scan, can_free, ret),
 
        TP_STRUCT__entry(
-               __field(u8,             reason                  )
-               __array(char,           uuid,   16              )
+               __field(long,   nr_to_scan              )
+               __field(long,   can_free                )
+               __field(long,   ret                     )
        ),
 
        TP_fast_assign(
-               __entry->reason         = reason;
-               memcpy(__entry->uuid, c->disk_sb->user_uuid.b, 16);
+               __entry->nr_to_scan     = nr_to_scan;
+               __entry->can_free       = can_free;
+               __entry->ret            = ret;
        ),
 
-       TP_printk("%pU: %u", __entry->uuid, __entry->reason)
-);
-
-DEFINE_EVENT(btree_node, btree_gc_rewrite_node,
-       TP_PROTO(struct bch_fs *c, struct btree *b),
-       TP_ARGS(c, b)
+       TP_printk("scanned for %li nodes, can free %li, ret %li",
+                 __entry->nr_to_scan, __entry->can_free, __entry->ret)
 );
 
-DEFINE_EVENT(btree_node, btree_gc_rewrite_node_fail,
-       TP_PROTO(struct bch_fs *c, struct btree *b),
-       TP_ARGS(c, b)
-);
+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),
 
-DEFINE_EVENT(bch_fs, gc_start,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
-);
-
-DEFINE_EVENT(bch_fs, gc_end,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
-);
-
-DEFINE_EVENT(bch_fs, gc_coalesce_start,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
-);
+       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   )
+       ),
 
-DEFINE_EVENT(bch_fs, gc_coalesce_end,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
+       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)
 );
 
-DEFINE_EVENT(bch_dev, sectors_saturated,
-       TP_PROTO(struct bch_dev *ca),
-       TP_ARGS(ca)
-);
+/* Garbage collection */
 
-DEFINE_EVENT(bch_fs, gc_sectors_saturated,
+DEFINE_EVENT(bch_fs, gc_gens_start,
        TP_PROTO(struct bch_fs *c),
        TP_ARGS(c)
 );
 
-DEFINE_EVENT(bch_fs, gc_cannot_inc_gens,
+DEFINE_EVENT(bch_fs, gc_gens_end,
        TP_PROTO(struct bch_fs *c),
        TP_ARGS(c)
 );
 
 /* Allocator */
 
-TRACE_EVENT(alloc_batch,
-       TP_PROTO(struct bch_dev *ca, size_t free, size_t total),
-       TP_ARGS(ca, free, total),
+TRACE_EVENT(bucket_alloc,
+       TP_PROTO(struct bch_dev *ca, const char *alloc_reserve),
+       TP_ARGS(ca, alloc_reserve),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,   16      )
-               __field(size_t,         free            )
-               __field(size_t,         total           )
+               __field(dev_t,                  dev     )
+               __array(char,   reserve,        16      )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
-               __entry->free = free;
-               __entry->total = total;
+               __entry->dev            = ca->dev;
+               strlcpy(__entry->reserve, alloc_reserve, sizeof(__entry->reserve));
        ),
 
-       TP_printk("%pU free %zu total %zu",
-               __entry->uuid, __entry->free, __entry->total)
+       TP_printk("%d,%d reserve %s",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->reserve)
 );
 
-DEFINE_EVENT(bch_dev, prio_write_start,
-       TP_PROTO(struct bch_dev *ca),
-       TP_ARGS(ca)
-);
+TRACE_EVENT(bucket_alloc_fail,
+       TP_PROTO(struct bch_dev *ca, const char *alloc_reserve,
+                u64 avail,
+                u64 seen,
+                u64 open,
+                u64 need_journal_commit,
+                u64 nouse,
+                bool nonblocking,
+                int ret),
+       TP_ARGS(ca, alloc_reserve, avail, seen, open, need_journal_commit, nouse, nonblocking, ret),
 
-DEFINE_EVENT(bch_dev, prio_write_end,
-       TP_PROTO(struct bch_dev *ca),
-       TP_ARGS(ca)
-);
+       TP_STRUCT__entry(
+               __field(dev_t,                  dev                     )
+               __array(char,   reserve,        16                      )
+               __field(u64,                    avail                   )
+               __field(u64,                    seen                    )
+               __field(u64,                    open                    )
+               __field(u64,                    need_journal_commit     )
+               __field(u64,                    nouse                   )
+               __field(bool,                   nonblocking             )
+               __field(int,                    ret                     )
+       ),
 
-TRACE_EVENT(invalidate,
-       TP_PROTO(struct bch_dev *ca, u64 offset, unsigned sectors),
-       TP_ARGS(ca, offset, sectors),
+       TP_fast_assign(
+               __entry->dev            = ca->dev;
+               strlcpy(__entry->reserve, alloc_reserve, sizeof(__entry->reserve));
+               __entry->avail          = avail;
+               __entry->seen           = seen;
+               __entry->open           = open;
+               __entry->need_journal_commit = need_journal_commit;
+               __entry->nouse          = nouse;
+               __entry->nonblocking    = nonblocking;
+               __entry->ret            = ret;
+       ),
+
+       TP_printk("%d,%d reserve %s avail %llu seen %llu open %llu need_journal_commit %llu nouse %llu nonblocking %u ret %i",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->reserve,
+                 __entry->avail,
+                 __entry->seen,
+                 __entry->open,
+                 __entry->need_journal_commit,
+                 __entry->nouse,
+                 __entry->nonblocking,
+                 __entry->ret)
+);
+
+TRACE_EVENT(discard_buckets,
+       TP_PROTO(struct bch_fs *c, u64 seen, u64 open,
+                u64 need_journal_commit, u64 discarded, int ret),
+       TP_ARGS(c, seen, open, need_journal_commit, discarded, ret),
 
        TP_STRUCT__entry(
-               __field(unsigned,       sectors                 )
                __field(dev_t,          dev                     )
-               __field(__u64,          offset                  )
+               __field(u64,            seen                    )
+               __field(u64,            open                    )
+               __field(u64,            need_journal_commit     )
+               __field(u64,            discarded               )
+               __field(int,            ret                     )
        ),
 
        TP_fast_assign(
-               __entry->dev            = ca->disk_sb.bdev->bd_dev;
-               __entry->offset         = offset,
-               __entry->sectors        = sectors;
+               __entry->dev                    = c->dev;
+               __entry->seen                   = seen;
+               __entry->open                   = open;
+               __entry->need_journal_commit    = need_journal_commit;
+               __entry->discarded              = discarded;
+               __entry->ret                    = ret;
        ),
 
-       TP_printk("invalidated %u sectors at %d,%d sector=%llu",
-                 __entry->sectors, MAJOR(__entry->dev),
-                 MINOR(__entry->dev), __entry->offset)
+       TP_printk("%d%d seen %llu open %llu need_journal_commit %llu discarded %llu ret %i",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->seen,
+                 __entry->open,
+                 __entry->need_journal_commit,
+                 __entry->discarded,
+                 __entry->ret)
 );
 
-DEFINE_EVENT(bch_fs, rescale_prios,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
-);
-
-DECLARE_EVENT_CLASS(bucket_alloc,
-       TP_PROTO(struct bch_dev *ca, enum alloc_reserve reserve),
-       TP_ARGS(ca, reserve),
+TRACE_EVENT(invalidate_bucket,
+       TP_PROTO(struct bch_fs *c, unsigned dev, u64 bucket),
+       TP_ARGS(c, dev, bucket),
 
        TP_STRUCT__entry(
-               __array(char,                   uuid,   16)
-               __field(enum alloc_reserve,     reserve   )
+               __field(dev_t,          dev                     )
+               __field(u32,            dev_idx                 )
+               __field(u64,            bucket                  )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
-               __entry->reserve = reserve;
+               __entry->dev            = c->dev;
+               __entry->dev_idx        = dev;
+               __entry->bucket         = bucket;
        ),
 
-       TP_printk("%pU reserve %d", __entry->uuid, __entry->reserve)
+       TP_printk("%d:%d invalidated %u:%llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->dev_idx, __entry->bucket)
+);
+
+/* Moving IO */
+
+DEFINE_EVENT(bkey, move_extent,
+       TP_PROTO(const struct bkey *k),
+       TP_ARGS(k)
 );
 
-DEFINE_EVENT(bucket_alloc, bucket_alloc,
-       TP_PROTO(struct bch_dev *ca, enum alloc_reserve reserve),
-       TP_ARGS(ca, reserve)
+DEFINE_EVENT(bkey, move_alloc_mem_fail,
+       TP_PROTO(const struct bkey *k),
+       TP_ARGS(k)
 );
 
-DEFINE_EVENT(bucket_alloc, bucket_alloc_fail,
-       TP_PROTO(struct bch_dev *ca, enum alloc_reserve reserve),
-       TP_ARGS(ca, reserve)
+DEFINE_EVENT(bkey, move_race,
+       TP_PROTO(const struct bkey *k),
+       TP_ARGS(k)
 );
 
-TRACE_EVENT(freelist_empty_fail,
-       TP_PROTO(struct bch_fs *c, enum alloc_reserve reserve,
-                struct closure *cl),
-       TP_ARGS(c, reserve, cl),
+TRACE_EVENT(move_data,
+       TP_PROTO(struct bch_fs *c, u64 sectors_moved,
+                u64 keys_moved),
+       TP_ARGS(c, sectors_moved, keys_moved),
 
        TP_STRUCT__entry(
-               __array(char,                   uuid,   16      )
-               __field(enum alloc_reserve,     reserve         )
-               __field(struct closure *,       cl              )
+               __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->reserve = reserve;
-               __entry->cl = cl;
+               __entry->dev                    = c->dev;
+               __entry->sectors_moved = sectors_moved;
+               __entry->keys_moved = keys_moved;
        ),
 
-       TP_printk("%pU reserve %d cl %p", __entry->uuid, __entry->reserve,
-                 __entry->cl)
+       TP_printk("%d,%d sectors_moved %llu keys_moved %llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->sectors_moved, __entry->keys_moved)
 );
 
-DECLARE_EVENT_CLASS(open_bucket_alloc,
-       TP_PROTO(struct bch_fs *c, struct closure *cl),
-       TP_ARGS(c, cl),
+TRACE_EVENT(copygc,
+       TP_PROTO(struct bch_fs *c,
+                u64 sectors_moved, u64 sectors_not_moved,
+                u64 buckets_moved, u64 buckets_not_moved),
+       TP_ARGS(c,
+               sectors_moved, sectors_not_moved,
+               buckets_moved, buckets_not_moved),
 
        TP_STRUCT__entry(
-               __array(char,                   uuid,   16      )
-               __field(struct closure *,       cl              )
+               __field(dev_t,          dev                     )
+               __field(u64,            sectors_moved           )
+               __field(u64,            sectors_not_moved       )
+               __field(u64,            buckets_moved           )
+               __field(u64,            buckets_not_moved       )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
-               __entry->cl = cl;
+               __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 cl %p",
-                 __entry->uuid, __entry->cl)
+       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)
 );
 
-DEFINE_EVENT(open_bucket_alloc, open_bucket_alloc,
-       TP_PROTO(struct bch_fs *c, struct closure *cl),
-       TP_ARGS(c, cl)
-);
+TRACE_EVENT(copygc_wait,
+       TP_PROTO(struct bch_fs *c,
+                u64 wait_amount, u64 until),
+       TP_ARGS(c, wait_amount, until),
 
-DEFINE_EVENT(open_bucket_alloc, open_bucket_alloc_fail,
-       TP_PROTO(struct bch_fs *c, struct closure *cl),
-       TP_ARGS(c, cl)
-);
+       TP_STRUCT__entry(
+               __field(dev_t,          dev                     )
+               __field(u64,            wait_amount             )
+               __field(u64,            until                   )
+       ),
 
-/* Moving IO */
+       TP_fast_assign(
+               __entry->dev            = c->dev;
+               __entry->wait_amount    = wait_amount;
+               __entry->until          = until;
+       ),
 
-DECLARE_EVENT_CLASS(moving_io,
-       TP_PROTO(struct bkey *k),
-       TP_ARGS(k),
+       TP_printk("%d,%u waiting for %llu sectors until %llu",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->wait_amount, __entry->until)
+);
+
+DECLARE_EVENT_CLASS(transaction_event,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip),
 
        TP_STRUCT__entry(
-               __field(__u32,          inode                   )
-               __field(__u64,          offset                  )
-               __field(__u32,          sectors                 )
+               __array(char,                   trans_fn, 24    )
+               __field(unsigned long,          caller_ip       )
        ),
 
        TP_fast_assign(
-               __entry->inode          = k->p.inode;
-               __entry->offset         = k->p.offset;
-               __entry->sectors        = k->size;
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
+               __entry->caller_ip              = caller_ip;
        ),
 
-       TP_printk("%u:%llu sectors %u",
-                 __entry->inode, __entry->offset, __entry->sectors)
+       TP_printk("%s %pS", __entry->trans_fn, (void *) __entry->caller_ip)
 );
 
-DEFINE_EVENT(moving_io, move_read,
-       TP_PROTO(struct bkey *k),
-       TP_ARGS(k)
+DEFINE_EVENT(transaction_event,        transaction_commit,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
 );
 
-DEFINE_EVENT(moving_io, move_read_done,
-       TP_PROTO(struct bkey *k),
-       TP_ARGS(k)
+DEFINE_EVENT(transaction_event,        transaction_restart_ip,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
 );
 
-DEFINE_EVENT(moving_io, move_write,
-       TP_PROTO(struct bkey *k),
-       TP_ARGS(k)
+DEFINE_EVENT(transaction_event,        trans_blocked_journal_reclaim,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
 );
 
-DEFINE_EVENT(moving_io, copy_collision,
-       TP_PROTO(struct bkey *k),
-       TP_ARGS(k)
+DEFINE_EVENT(transaction_event,        trans_restart_journal_res_get,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
+);
+
+DEFINE_EVENT(transaction_event,        trans_restart_journal_preres_get,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
 );
 
-/* Copy GC */
+DEFINE_EVENT(transaction_event,        trans_restart_journal_reclaim,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
+);
 
-DEFINE_EVENT(page_alloc_fail, moving_gc_alloc_fail,
-       TP_PROTO(struct bch_fs *c, u64 size),
-       TP_ARGS(c, size)
+DEFINE_EVENT(transaction_event,        trans_restart_fault_inject,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
 );
 
-DEFINE_EVENT(bch_dev, moving_gc_start,
-       TP_PROTO(struct bch_dev *ca),
-       TP_ARGS(ca)
+DEFINE_EVENT(transaction_event,        trans_traverse_all,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
 );
 
-TRACE_EVENT(moving_gc_end,
-       TP_PROTO(struct bch_dev *ca, u64 sectors_moved, u64 keys_moved,
-               u64 buckets_moved),
-       TP_ARGS(ca, sectors_moved, keys_moved, buckets_moved),
+DEFINE_EVENT(transaction_event,        trans_restart_mark_replicas,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
+);
+
+DEFINE_EVENT(transaction_event,        trans_restart_key_cache_raced,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip),
+       TP_ARGS(trans_fn, caller_ip)
+);
+
+DECLARE_EVENT_CLASS(transaction_restart_iter,
+       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(
-               __array(char,           uuid,   16      )
-               __field(u64,            sectors_moved   )
-               __field(u64,            keys_moved      )
-               __field(u64,            buckets_moved   )
+               __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    )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, ca->uuid.b, 16);
-               __entry->sectors_moved = sectors_moved;
-               __entry->keys_moved = keys_moved;
-               __entry->buckets_moved = buckets_moved;
+               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;
        ),
 
-       TP_printk("%pU sectors_moved %llu keys_moved %llu buckets_moved %llu",
-               __entry->uuid, __entry->sectors_moved, __entry->keys_moved,
-               __entry->buckets_moved)
-);
+       TP_printk("%s %pS btree %u pos %llu:%llu:%u",
+                 __entry->trans_fn,
+                 (void *) __entry->caller_ip,
+                 __entry->btree_id,
+                 __entry->pos_inode,
+                 __entry->pos_offset,
+                 __entry->pos_snapshot)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_btree_node_reused,
+       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)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_btree_node_split,
+       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)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_upgrade,
+       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)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_iter_upgrade,
+       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)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock,
+       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)
+);
+
+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_fn, caller_ip, btree_id, pos)
+);
+
+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)
+);
+
+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)
+);
+
+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)
+);
+
+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)
+);
+
+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)
+);
+
+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)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_memory_allocation_failure,
+       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(const char *trans_fn,
+                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_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(
+               __array(char,                   trans_fn, 24    )
+               __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 )
+       ),
 
-DEFINE_EVENT(bkey, gc_copy,
-       TP_PROTO(const struct bkey *k),
-       TP_ARGS(k)
-);
+       TP_fast_assign(
+               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;
+               __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("%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,
+                 __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_would_deadlock_write,
+       TP_PROTO(const char *trans_fn),
+       TP_ARGS(trans_fn),
 
-/* Tiering */
+       TP_STRUCT__entry(
+               __array(char,                   trans_fn, 24    )
+       ),
 
-DEFINE_EVENT(page_alloc_fail, tiering_alloc_fail,
-       TP_PROTO(struct bch_fs *c, u64 size),
-       TP_ARGS(c, size)
-);
+       TP_fast_assign(
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
+       ),
 
-DEFINE_EVENT(bch_fs, tiering_start,
-       TP_PROTO(struct bch_fs *c),
-       TP_ARGS(c)
+       TP_printk("%s", __entry->trans_fn)
 );
 
-TRACE_EVENT(tiering_end,
-       TP_PROTO(struct bch_fs *c, u64 sectors_moved,
-               u64 keys_moved),
-       TP_ARGS(c, sectors_moved, keys_moved),
+TRACE_EVENT(trans_restart_mem_realloced,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                unsigned long bytes),
+       TP_ARGS(trans_fn, caller_ip, bytes),
 
        TP_STRUCT__entry(
-               __array(char,           uuid,   16      )
-               __field(u64,            sectors_moved   )
-               __field(u64,            keys_moved      )
+               __array(char,                   trans_fn, 24    )
+               __field(unsigned long,          caller_ip       )
+               __field(unsigned long,          bytes           )
        ),
 
        TP_fast_assign(
-               memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
-               __entry->sectors_moved = sectors_moved;
-               __entry->keys_moved = keys_moved;
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
+               __entry->caller_ip      = caller_ip;
+               __entry->bytes          = bytes;
        ),
 
-       TP_printk("%pU sectors_moved %llu keys_moved %llu",
-               __entry->uuid, __entry->sectors_moved, __entry->keys_moved)
+       TP_printk("%s %pS bytes %lu",
+                 __entry->trans_fn,
+                 (void *) __entry->caller_ip,
+                 __entry->bytes)
 );
 
-DEFINE_EVENT(bkey, tiering_copy,
-       TP_PROTO(const struct bkey *k),
-       TP_ARGS(k)
+TRACE_EVENT(trans_restart_key_cache_key_realloced,
+       TP_PROTO(const char *trans_fn,
+                unsigned long caller_ip,
+                enum btree_id btree_id,
+                struct bpos *pos,
+                unsigned old_u64s,
+                unsigned new_u64s),
+       TP_ARGS(trans_fn, caller_ip, btree_id, pos, old_u64s, new_u64s),
+
+       TP_STRUCT__entry(
+               __array(char,                   trans_fn, 24    )
+               __field(unsigned long,          caller_ip       )
+               __field(enum btree_id,          btree_id        )
+               __field(u64,                    inode           )
+               __field(u64,                    offset          )
+               __field(u32,                    snapshot        )
+               __field(u32,                    old_u64s        )
+               __field(u32,                    new_u64s        )
+       ),
+
+       TP_fast_assign(
+               strncpy(__entry->trans_fn, trans_fn, sizeof(__entry->trans_fn));
+               __entry->caller_ip      = caller_ip;
+               __entry->btree_id       = btree_id;
+               __entry->inode          = pos->inode;
+               __entry->offset         = pos->offset;
+               __entry->snapshot       = pos->snapshot;
+               __entry->old_u64s       = old_u64s;
+               __entry->new_u64s       = new_u64s;
+       ),
+
+       TP_printk("%s %pS btree %s pos %llu:%llu:%u old_u64s %u new_u64s %u",
+                 __entry->trans_fn,
+                 (void *) __entry->caller_ip,
+                 bch2_btree_ids[__entry->btree_id],
+                 __entry->inode,
+                 __entry->offset,
+                 __entry->snapshot,
+                 __entry->old_u64s,
+                 __entry->new_u64s)
 );
 
 #endif /* _TRACE_BCACHE_H */