nilfs2: add tracepoints for analyzing sufile manipulation

This patch adds tracepoints which would be useful for analyzing segment
usage from a perspective of high level sufile manipulation (check, alloc,
free).  sufile is an important in-place updated metadata file, so
analyzing the behavior would be useful for performance turning.

example of usage (a case of allocation):

$ sudo bin/tpoint nilfs2:nilfs2_segment_usage_allocated
Tracing nilfs2:nilfs2_segment_usage_allocated. Ctrl-C to end.
        segctord-17800 [002] ...1 10671.867294: nilfs2_segment_usage_allocated: sufile = ffff880054f908a8 segnum = 2
        segctord-17800 [002] ...1 10675.073477: nilfs2_segment_usage_allocated: sufile = ffff880054f908a8 segnum = 3

Signed-off-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benixon Dhas <benixon.dhas@wdc.com>
Cc: TK Kato <TK.Kato@wdc.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c
index 2a869c35c3622386ac0fdc774681df65c59f7093..7ff8f15207ab44840c9bf3b65480c38ae3e60245 100644 (file)
--- a/fs/nilfs2/sufile.c
+++ b/fs/nilfs2/sufile.c
@@ -30,6 +30,8 @@
 #include "mdt.h"
 #include "sufile.h"
 
+#include <trace/events/nilfs2.h>
+
 /**
  * struct nilfs_sufile_info - on-memory private data of sufile
  * @mi: on-memory private data of metadata file
@@ -358,6 +360,7 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)
                                break; /* never happens */
                        }
                }
+               trace_nilfs2_segment_usage_check(sufile, segnum, cnt);
                ret = nilfs_sufile_get_segment_usage_block(sufile, segnum, 1,
                                                           &su_bh);
                if (ret < 0)
@@ -388,6 +391,9 @@ int nilfs_sufile_alloc(struct inode *sufile, __u64 *segnump)
                        nilfs_mdt_mark_dirty(sufile);
                        brelse(su_bh);
                        *segnump = segnum;
+
+                       trace_nilfs2_segment_usage_allocated(sufile, segnum);
+
                        goto out_header;
                }
 
@@ -490,6 +496,8 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum,
        NILFS_SUI(sufile)->ncleansegs++;
 
        nilfs_mdt_mark_dirty(sufile);
+
+       trace_nilfs2_segment_usage_freed(sufile, segnum);
 }
 
 /**

diff --git a/include/trace/events/nilfs2.h b/include/trace/events/nilfs2.h
index e5649ac211caf04cbdf1d74e17858b97a6ca5968..1b65ba6879258668edcda584ad7c6390ec70425f 100644 (file)
--- a/include/trace/events/nilfs2.h
+++ b/include/trace/events/nilfs2.h
@@ -95,6 +95,73 @@ TRACE_EVENT(nilfs2_transaction_transition,
                      show_transaction_state(__entry->state))
 );
 
+TRACE_EVENT(nilfs2_segment_usage_check,
+           TP_PROTO(struct inode *sufile,
+                    __u64 segnum,
+                    unsigned long cnt),
+
+           TP_ARGS(sufile, segnum, cnt),
+
+           TP_STRUCT__entry(
+                   __field(struct inode *, sufile)
+                   __field(__u64, segnum)
+                   __field(unsigned long, cnt)
+           ),
+
+           TP_fast_assign(
+                   __entry->sufile = sufile;
+                   __entry->segnum = segnum;
+                   __entry->cnt = cnt;
+                   ),
+
+           TP_printk("sufile = %p segnum = %llu cnt = %lu",
+                     __entry->sufile,
+                     __entry->segnum,
+                     __entry->cnt)
+);
+
+TRACE_EVENT(nilfs2_segment_usage_allocated,
+           TP_PROTO(struct inode *sufile,
+                    __u64 segnum),
+
+           TP_ARGS(sufile, segnum),
+
+           TP_STRUCT__entry(
+                   __field(struct inode *, sufile)
+                   __field(__u64, segnum)
+           ),
+
+           TP_fast_assign(
+                   __entry->sufile = sufile;
+                   __entry->segnum = segnum;
+                   ),
+
+           TP_printk("sufile = %p segnum = %llu",
+                     __entry->sufile,
+                     __entry->segnum)
+);
+
+TRACE_EVENT(nilfs2_segment_usage_freed,
+           TP_PROTO(struct inode *sufile,
+                    __u64 segnum),
+
+           TP_ARGS(sufile, segnum),
+
+           TP_STRUCT__entry(
+                   __field(struct inode *, sufile)
+                   __field(__u64, segnum)
+           ),
+
+           TP_fast_assign(
+                   __entry->sufile = sufile;
+                   __entry->segnum = segnum;
+                   ),
+
+           TP_printk("sufile = %p segnum = %llu",
+                     __entry->sufile,
+                     __entry->segnum)
+);
+
 #endif /* _TRACE_NILFS2_H */
 
 /* This part must be outside protection */