diff --git a/kmod/src/scoutfs_trace.h b/kmod/src/scoutfs_trace.h index fce7f9bb..ed2b30fd 100644 --- a/kmod/src/scoutfs_trace.h +++ b/kmod/src/scoutfs_trace.h @@ -38,6 +38,34 @@ struct lock_info; #define FSID_ARG(sb) le64_to_cpu(SCOUTFS_SB(sb)->super.hdr.fsid) #define FSID_FMT "%llx" +DECLARE_EVENT_CLASS(scoutfs_segment_class, + TP_PROTO(struct super_block *sb, __u64 segno), + + TP_ARGS(sb, segno), + + TP_STRUCT__entry( + __field(__u64, fsid) + __field(__u64, segno) + ), + + TP_fast_assign( + __entry->fsid = FSID_ARG(sb); + __entry->segno = segno; + ), + + TP_printk(FSID_FMT" segno %llu", __entry->fsid, __entry->segno) +); + +DEFINE_EVENT(scoutfs_segment_class, scoutfs_seg_submit_read, + TP_PROTO(struct super_block *sb, __u64 segno), + TP_ARGS(sb, segno) +); + +DEFINE_EVENT(scoutfs_segment_class, scoutfs_seg_submit_write, + TP_PROTO(struct super_block *sb, __u64 segno), + TP_ARGS(sb, segno) +); + DECLARE_EVENT_CLASS(scoutfs_lock_info_class, TP_PROTO(struct super_block *sb, struct lock_info *linfo), diff --git a/kmod/src/seg.c b/kmod/src/seg.c index 1cda3462..039530d4 100644 --- a/kmod/src/seg.c +++ b/kmod/src/seg.c @@ -305,7 +305,7 @@ struct scoutfs_segment *scoutfs_seg_submit_read(struct super_block *sb, struct scoutfs_segment *seg; unsigned long flags; - trace_printk("segno %llu\n", segno); + trace_scoutfs_seg_submit_read(sb, segno); spin_lock_irqsave(&cac->lock, flags); seg = find_seg(&cac->root, segno); @@ -340,7 +340,7 @@ int scoutfs_seg_submit_write(struct super_block *sb, struct scoutfs_segment *seg, struct scoutfs_bio_completion *comp) { - trace_printk("submitting segno %llu\n", seg->segno); + trace_scoutfs_seg_submit_write(sb, seg->segno); scoutfs_bio_submit_comp(sb, WRITE, seg->pages, segno_to_blkno(seg->segno),