f2fs: iostat: support accounting compressed IO
Subsystems (2)
Chao Yu
maintainerPATCH 1/1 f2fs: iostat: support accounting compressed IO
From: Chao Yu <[email protected]>
Previously, we supported to account FS_CDATA_READ_IO type IO only, in this patch, it adds to account more type IO for compressed file:
- APP_BUFFERED_CDATA_IO
- APP_MAPPED_CDATA_IO
- FS_CDATA_IO
- APP_BUFFERED_CDATA_READ_IO
- APP_MAPPED_CDATA_READ_IO
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/compress.c | 2 +- fs/f2fs/f2fs.h | 5 ++++ fs/f2fs/file.c | 27 ++++++++++++++++---- fs/f2fs/iostat.c | 50 ++++++++++++++++++++++--------------- include/trace/events/f2fs.h | 24 ++++++++++++++---- 5 files changed, 77 insertions(+), 31 deletions(-)
fs/f2fs/compress.c +1 -1
@@ -1537,7 +1537,7 @@ int f2fs_write_multi_pages(struct compress_ctx *cc, } err =f2fs_write_compressed_pages (cc, submitted, - wbc, io_type); + wbc,FS_CDATA_IO );if (!err)return 0 ;f2fs_bug_on (F2FS_I_SB (cc->inode), err != -EAGAIN );
fs/f2fs/f2fs.h +5 -0
@@ -1156,7 +1156,10 @@ enum iostat_type {APP_BUFFERED_IO ,/* app buffered write IOs */ APP_WRITE_IO ,/* app write IOs */ APP_MAPPED_IO ,/* app mapped IOs */ +APP_BUFFERED_CDATA_IO ,/* app buffered write IOs on compressed file */ +APP_MAPPED_CDATA_IO ,/* app mapped write IOs on compressed file */ FS_DATA_IO ,/* data IOs from kworker/fsync/reclaimer */ +FS_CDATA_IO ,/* data IOs from kworker/fsync/reclaimer on compressed file */ FS_NODE_IO ,/* node IOs from kworker/fsync/reclaimer */ FS_META_IO ,/* meta IOs from kworker/reclaimer */ FS_GC_DATA_IO, /* data IOs from forground gc */
@@ -1170,6 +1173,8 @@ enum iostat_type {APP_BUFFERED_READ_IO ,/* app buffered read IOs */ APP_READ_IO ,/* app read IOs */ APP_MAPPED_READ_IO ,/* app mapped read IOs */ +APP_BUFFERED_CDATA_READ_IO ,/* app buffered read IOs on compressed file */ +APP_MAPPED_CDATA_READ_IO ,/* app mapped read IOs on compressed file */ FS_DATA_READ_IO ,/* data read IOs */ FS_GDATA_READ_IO ,/* data read IOs from background gc */ FS_CDATA_READ_IO, /* compressed data read IOs */
fs/f2fs/file.c +22 -5
@@ -42,9 +42,14 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)vm_fault_t ret; ret =filemap_fault (vmf); -if (!ret) -f2fs_update_iostat (F2FS_I_SB (inode),APP_MAPPED_READ_IO , +if (!ret) { +struct f2fs_sb_info *sbi =F2FS_I_SB (inode); + +f2fs_update_iostat (sbi,APP_MAPPED_READ_IO ,F2FS_BLKSIZE ); +if (f2fs_compressed_file (inode)) +f2fs_update_iostat (sbi,APP_MAPPED_CDATA_READ_IO ,F2FS_BLKSIZE ); + }trace_f2fs_filemap_fault (inode, vmf->pgoff, (unsigned long )ret);
@@ -155,6 +160,8 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)SetPageUptodate (page);f2fs_update_iostat (sbi,APP_MAPPED_IO ,F2FS_BLKSIZE ); +if (f2fs_compressed_file (inode)) +f2fs_update_iostat (sbi,APP_MAPPED_CDATA_IO ,F2FS_BLKSIZE );f2fs_update_time (sbi,REQ_TIME );trace_f2fs_vm_page_mkwrite (page,DATA );
@@ -4308,8 +4315,14 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) ret =f2fs_dio_read_iter (iocb, to); }else { ret =filemap_read (iocb, to,0 ); -if (ret >0 ) -f2fs_update_iostat (F2FS_I_SB (inode),APP_BUFFERED_READ_IO , ret); +if (ret >0 ) { +struct f2fs_sb_info *sbi =F2FS_I_SB (inode); + +f2fs_update_iostat (sbi,APP_BUFFERED_READ_IO , ret); +if (f2fs_compressed_file (inode)) +f2fs_update_iostat (sbi, +APP_BUFFERED_CDATA_READ_IO , ret); + } }if (trace_f2fs_dataread_end_enabled ())trace_f2fs_dataread_end (inode, pos, ret);
@@ -4425,8 +4438,12 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb *iocb, current->backing_dev_info =NULL ;if (ret >0 ) { +struct f2fs_sb_info *sbi =F2FS_I_SB (inode); + iocb->ki_pos += ret; -f2fs_update_iostat (F2FS_I_SB (inode),APP_BUFFERED_IO , ret); +f2fs_update_iostat (sbi,APP_BUFFERED_IO , ret); +if (f2fs_compressed_file (inode)) +f2fs_update_iostat (sbi,APP_BUFFERED_CDATA_IO , ret); }return ret; }
fs/f2fs/iostat.c +30 -20
85 lines not on this page · raw message
include/trace/events/f2fs.h +19 -5
@@ -1823,7 +1823,10 @@ TRACE_EVENT(f2fs_iostat, __field(unsigned long long, app_bio) __field(unsigned long long, app_wio) __field(unsigned long long, app_mio) + __field(unsigned long long, app_bcdio) + __field(unsigned long long, app_mcdio) __field(unsigned long long, fs_dio) + __field(unsigned long long, fs_cdio) __field(unsigned long long, fs_nio) __field(unsigned long long, fs_mio)__field (unsigned long long , fs_gc_dio)
@@ -1835,6 +1838,8 @@ TRACE_EVENT(f2fs_iostat, __field(unsigned long long, app_brio) __field(unsigned long long, app_rio) __field(unsigned long long, app_mrio) + __field(unsigned long long, app_bcrio) + __field(unsigned long long, app_mcrio) __field(unsigned long long, fs_drio) __field(unsigned long long, fs_gdrio)__field (unsigned long long , fs_cdrio)
@@ -1849,7 +1854,10 @@ TRACE_EVENT(f2fs_iostat, __entry->app_bio = iostat[APP_BUFFERED_IO ]; __entry->app_wio = iostat[APP_WRITE_IO ]; __entry->app_mio = iostat[APP_MAPPED_IO ]; + __entry->app_bcdio = iostat[APP_BUFFERED_CDATA_IO ]; + __entry->app_mcdio = iostat[APP_MAPPED_CDATA_IO ]; __entry->fs_dio = iostat[FS_DATA_IO ]; + __entry->fs_cdio = iostat[FS_CDATA_IO ]; __entry->fs_nio = iostat[FS_NODE_IO ]; __entry->fs_mio = iostat[FS_META_IO ]; __entry->fs_gc_dio = iostat[FS_GC_DATA_IO ];
@@ -1861,6 +1869,8 @@ TRACE_EVENT(f2fs_iostat, __entry->app_brio = iostat[APP_BUFFERED_READ_IO ]; __entry->app_rio = iostat[APP_READ_IO ]; __entry->app_mrio = iostat[APP_MAPPED_READ_IO ]; + __entry->app_bcrio = iostat[APP_BUFFERED_CDATA_READ_IO ]; + __entry->app_mcrio = iostat[APP_MAPPED_CDATA_READ_IO ]; __entry->fs_drio = iostat[FS_DATA_READ_IO ]; __entry->fs_gdrio = iostat[FS_GDATA_READ_IO ]; __entry->fs_cdrio = iostat[FS_CDATA_READ_IO ];
@@ -1870,20 +1880,24 @@ TRACE_EVENT(f2fs_iostat, ),TP_printk ("dev = (%d,%d), " -"app [write=%llu (direct=%llu, buffered=%llu), mapped=%llu], " -"fs [data=%llu, node=%llu, meta=%llu, discard=%llu], " +"app [write=%llu (direct=%llu, buffered=%llu), mapped=%llu, " +"compr(buffered=%llu, mapped=%llu)], " +"fs [data=%llu, cdata=%llu, node=%llu, meta=%llu, discard=%llu], " "gc [data=%llu, node=%llu], " "cp [data=%llu, node=%llu, meta=%llu], " "app [read=%llu (direct=%llu, buffered=%llu), mapped=%llu], " -"fs [data=%llu, (gc_data=%llu, compr_data=%llu), " +"compr(buffered=%llu, mapped=%llu)], " +"fs [data=%llu, (gc_data=%llu, cdata=%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->app_bio, __entry->app_mio, __entry->app_bcdio, + __entry->app_mcdio, __entry->fs_dio, __entry->fs_cdio, __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->app_rio, __entry->app_drio, __entry->app_brio, - __entry->app_mrio, __entry->fs_drio, __entry->fs_gdrio, + __entry->app_mrio, __entry->app_bcrio, __entry->app_mcrio, + __entry->fs_drio, __entry->fs_gdrio, __entry->fs_cdrio, __entry->fs_nrio, __entry->fs_mrio) );
Signature · 1 line
2.36.1