f2fs: support read iostat
Subsystems (2)
PATCH 1/1 f2fs: support read iostat
Adds to support accounting read IOs from userspace/kernel.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/checkpoint.c | 5 ++++ fs/f2fs/data.c | 6 +++++ fs/f2fs/f2fs.h | 37 +++++++++++++++++++------- fs/f2fs/file.c | 12 ++++++++- fs/f2fs/gc.c | 6 +++++ fs/f2fs/node.c | 8 +++++- fs/f2fs/sysfs.c | 52 +++++++++++++++++++++++++------------ include/trace/events/f2fs.h | 23 ++++++++++++++-- 8 files changed, 118 insertions(+), 31 deletions(-)
fs/f2fs/checkpoint.c +5 -0
@@ -86,6 +86,8 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,return ERR_PTR (err); } +f2fs_update_iostat (sbi,FS_META_READ_IO ,F2FS_BLKSIZE ); +lock_page (page);if (unlikely (page->mapping != mapping)) {f2fs_put_page (page,1 );
@@ -266,6 +268,9 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, fio.page = page; err =f2fs_submit_page_bio (&fio);f2fs_put_page (page, err ?1 :0 ); + +if (!err) +f2fs_update_iostat (sbi,FS_META_READ_IO ,F2FS_BLKSIZE ); } out:blk_finish_plug (&plug);
fs/f2fs/data.c +6 -0
@@ -1033,6 +1033,7 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page, }ClearPageError (page);inc_page_count (sbi,F2FS_RD_DATA ); +f2fs_update_iostat (sbi,FS_DATA_READ_IO ,F2FS_BLKSIZE );__submit_bio (sbi, bio,DATA );return 0 ; }
@@ -2089,6 +2090,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, goto submit_and_realloc;inc_page_count (F2FS_I_SB (inode),F2FS_RD_DATA ); +f2fs_update_iostat (F2FS_I_SB (inode),FS_DATA_READ_IO ,F2FS_BLKSIZE );ClearPageError (page); *last_block_in_bio = block_nr; goto out;
@@ -2224,6 +2226,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, goto submit_and_realloc;inc_page_count (sbi,F2FS_RD_DATA ); +f2fs_update_iostat (sbi,FS_DATA_READ_IO ,F2FS_BLKSIZE );ClearPageError (page); *last_block_in_bio = blkaddr; }
@@ -3581,6 +3584,9 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) }else if (err <0 ) {f2fs_write_failed (mapping, offset + count); } + }else { +if (err >0 ) +f2fs_update_iostat (sbi,APP_DIRECT_READ_IO , err); } out:
fs/f2fs/f2fs.h +27 -10
@@ -1093,8 +1093,9 @@ enum cp_reason_type { };enum iostat_type { -APP_DIRECT_IO ,/* app direct IOs */ -APP_BUFFERED_IO ,/* app buffered IOs */ +/* WRITE IO */ +APP_DIRECT_IO ,/* app direct write IOs */ +APP_BUFFERED_IO ,/* app buffered write IOs */ APP_WRITE_IO ,/* app write IOs */ APP_MAPPED_IO ,/* app mapped IOs */ FS_DATA_IO ,/* data IOs from kworker/fsync/reclaimer */
@@ -1105,6 +1106,17 @@ enum iostat_type {FS_CP_DATA_IO ,/* data IOs from checkpoint */ FS_CP_NODE_IO ,/* node IOs from checkpoint */ FS_CP_META_IO ,/* meta IOs from checkpoint */ + +/* READ IO */ +APP_DIRECT_READ_IO ,/* app direct read IOs */ +APP_BUFFERED_READ_IO ,/* app buffered read IOs */ +APP_READ_IO ,/* app read IOs */ +APP_MAPPED_READ_IO ,/* app mapped read IOs */ +FS_DATA_READ_IO ,/* data read IOs */ +FS_NODE_READ_IO ,/* node read IOs */ +FS_META_READ_IO ,/* meta read IOs */ + +/* other */ FS_DISCARD ,/* discard */ NR_IO_TYPE, };
@@ -1509,8 +1521,8 @@ struct f2fs_sb_info {/* For app/fs IO statistics */ spinlock_t iostat_lock; -unsigned long long write_iostat[NR_IO_TYPE ]; -unsigned long long prev_write_iostat[NR_IO_TYPE ]; +unsigned long long rw_iostat[NR_IO_TYPE ]; +unsigned long long prev_rw_iostat[NR_IO_TYPE ];bool iostat_enable;unsigned long iostat_next_period;unsigned int iostat_period_ms;
@@ -3018,8 +3030,8 @@ static inline void f2fs_reset_iostat(struct f2fs_sb_info *sbi)spin_lock (&sbi->iostat_lock);for (i =0 ; i <NR_IO_TYPE ; i++) { - sbi->write_iostat[i] =0 ; - sbi->prev_write_iostat[i] =0 ; + sbi->rw_iostat[i] =0 ; + sbi->prev_rw_iostat[i] =0 ; }spin_unlock (&sbi->iostat_lock); }
@@ -3032,12 +3044,17 @@ static inline void f2fs_update_iostat(struct f2fs_sb_info *sbi,if (!sbi->iostat_enable)return ;spin_lock (&sbi->iostat_lock); - sbi->write_iostat[type] += io_bytes; + sbi->rw_iostat[type] += io_bytes;if (type ==APP_WRITE_IO || type ==APP_DIRECT_IO ) - sbi->write_iostat[APP_BUFFERED_IO ] = - sbi->write_iostat[APP_WRITE_IO ] - - sbi->write_iostat[APP_DIRECT_IO ]; + sbi->rw_iostat[APP_BUFFERED_IO ] = + sbi->rw_iostat[APP_WRITE_IO ] - + sbi->rw_iostat[APP_DIRECT_IO ]; + +if (type ==APP_READ_IO || type ==APP_DIRECT_READ_IO ) + sbi->rw_iostat[APP_BUFFERED_READ_IO ] = + sbi->rw_iostat[APP_READ_IO ] - + sbi->rw_iostat[APP_DIRECT_READ_IO ];spin_unlock (&sbi->iostat_lock);f2fs_record_iostat (sbi);
fs/f2fs/file.c +11 -1
@@ -40,6 +40,10 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) ret =filemap_fault (vmf);up_read (&F2FS_I (inode)->i_mmap_sem); +if (!ret) +f2fs_update_iostat (F2FS_I_SB (inode),APP_MAPPED_READ_IO , +F2FS_BLKSIZE ); +trace_f2fs_filemap_fault (inode, vmf->pgoff, (unsigned long )ret);return ret;
@@ -3822,11 +3826,17 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) {struct file *file = iocb->ki_filp;struct inode *inode =file_inode (file); +int ret;if (!f2fs_is_compress_backend_ready (inode))return -EOPNOTSUPP ; -return generic_file_read_iter (iocb, iter); + ret =generic_file_read_iter (iocb, iter); + +if (ret >0 ) +f2fs_update_iostat (F2FS_I_SB (inode),APP_READ_IO , ret); + +return ret; }static ssize_t f2fs_file_write_iter (struct kiocb *iocb,struct iov_iter *from)
fs/f2fs/gc.c +6 -0
@@ -737,6 +737,9 @@ static int ra_data_block(struct inode *inode, pgoff_t index) goto put_encrypted_page;f2fs_put_page (fio.encrypted_page,0 );f2fs_put_page (page,1 ); + +f2fs_update_iostat (sbi,FS_DATA_READ_IO ,F2FS_BLKSIZE ); +return 0 ; put_encrypted_page:f2fs_put_page (fio.encrypted_page,1 );
@@ -840,6 +843,9 @@ static int move_data_block(struct inode *inode, block_t bidx,f2fs_put_page (mpage,1 ); goto up_out; } + +f2fs_update_iostat (fio.sbi,FS_DATA_READ_IO ,F2FS_BLKSIZE ); +lock_page (mpage);if (unlikely (mpage->mapping !=META_MAPPING (fio.sbi) || !PageUptodate (mpage))) {
fs/f2fs/node.c +7 -1
@@ -1300,7 +1300,13 @@ static int read_node_page(struct page *page, int op_flags) } fio.new_blkaddr = fio.old_blkaddr = ni.blk_addr; -return f2fs_submit_page_bio (&fio); + + err =f2fs_submit_page_bio (&fio); + +if (!err) +f2fs_update_iostat (sbi,FS_NODE_READ_IO ,F2FS_BLKSIZE ); + +return err; }/*
fs/f2fs/sysfs.c +35 -17
77 lines not on this page · raw message
include/trace/events/f2fs.h +21 -2
@@ -1835,6 +1835,13 @@ TRACE_EVENT(f2fs_iostat, __field(unsigned long long, fs_cp_dio) __field(unsigned long long, fs_cp_nio) __field(unsigned long long, fs_cp_mio) + __field(unsigned long long, app_drio) + __field(unsigned long long, app_brio) + __field(unsigned long long, app_rio) + __field(unsigned long long, app_mrio) + __field(unsigned long long, fs_drio) + __field(unsigned long long, fs_nrio) + __field(unsigned long long, fs_mrio) __field(unsigned long long, fs_discard) ),
@@ -1852,6 +1859,13 @@ TRACE_EVENT(f2fs_iostat, __entry->fs_cp_dio = iostat[FS_CP_DATA_IO ]; __entry->fs_cp_nio = iostat[FS_CP_NODE_IO ]; __entry->fs_cp_mio = iostat[FS_CP_META_IO ]; + __entry->app_drio = iostat[APP_DIRECT_READ_IO ]; + __entry->app_brio = iostat[APP_BUFFERED_READ_IO ]; + __entry->app_rio = iostat[APP_READ_IO ]; + __entry->app_mrio = iostat[APP_MAPPED_READ_IO ]; + __entry->fs_drio = iostat[FS_DATA_READ_IO ]; + __entry->fs_nrio = iostat[FS_NODE_READ_IO ]; + __entry->fs_mrio = iostat[FS_META_READ_IO ]; __entry->fs_discard = iostat[FS_DISCARD ]; ),
@@ -1859,12 +1873,17 @@ TRACE_EVENT(f2fs_iostat,"app [write=%llu (direct=%llu, buffered=%llu), mapped=%llu], " "fs [data=%llu, node=%llu, meta=%llu, discard=%llu], " "gc [data=%llu, node=%llu], " -"cp [data=%llu, node=%llu, meta=%llu]" , +"cp [data=%llu, node=%llu, meta=%llu], " +"app [read=%llu (direct=%llu, buffered=%llu), mapped=%llu], " +"fs [data=%llu, node=%llu, meta=%llu]" ,show_dev (__entry->dev), __entry->app_wio, __entry->app_dio, __entry->app_bio, __entry->app_mio, __entry->fs_dio, __entry->fs_nio, __entry->fs_mio, __entry->fs_discard, __entry->fs_gc_dio, __entry->fs_gc_nio, __entry->fs_cp_dio, - __entry->fs_cp_nio, __entry->fs_cp_mio) + __entry->fs_cp_nio, __entry->fs_cp_mio, + __entry->app_rio, __entry->app_drio, __entry->app_brio, + __entry->app_mrio, __entry->fs_drio, __entry->fs_nrio, + __entry->fs_mrio) );#endif /* _TRACE_F2FS_H */
Signature · 8 lines
2.18.0.rc1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel