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,
),
TP_fast_assign(
- __entry->dev = bio->bi_disk ? bio_dev(bio) : 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",
btree_key_cache_dirty, btree_key_cache_total),
TP_STRUCT__entry(
- __array(char, uuid, 16 )
+ __field(dev_t, dev )
__field(u64, min_nr )
__field(u64, prereserved )
__field(u64, prereserved_total )
),
TP_fast_assign(
- memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
+ __entry->dev = c->dev;
__entry->min_nr = min_nr;
__entry->prereserved = prereserved;
__entry->prereserved_total = prereserved_total;
__entry->btree_key_cache_total = btree_key_cache_total;
),
- TP_printk("%pU min %llu prereserved %llu/%llu btree cache %llu/%llu key cache %llu/%llu",
- __entry->uuid,
+ 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,
TP_ARGS(c, nr_flushed),
TP_STRUCT__entry(
- __array(char, uuid, 16 )
- __field(u64, nr_flushed )
+ __field(dev_t, dev )
+ __field(u64, nr_flushed )
),
TP_fast_assign(
- memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
- __entry->nr_flushed = nr_flushed;
+ __entry->dev = c->dev;
+ __entry->nr_flushed = nr_flushed;
),
- TP_printk("%pU flushed %llu", __entry->uuid, __entry->nr_flushed)
+ TP_printk("%d%d flushed %llu",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->nr_flushed)
);
/* bset.c: */
TP_ARGS(c, b),
TP_STRUCT__entry(
- __array(char, uuid, 16 )
+ __field(dev_t, dev )
__field(u8, level )
__field(u8, id )
__field(u64, inode )
),
TP_fast_assign(
- memcpy(__entry->uuid, c->sb.user_uuid.b, 16);
+ __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)
);
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)
);
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)
);
/* Garbage collection */
-DEFINE_EVENT(btree_node, btree_gc_coalesce,
- 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.sb->user_uuid.b, 16);
- ),
-
- 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_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_fs, gc_cannot_inc_gens,
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(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,
),
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,
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,
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,
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 )
),
TP_fast_assign(
- memcpy(__entry->uuid, c->sb.user_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 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,
);
DECLARE_EVENT_CLASS(transaction_restart,
- TP_PROTO(unsigned long ip),
- TP_ARGS(ip),
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip),
TP_STRUCT__entry(
- __field(unsigned long, ip )
+ __field(unsigned long, trans_ip )
+ __field(unsigned long, caller_ip )
),
TP_fast_assign(
- __entry->ip = ip;
+ __entry->trans_ip = trans_ip;
+ __entry->caller_ip = caller_ip;
),
- TP_printk("%ps", (void *) __entry->ip)
+ TP_printk("%ps %pS",
+ (void *) __entry->trans_ip,
+ (void *) __entry->caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart, trans_blocked_journal_reclaim,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip)
);
-DEFINE_EVENT(transaction_restart, trans_restart_btree_node_reused,
- TP_PROTO(unsigned long ip),
- TP_ARGS(ip)
+DEFINE_EVENT(transaction_restart, trans_restart_journal_res_get,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart, trans_restart_journal_preres_get,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart, trans_restart_journal_reclaim,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart, trans_restart_fault_inject,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart, trans_traverse_all,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip)
+);
+
+DEFINE_EVENT(transaction_restart, trans_restart_mark_replicas,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip),
+ TP_ARGS(trans_ip, caller_ip)
+);
+
+DECLARE_EVENT_CLASS(transaction_restart_iter,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, caller_ip, btree_id, pos),
+
+ TP_STRUCT__entry(
+ __field(unsigned long, trans_ip )
+ __field(unsigned long, caller_ip )
+ __field(u8, btree_id )
+ __field(u64, pos_inode )
+ __field(u64, pos_offset )
+ __field(u32, pos_snapshot )
+ ),
+
+ TP_fast_assign(
+ __entry->trans_ip = trans_ip;
+ __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("%ps %pS btree %u pos %llu:%llu:%u",
+ (void *) __entry->trans_ip,
+ (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(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_btree_node_split,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_mark,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_upgrade,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_iter_upgrade,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_relock,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, caller_ip, btree_id, pos)
+);
+
+DEFINE_EVENT(transaction_restart_iter, trans_restart_traverse,
+ TP_PROTO(unsigned long trans_ip,
+ unsigned long caller_ip,
+ enum btree_id btree_id,
+ struct bpos *pos),
+ TP_ARGS(trans_ip, 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;
+ ),
+
+ 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)
+);
+
+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),
+
+ 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 )
+ ),
+
+ 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;
+ ),
+
+ 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)
);
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),
- TP_ARGS(trans_ip, caller_ip, reason,
- have_btree_id, have_iter_type,
- want_btree_id, want_iter_type),
+ 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 because %u have %u:%u want %u:%u",
+ 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)
-);
-
-TRACE_EVENT(trans_restart_iters_realloced,
- TP_PROTO(unsigned long ip, unsigned nr),
- TP_ARGS(ip, nr),
-
- TP_STRUCT__entry(
- __field(unsigned long, ip )
- __field(unsigned, nr )
- ),
-
- TP_fast_assign(
- __entry->ip = ip;
- __entry->nr = nr;
- ),
-
- TP_printk("%ps nr %u", (void *) __entry->ip, __entry->nr)
+ __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 ip, unsigned long bytes),
- TP_ARGS(ip, bytes),
+ 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, ip )
- __field(unsigned long, bytes )
+ __field(unsigned long, trans_ip )
+ __field(unsigned long, caller_ip )
+ __field(unsigned long, bytes )
),
TP_fast_assign(
- __entry->ip = ip;
- __entry->bytes = bytes;
+ __entry->trans_ip = trans_ip;
+ __entry->caller_ip = caller_ip;
+ __entry->bytes = bytes;
),
- TP_printk("%ps bytes %lu", (void *) __entry->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_traverse,
- TP_PROTO(unsigned long ip),
- TP_ARGS(ip)
+ TP_printk("%ps %pS bytes %lu",
+ (void *) __entry->trans_ip,
+ (void *) __entry->caller_ip,
+ __entry->bytes)
);
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_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),
TP_STRUCT__entry(
- __field(u32, level)
- __field(u32, iter_seq)
- __field(u32, node)
- __field(u32, node_seq)
+ __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(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;
+ __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;
),
- TP_printk("level %u iter seq %u node %u node seq %u",
+ 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,
+ (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 level, u32 iter_seq, unsigned node, u32 node_seq),
- TP_ARGS(level, iter_seq, node, node_seq)
+ 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 level, u32 iter_seq, unsigned node, u32 node_seq),
- TP_ARGS(level, iter_seq, node, node_seq)
+ 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)
);
#endif /* _TRACE_BCACHE_H */
projects / bcachefs-tools-debian / blobdiff