f2fs: add detailed information of bio types in the tracepoints

This patch inserts information of bio types in more detail.
So, we can now see REQ_META and REQ_PRIO too.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 6dd1dc16a9d58b7276e68b38f0ff1bc2784d6408..33ab378df5bd80795eaf17ee1846dd42850e7697 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -846,11 +846,11 @@ static void do_submit_bio(struct f2fs_sb_info *sbi,
        if (type >= META_FLUSH)
                rw = WRITE_FLUSH_FUA;
 
-       trace_f2fs_submit_write_bio(sbi->sb, rw, btype, io->bio);
-
        if (btype == META)
                rw |= REQ_META;
 
+       trace_f2fs_submit_write_bio(sbi->sb, rw, btype, io->bio);
+
        p = io->bio->bi_private;
        p->sbi = sbi;
        io->bio->bi_end_io = f2fs_end_io_write;

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 1f59f5db55e5da1c74cb2becc1967cabb07b3822..204fcc3201b1fb6e239ed9775dc2a72315964bc5 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -16,8 +16,13 @@
                { META,         "META" },                               \
                { META_FLUSH,   "META_FLUSH" })
 
-#define show_bio_type(type)                                            \
-       __print_symbolic(type,                                          \
+#define F2FS_BIO_MASK(t)       (t & (READA | WRITE_FLUSH_FUA))
+#define F2FS_BIO_EXTRA_MASK(t) (t & (REQ_META | REQ_PRIO))
+
+#define show_bio_type(type)    show_bio_base(type), show_bio_extra(type)
+
+#define show_bio_base(type)                                            \
+       __print_symbolic(F2FS_BIO_MASK(type),                           \
                { READ,                 "READ" },                       \
                { READA,                "READAHEAD" },                  \
                { READ_SYNC,            "READ_SYNC" },                  \
@@ -27,6 +32,13 @@
                { WRITE_FUA,            "WRITE_FUA" },                  \
                { WRITE_FLUSH_FUA,      "WRITE_FLUSH_FUA" })
 
+#define show_bio_extra(type)                                           \
+       __print_symbolic(F2FS_BIO_EXTRA_MASK(type),                     \
+               { REQ_META,             "(M)" },                        \
+               { REQ_PRIO,             "(P)" },                        \
+               { REQ_META | REQ_PRIO,  "(MP)" },                       \
+               { 0, " \b" })
+
 #define show_data_type(type)                                           \
        __print_symbolic(type,                                          \
                { CURSEG_HOT_DATA,      "Hot DATA" },                   \
@@ -447,7 +459,7 @@ TRACE_EVENT_CONDITION(f2fs_readpage,
        ),
 
        TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
-               "blkaddr = 0x%llx, bio_type = %s",
+               "blkaddr = 0x%llx, bio_type = %s%s",
                show_dev_ino(__entry),
                (unsigned long)__entry->index,
                (unsigned long long)__entry->blkaddr,
@@ -621,7 +633,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio,
                __entry->size           = bio->bi_size;
        ),
 
-       TP_printk("dev = (%d,%d), %s, %s, sector = %lld, size = %u",
+       TP_printk("dev = (%d,%d), %s%s, %s, sector = %lld, size = %u",
                show_dev(__entry),
                show_bio_type(__entry->rw),
                show_block_type(__entry->type),
@@ -713,7 +725,7 @@ DECLARE_EVENT_CLASS(f2fs_io_page,
                __entry->block  = blk_addr;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, %s, %s, index = %lu, blkaddr = 0x%llx",
+       TP_printk("dev = (%d,%d), ino = %lu, %s%s, %s, index = %lu, blkaddr = 0x%llx",
                show_dev_ino(__entry),
                show_bio_type(__entry->rw),
                show_block_type(__entry->type),