From: Namjae Jeon <[email protected]> Add tracepoints for page i/o operations and block allocation tracing during page read operation.
Signed-off-by: Namjae Jeon <[email protected]> Signed-off-by: Pankaj Kumar <[email protected]> Acked-by: Steven Rostedt <[email protected]> --- fs/f2fs/data.c | 16 +++++++++-- include/trace/events/f2fs.h | 63 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index ea200d9..394ab68 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -22,6 +22,7 @@ #include "f2fs.h" #include "node.h" #include "segment.h" +#include <trace/events/f2fs.h> /* * Lock ordering for the change of data block address: @@ -349,6 +350,8 @@ int f2fs_readpage(struct f2fs_sb_info *sbi, struct page *page, struct block_device *bdev = sbi->sb->s_bdev; struct bio *bio; + trace_f2fs_readpage(page, blk_addr, type); + down_read(&sbi->bio_sem); /* Allocate a new bio */ @@ -389,14 +392,20 @@ static int get_data_block_ro(struct inode *inode, sector_t iblock, /* Get the page offset from the block offset(iblock) */ pgofs = (pgoff_t)(iblock >> (PAGE_CACHE_SHIFT - blkbits)); - if (check_extent_cache(inode, pgofs, bh_result)) + if (check_extent_cache(inode, pgofs, bh_result)) { + trace_f2fs_get_data_block(inode, iblock, bh_result->b_blocknr, + bh_result->b_size, 0); return 0; + } /* When reading holes, we need its node page */ set_new_dnode(&dn, inode, NULL, NULL, 0); err = get_dnode_of_data(&dn, pgofs, LOOKUP_NODE_RA); - if (err) + if (err) { + trace_f2fs_get_data_block(inode, iblock, bh_result->b_blocknr, + bh_result->b_size, err); return (err == -ENOENT) ? 0 : err; + } /* It does not support data allocation */ BUG_ON(create); @@ -421,6 +430,9 @@ static int get_data_block_ro(struct inode *inode, sector_t iblock, bh_result->b_size = (i << blkbits); } f2fs_put_dnode(&dn); + trace_f2fs_get_data_block(inode, iblock, bh_result->b_blocknr, + bh_result->b_size, err); + return 0; } diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 5e780b6..c7e71f9 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -408,6 +408,69 @@ TRACE_EVENT(f2fs_truncate, (unsigned long) __entry->ino) ); +TRACE_EVENT_CONDITION(f2fs_readpage, + TP_PROTO(struct page *page, sector_t blk_addr, int type), + + TP_ARGS(page, blk_addr, type), + + TP_CONDITION(page->mapping), + + TP_STRUCT__entry( + __field(pgoff_t, index) + __field(ino_t, ino) + __field(dev_t, dev) + __field(sector_t, block) + __field(int, type) + + ), + + TP_fast_assign( + __entry->index = page->index; + __entry->ino = page->mapping->host->i_ino; + __entry->dev = page->mapping->host->i_sb->s_dev; + __entry->block = blk_addr; + __entry->type = type; + ), + + TP_printk("dev %d,%d ino %lu page_index %lu block %llu type %d", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + (unsigned long) __entry->index, + (unsigned long long) __entry->block, __entry->type) +); + +TRACE_EVENT(f2fs_get_data_block, + TP_PROTO(struct inode *inode, sector_t block, sector_t bh_block, + size_t size, int ret), + + TP_ARGS(inode, block, bh_block, size, ret), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(sector_t, block) + __field(sector_t, bh_block) + __field(size_t, size) + __field(int, ret) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->block = block; + __entry->bh_block = bh_block; + __entry->size = size; + __entry->ret = ret; + ), + + TP_printk("dev %d,%d ino %lu block number %llu Bh Start block %llu" + " Mapping Size %u error %d", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + (unsigned long long) __entry->block, + (unsigned long long) __entry->bh_block, + __entry->size, __entry->ret) +); #endif /* _TRACE_F2FS_H */ /* This part must be outside protection */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
