Loading fs/f2fs/data.c +14 −2 Original line number Diff line number Diff line Loading @@ -533,6 +533,8 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, if (is_inode_flag_set(F2FS_I(inode), FI_NO_EXTENT)) return false; trace_f2fs_lookup_extent_tree_start(inode, pgofs); down_read(&sbi->extent_tree_lock); et = radix_tree_lookup(&sbi->extent_tree_root, inode->i_ino); if (!et) { Loading @@ -555,6 +557,8 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, stat_inc_total_hit(sbi->sb); read_unlock(&et->lock); trace_f2fs_lookup_extent_tree_end(inode, pgofs, en); atomic_dec(&et->refcount); return en ? true : false; } Loading @@ -573,6 +577,8 @@ static void f2fs_update_extent_tree(struct inode *inode, pgoff_t fofs, if (is_inode_flag_set(F2FS_I(inode), FI_NO_EXTENT)) return; trace_f2fs_update_extent_tree(inode, fofs, blkaddr); down_write(&sbi->extent_tree_lock); et = radix_tree_lookup(&sbi->extent_tree_root, ino); if (!et) { Loading Loading @@ -665,6 +671,7 @@ void f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) struct radix_tree_iter iter; void **slot; unsigned int found; unsigned int node_cnt = 0, tree_cnt = 0; if (!test_opt(sbi, EXTENT_CACHE)) return; Loading @@ -691,7 +698,7 @@ void f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) atomic_inc(&et->refcount); write_lock(&et->lock); __free_extent_tree(sbi, et, false); node_cnt += __free_extent_tree(sbi, et, false); write_unlock(&et->lock); atomic_dec(&et->refcount); } Loading @@ -707,15 +714,19 @@ void f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) radix_tree_delete(&sbi->extent_tree_root, et->ino); kmem_cache_free(extent_tree_slab, et); sbi->total_ext_tree--; tree_cnt++; } } up_write(&sbi->extent_tree_lock); trace_f2fs_shrink_extent_tree(sbi, node_cnt, tree_cnt); } void f2fs_destroy_extent_tree(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct extent_tree *et; unsigned int node_cnt = 0; if (!test_opt(sbi, EXTENT_CACHE)) return; Loading @@ -731,7 +742,7 @@ void f2fs_destroy_extent_tree(struct inode *inode) /* free all extent info belong to this extent tree */ write_lock(&et->lock); __free_extent_tree(sbi, et, true); node_cnt = __free_extent_tree(sbi, et, true); write_unlock(&et->lock); atomic_dec(&et->refcount); Loading @@ -749,6 +760,7 @@ void f2fs_destroy_extent_tree(struct inode *inode) sbi->total_ext_tree--; up_write(&sbi->extent_tree_lock); out: trace_f2fs_destroy_extent_tree(inode, node_cnt); return; } Loading include/trace/events/f2fs.h +134 −0 Original line number Diff line number Diff line Loading @@ -1011,6 +1011,140 @@ TRACE_EVENT(f2fs_issue_flush, __entry->nobarrier ? "skip (nobarrier)" : "issue", __entry->flush_merge ? " with flush_merge" : "") ); TRACE_EVENT(f2fs_lookup_extent_tree_start, TP_PROTO(struct inode *inode, unsigned int pgofs), TP_ARGS(inode, pgofs), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, pgofs) ), TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; __entry->pgofs = pgofs; ), TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u", show_dev_ino(__entry), __entry->pgofs) ); TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end, TP_PROTO(struct inode *inode, unsigned int pgofs, struct extent_node *en), TP_ARGS(inode, pgofs, en), TP_CONDITION(en), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, pgofs) __field(unsigned int, fofs) __field(u32, blk) __field(unsigned int, len) ), TP_fast_assign( __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; ), TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, " "ext_info(fofs: %u, blk: %u, len: %u)", show_dev_ino(__entry), __entry->pgofs, __entry->fofs, __entry->blk, __entry->len) ); TRACE_EVENT(f2fs_update_extent_tree, TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr), TP_ARGS(inode, pgofs, blkaddr), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, pgofs) __field(u32, blk) ), TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; __entry->pgofs = pgofs; __entry->blk = blkaddr; ), TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, blkaddr = %u", show_dev_ino(__entry), __entry->pgofs, __entry->blk) ); TRACE_EVENT(f2fs_shrink_extent_tree, TP_PROTO(struct f2fs_sb_info *sbi, unsigned int node_cnt, unsigned int tree_cnt), TP_ARGS(sbi, node_cnt, tree_cnt), TP_STRUCT__entry( __field(dev_t, dev) __field(unsigned int, node_cnt) __field(unsigned int, tree_cnt) ), TP_fast_assign( __entry->dev = sbi->sb->s_dev; __entry->node_cnt = node_cnt; __entry->tree_cnt = tree_cnt; ), TP_printk("dev = (%d,%d), shrunk: node_cnt = %u, tree_cnt = %u", show_dev(__entry), __entry->node_cnt, __entry->tree_cnt) ); TRACE_EVENT(f2fs_destroy_extent_tree, TP_PROTO(struct inode *inode, unsigned int node_cnt), TP_ARGS(inode, node_cnt), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, node_cnt) ), TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; __entry->node_cnt = node_cnt; ), TP_printk("dev = (%d,%d), ino = %lu, destroyed: node_cnt = %u", show_dev_ino(__entry), __entry->node_cnt) ); #endif /* _TRACE_F2FS_H */ /* This part must be outside protection */ Loading Loading
fs/f2fs/data.c +14 −2 Original line number Diff line number Diff line Loading @@ -533,6 +533,8 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, if (is_inode_flag_set(F2FS_I(inode), FI_NO_EXTENT)) return false; trace_f2fs_lookup_extent_tree_start(inode, pgofs); down_read(&sbi->extent_tree_lock); et = radix_tree_lookup(&sbi->extent_tree_root, inode->i_ino); if (!et) { Loading @@ -555,6 +557,8 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, stat_inc_total_hit(sbi->sb); read_unlock(&et->lock); trace_f2fs_lookup_extent_tree_end(inode, pgofs, en); atomic_dec(&et->refcount); return en ? true : false; } Loading @@ -573,6 +577,8 @@ static void f2fs_update_extent_tree(struct inode *inode, pgoff_t fofs, if (is_inode_flag_set(F2FS_I(inode), FI_NO_EXTENT)) return; trace_f2fs_update_extent_tree(inode, fofs, blkaddr); down_write(&sbi->extent_tree_lock); et = radix_tree_lookup(&sbi->extent_tree_root, ino); if (!et) { Loading Loading @@ -665,6 +671,7 @@ void f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) struct radix_tree_iter iter; void **slot; unsigned int found; unsigned int node_cnt = 0, tree_cnt = 0; if (!test_opt(sbi, EXTENT_CACHE)) return; Loading @@ -691,7 +698,7 @@ void f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) atomic_inc(&et->refcount); write_lock(&et->lock); __free_extent_tree(sbi, et, false); node_cnt += __free_extent_tree(sbi, et, false); write_unlock(&et->lock); atomic_dec(&et->refcount); } Loading @@ -707,15 +714,19 @@ void f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) radix_tree_delete(&sbi->extent_tree_root, et->ino); kmem_cache_free(extent_tree_slab, et); sbi->total_ext_tree--; tree_cnt++; } } up_write(&sbi->extent_tree_lock); trace_f2fs_shrink_extent_tree(sbi, node_cnt, tree_cnt); } void f2fs_destroy_extent_tree(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct extent_tree *et; unsigned int node_cnt = 0; if (!test_opt(sbi, EXTENT_CACHE)) return; Loading @@ -731,7 +742,7 @@ void f2fs_destroy_extent_tree(struct inode *inode) /* free all extent info belong to this extent tree */ write_lock(&et->lock); __free_extent_tree(sbi, et, true); node_cnt = __free_extent_tree(sbi, et, true); write_unlock(&et->lock); atomic_dec(&et->refcount); Loading @@ -749,6 +760,7 @@ void f2fs_destroy_extent_tree(struct inode *inode) sbi->total_ext_tree--; up_write(&sbi->extent_tree_lock); out: trace_f2fs_destroy_extent_tree(inode, node_cnt); return; } Loading
include/trace/events/f2fs.h +134 −0 Original line number Diff line number Diff line Loading @@ -1011,6 +1011,140 @@ TRACE_EVENT(f2fs_issue_flush, __entry->nobarrier ? "skip (nobarrier)" : "issue", __entry->flush_merge ? " with flush_merge" : "") ); TRACE_EVENT(f2fs_lookup_extent_tree_start, TP_PROTO(struct inode *inode, unsigned int pgofs), TP_ARGS(inode, pgofs), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, pgofs) ), TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; __entry->pgofs = pgofs; ), TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u", show_dev_ino(__entry), __entry->pgofs) ); TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end, TP_PROTO(struct inode *inode, unsigned int pgofs, struct extent_node *en), TP_ARGS(inode, pgofs, en), TP_CONDITION(en), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, pgofs) __field(unsigned int, fofs) __field(u32, blk) __field(unsigned int, len) ), TP_fast_assign( __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; ), TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, " "ext_info(fofs: %u, blk: %u, len: %u)", show_dev_ino(__entry), __entry->pgofs, __entry->fofs, __entry->blk, __entry->len) ); TRACE_EVENT(f2fs_update_extent_tree, TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr), TP_ARGS(inode, pgofs, blkaddr), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, pgofs) __field(u32, blk) ), TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; __entry->pgofs = pgofs; __entry->blk = blkaddr; ), TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, blkaddr = %u", show_dev_ino(__entry), __entry->pgofs, __entry->blk) ); TRACE_EVENT(f2fs_shrink_extent_tree, TP_PROTO(struct f2fs_sb_info *sbi, unsigned int node_cnt, unsigned int tree_cnt), TP_ARGS(sbi, node_cnt, tree_cnt), TP_STRUCT__entry( __field(dev_t, dev) __field(unsigned int, node_cnt) __field(unsigned int, tree_cnt) ), TP_fast_assign( __entry->dev = sbi->sb->s_dev; __entry->node_cnt = node_cnt; __entry->tree_cnt = tree_cnt; ), TP_printk("dev = (%d,%d), shrunk: node_cnt = %u, tree_cnt = %u", show_dev(__entry), __entry->node_cnt, __entry->tree_cnt) ); TRACE_EVENT(f2fs_destroy_extent_tree, TP_PROTO(struct inode *inode, unsigned int node_cnt), TP_ARGS(inode, node_cnt), TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) __field(unsigned int, node_cnt) ), TP_fast_assign( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; __entry->node_cnt = node_cnt; ), TP_printk("dev = (%d,%d), ino = %lu, destroyed: node_cnt = %u", show_dev_ino(__entry), __entry->node_cnt) ); #endif /* _TRACE_F2FS_H */ /* This part must be outside protection */ Loading