nilfs2: add tracepoints for analyzing reading and writing metadata files

This patch adds tracepoints for analyzing requests of reading and writing
metadata files.  The tracepoints cover every in-place mdt files (cpfile,
sufile, and datfile).

Example of tracing mdt_insert_new_block():
              cp-14635 [000] ...1 30598.199309: nilfs2_mdt_insert_new_block: inode = ffff88022a8d0178 ino = 3 block = 155
              cp-14635 [000] ...1 30598.199520: nilfs2_mdt_insert_new_block: inode = ffff88022a8d0178 ino = 3 block = 5
              cp-14635 [000] ...1 30598.200828: nilfs2_mdt_insert_new_block: inode = ffff88022a8d0178 ino = 3 block = 253

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: TK Kato <TK.Kato@wdc.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index dee34d9902813fe1dc1d1e1703445ca8ac013284..1125f40233ffd9c849acc0f13d432f520de95e0a 100644 (file)
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -33,6 +33,7 @@
 #include "page.h"
 #include "mdt.h"
 
+#include <trace/events/nilfs2.h>
 
 #define NILFS_MDT_MAX_RA_BLOCKS                (16 - 1)
 
@@ -68,6 +69,9 @@ nilfs_mdt_insert_new_block(struct inode *inode, unsigned long block,
        set_buffer_uptodate(bh);
        mark_buffer_dirty(bh);
        nilfs_mdt_mark_dirty(inode);
+
+       trace_nilfs2_mdt_insert_new_block(inode, inode->i_ino, block);
+
        return 0;
 }
 
@@ -158,6 +162,8 @@ nilfs_mdt_submit_block(struct inode *inode, unsigned long blkoff,
        get_bh(bh);
        submit_bh(mode, bh);
        ret = 0;
+
+       trace_nilfs2_mdt_submit_block(inode, inode->i_ino, blkoff, mode);
  out:
        get_bh(bh);
        *out_bh = bh;

diff --git a/include/trace/events/nilfs2.h b/include/trace/events/nilfs2.h
index 1b65ba6879258668edcda584ad7c6390ec70425f..c7805818fcc6cadfebd3eeeff33c9db08bc26abc 100644 (file)
--- a/include/trace/events/nilfs2.h
+++ b/include/trace/events/nilfs2.h
@@ -162,6 +162,60 @@ TRACE_EVENT(nilfs2_segment_usage_freed,
                      __entry->segnum)
 );
 
+TRACE_EVENT(nilfs2_mdt_insert_new_block,
+           TP_PROTO(struct inode *inode,
+                    unsigned long ino,
+                    unsigned long block),
+
+           TP_ARGS(inode, ino, block),
+
+           TP_STRUCT__entry(
+                   __field(struct inode *, inode)
+                   __field(unsigned long, ino)
+                   __field(unsigned long, block)
+           ),
+
+           TP_fast_assign(
+                   __entry->inode = inode;
+                   __entry->ino = ino;
+                   __entry->block = block;
+                   ),
+
+           TP_printk("inode = %p ino = %lu block = %lu",
+                     __entry->inode,
+                     __entry->ino,
+                     __entry->block)
+);
+
+TRACE_EVENT(nilfs2_mdt_submit_block,
+           TP_PROTO(struct inode *inode,
+                    unsigned long ino,
+                    unsigned long blkoff,
+                    int mode),
+
+           TP_ARGS(inode, ino, blkoff, mode),
+
+           TP_STRUCT__entry(
+                   __field(struct inode *, inode)
+                   __field(unsigned long, ino)
+                   __field(unsigned long, blkoff)
+                   __field(int, mode)
+           ),
+
+           TP_fast_assign(
+                   __entry->inode = inode;
+                   __entry->ino = ino;
+                   __entry->blkoff = blkoff;
+                   __entry->mode = mode;
+                   ),
+
+           TP_printk("inode = %p ino = %lu blkoff = %lu mode = %x",
+                     __entry->inode,
+                     __entry->ino,
+                     __entry->blkoff,
+                     __entry->mode)
+);
+
 #endif /* _TRACE_NILFS2_H */
 
 /* This part must be outside protection */