Code Review / kvmfornfv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / include / trace / events / f2fs.h
diff --git a/kernel/include/trace/events/f2fs.h b/kernel/include/trace/events/f2fs.h
index e202dec..00b4a63 100644 (file)
--- a/kernel/include/trace/events/f2fs.h
+++ b/kernel/include/trace/events/f2fs.h
@@ -13,6 +13,10 @@ TRACE_DEFINE_ENUM(NODE);
 TRACE_DEFINE_ENUM(DATA);
 TRACE_DEFINE_ENUM(META);
 TRACE_DEFINE_ENUM(META_FLUSH);
+TRACE_DEFINE_ENUM(INMEM);
+TRACE_DEFINE_ENUM(INMEM_DROP);
+TRACE_DEFINE_ENUM(IPU);
+TRACE_DEFINE_ENUM(OPU);
 TRACE_DEFINE_ENUM(CURSEG_HOT_DATA);
 TRACE_DEFINE_ENUM(CURSEG_WARM_DATA);
 TRACE_DEFINE_ENUM(CURSEG_COLD_DATA);
@@ -37,6 +41,7 @@ TRACE_DEFINE_ENUM(__REQ_META);
 TRACE_DEFINE_ENUM(CP_UMOUNT);
 TRACE_DEFINE_ENUM(CP_FASTBOOT);
 TRACE_DEFINE_ENUM(CP_SYNC);
+TRACE_DEFINE_ENUM(CP_RECOVERY);
 TRACE_DEFINE_ENUM(CP_DISCARD);
 
 #define show_block_type(type)                                          \
@@ -112,6 +117,7 @@ TRACE_DEFINE_ENUM(CP_DISCARD);
                { CP_DISCARD,   "Discard" })
 
 struct victim_sel_policy;
+struct f2fs_map_blocks;
 
 DECLARE_EVENT_CLASS(f2fs__inode,
 
@@ -476,39 +482,66 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
                __entry->err)
 );
 
-TRACE_EVENT(f2fs_get_data_block,
-       TP_PROTO(struct inode *inode, sector_t iblock,
-                               struct buffer_head *bh, int ret),
+TRACE_EVENT(f2fs_map_blocks,
+       TP_PROTO(struct inode *inode, struct f2fs_map_blocks *map, int ret),
 
-       TP_ARGS(inode, iblock, bh, ret),
+       TP_ARGS(inode, map, ret),
 
        TP_STRUCT__entry(
                __field(dev_t,  dev)
                __field(ino_t,  ino)
-               __field(sector_t,       iblock)
-               __field(sector_t,       bh_start)
-               __field(size_t, bh_size)
+               __field(block_t,        m_lblk)
+               __field(block_t,        m_pblk)
+               __field(unsigned int,   m_len)
                __field(int,    ret)
        ),
 
        TP_fast_assign(
                __entry->dev            = inode->i_sb->s_dev;
                __entry->ino            = inode->i_ino;
-               __entry->iblock         = iblock;
-               __entry->bh_start       = bh->b_blocknr;
-               __entry->bh_size        = bh->b_size;
+               __entry->m_lblk         = map->m_lblk;
+               __entry->m_pblk         = map->m_pblk;
+               __entry->m_len          = map->m_len;
                __entry->ret            = ret;
        ),
 
        TP_printk("dev = (%d,%d), ino = %lu, file offset = %llu, "
-               "start blkaddr = 0x%llx, len = 0x%llx bytes, err = %d",
+               "start blkaddr = 0x%llx, len = 0x%llx, err = %d",
                show_dev_ino(__entry),
-               (unsigned long long)__entry->iblock,
-               (unsigned long long)__entry->bh_start,
-               (unsigned long long)__entry->bh_size,
+               (unsigned long long)__entry->m_lblk,
+               (unsigned long long)__entry->m_pblk,
+               (unsigned long long)__entry->m_len,
                __entry->ret)
 );
 
+TRACE_EVENT(f2fs_background_gc,
+
+       TP_PROTO(struct super_block *sb, long wait_ms,
+                       unsigned int prefree, unsigned int free),
+
+       TP_ARGS(sb, wait_ms, prefree, free),
+
+       TP_STRUCT__entry(
+               __field(dev_t,  dev)
+               __field(long,   wait_ms)
+               __field(unsigned int,   prefree)
+               __field(unsigned int,   free)
+       ),
+
+       TP_fast_assign(
+               __entry->dev            = sb->s_dev;
+               __entry->wait_ms        = wait_ms;
+               __entry->prefree        = prefree;
+               __entry->free           = free;
+       ),
+
+       TP_printk("dev = (%d,%d), wait_ms = %ld, prefree = %u, free = %u",
+               show_dev(__entry),
+               __entry->wait_ms,
+               __entry->prefree,
+               __entry->free)
+);
+
 TRACE_EVENT(f2fs_get_victim,
 
        TP_PROTO(struct super_block *sb, int type, int gc_type,
@@ -995,6 +1028,32 @@ TRACE_EVENT(f2fs_writepages,
                __entry->for_sync)
 );
 
+TRACE_EVENT(f2fs_readpages,
+
+       TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage),
+
+       TP_ARGS(inode, page, nrpage),
+
+       TP_STRUCT__entry(
+               __field(dev_t,  dev)
+               __field(ino_t,  ino)
+               __field(pgoff_t,        start)
+               __field(unsigned int,   nrpage)
+       ),
+
+       TP_fast_assign(
+               __entry->dev    = inode->i_sb->s_dev;
+               __entry->ino    = inode->i_ino;
+               __entry->start  = page->index;
+               __entry->nrpage = nrpage;
+       ),
+
+       TP_printk("dev = (%d,%d), ino = %lu, start = %lu nrpage = %u",
+               show_dev_ino(__entry),
+               (unsigned long)__entry->start,
+               __entry->nrpage)
+);
+
 TRACE_EVENT(f2fs_write_checkpoint,
 
        TP_PROTO(struct super_block *sb, int reason, char *msg),
@@ -1094,11 +1153,11 @@ TRACE_EVENT(f2fs_lookup_extent_tree_start,
 TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end,
 
        TP_PROTO(struct inode *inode, unsigned int pgofs,
-                                               struct extent_node *en),
+                                               struct extent_info *ei),
 
-       TP_ARGS(inode, pgofs, en),
+       TP_ARGS(inode, pgofs, ei),
 
-       TP_CONDITION(en),
+       TP_CONDITION(ei),
 
        TP_STRUCT__entry(
                __field(dev_t,  dev)
@@ -1113,9 +1172,9 @@ TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end,
                __entry->dev = inode->i_sb->s_dev;
                __entry->ino = inode->i_ino;
                __entry->pgofs = pgofs;
-               __entry->fofs = en->ei.fofs;
-               __entry->blk = en->ei.blk;
-               __entry->len = en->ei.len;
+               __entry->fofs = ei->fofs;
+               __entry->blk = ei->blk;
+               __entry->len = ei->len;
        ),
 
        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
@@ -1127,17 +1186,19 @@ TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end,
                __entry->len)
 );
 
-TRACE_EVENT(f2fs_update_extent_tree,
+TRACE_EVENT(f2fs_update_extent_tree_range,
 
-       TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr),
+       TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr,
+                                               unsigned int len),
 
-       TP_ARGS(inode, pgofs, blkaddr),
+       TP_ARGS(inode, pgofs, blkaddr, len),
 
        TP_STRUCT__entry(
                __field(dev_t,  dev)
                __field(ino_t,  ino)
                __field(unsigned int, pgofs)
                __field(u32, blk)
+               __field(unsigned int, len)
        ),
 
        TP_fast_assign(
@@ -1145,12 +1206,15 @@ TRACE_EVENT(f2fs_update_extent_tree,
                __entry->ino = inode->i_ino;
                __entry->pgofs = pgofs;
                __entry->blk = blkaddr;
+               __entry->len = len;
        ),
 
-       TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, blkaddr = %u",
+       TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+                                       "blkaddr = %u, len = %u",
                show_dev_ino(__entry),
                __entry->pgofs,
-               __entry->blk)
+               __entry->blk,
+               __entry->len)
 );
 
 TRACE_EVENT(f2fs_shrink_extent_tree,