f2fs: add some tracepoints to debug volatile and atomic writes

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 486113db97b1d4186a709966344ad25390683831..241b98741df98cde9ceb1a14ded9dc43645f3fb1 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1287,9 +1287,11 @@ int do_write_data_page(struct page *page, struct f2fs_io_info *fio)
                        need_inplace_update(inode))) {
                rewrite_data_page(page, fio);
                set_inode_flag(F2FS_I(inode), FI_UPDATE_WRITE);
+               trace_f2fs_do_write_data_page(page, IPU);
        } else {
                write_data_page(page, &dn, fio);
                f2fs_update_extent_cache(&dn);
+               trace_f2fs_do_write_data_page(page, OPU);
                set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE);
                if (page->index == 0)
                        set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 9e378179ff9384bb32561e011d1aa7a6112738a7..c9818193e15e2d33f9749ca9a910241ff28fcfe2 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -556,6 +556,10 @@ enum page_type {
        META,
        NR_PAGE_TYPE,
        META_FLUSH,
+       INMEM,          /* the below types are used by tracepoints only. */
+       INMEM_DROP,
+       IPU,
+       OPU,
 };
 
 struct f2fs_io_info {

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index eafaf728236ba1ae364480c67c2ec3836114d866..f939660941bbc7a69fc24d84023e7561134f687b 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -205,6 +205,8 @@ retry:
        list_add_tail(&new->list, &fi->inmem_pages);
        inc_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES);
        mutex_unlock(&fi->inmem_lock);
+
+       trace_f2fs_register_inmem_page(page, INMEM);
 }
 
 void commit_inmem_pages(struct inode *inode, bool abort)
@@ -238,11 +240,13 @@ void commit_inmem_pages(struct inode *inode, bool abort)
                                f2fs_wait_on_page_writeback(cur->page, DATA);
                                if (clear_page_dirty_for_io(cur->page))
                                        inode_dec_dirty_pages(inode);
+                               trace_f2fs_commit_inmem_page(cur->page, INMEM);
                                do_write_data_page(cur->page, &fio);
                                submit_bio = true;
                        }
                        f2fs_put_page(cur->page, 1);
                } else {
+                       trace_f2fs_commit_inmem_page(cur->page, INMEM_DROP);
                        put_page(cur->page);
                }
                radix_tree_delete(&fi->inmem_root, cur->page->index);

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 09a56dc75f8d7cf912c5c5037ec8d7971101d54e..75724bd28356be59d9cfd6c16f9c80c8dc889b0f 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -14,7 +14,11 @@
                { NODE,         "NODE" },                               \
                { DATA,         "DATA" },                               \
                { META,         "META" },                               \
-               { META_FLUSH,   "META_FLUSH" })
+               { META_FLUSH,   "META_FLUSH" },                         \
+               { INMEM,        "INMEM" },                              \
+               { INMEM_DROP,   "INMEM_DROP" },                         \
+               { IPU,          "IN-PLACE" },                           \
+               { OPU,          "OUT-OF-PLACE" })
 
 #define F2FS_BIO_MASK(t)       (t & (READA | WRITE_FLUSH_FUA))
 #define F2FS_BIO_EXTRA_MASK(t) (t & (REQ_META | REQ_PRIO))
@@ -854,6 +858,13 @@ DEFINE_EVENT(f2fs__page, f2fs_writepage,
        TP_ARGS(page, type)
 );
 
+DEFINE_EVENT(f2fs__page, f2fs_do_write_data_page,
+
+       TP_PROTO(struct page *page, int type),
+
+       TP_ARGS(page, type)
+);
+
 DEFINE_EVENT(f2fs__page, f2fs_readpage,
 
        TP_PROTO(struct page *page, int type),
@@ -875,6 +886,20 @@ DEFINE_EVENT(f2fs__page, f2fs_vm_page_mkwrite,
        TP_ARGS(page, type)
 );
 
+DEFINE_EVENT(f2fs__page, f2fs_register_inmem_page,
+
+       TP_PROTO(struct page *page, int type),
+
+       TP_ARGS(page, type)
+);
+
+DEFINE_EVENT(f2fs__page, f2fs_commit_inmem_page,
+
+       TP_PROTO(struct page *page, int type),
+
+       TP_ARGS(page, type)
+);
+
 TRACE_EVENT(f2fs_writepages,
 
        TP_PROTO(struct inode *inode, struct writeback_control *wbc, int type),