Commit 34a23525 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: iostat: support accounting compressed IO 



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: default avatarChao Yu <chao.yu@oppo.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b87846bd

fs/f2fs/checkpoint.c

+3 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 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);

	f2fs_update_iostat(sbi, NULL, FS_META_READ_IO, F2FS_BLKSIZE);



	lock_page(page);

	if (unlikely(page->mapping != mapping)) {
@@ -276,7 +276,8 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
		f2fs_put_page(page, err ? 1 : 0);



		if (!err)

			f2fs_update_iostat(sbi, FS_META_READ_IO, F2FS_BLKSIZE);

			f2fs_update_iostat(sbi, NULL, FS_META_READ_IO,

							F2FS_BLKSIZE);

	}

out:

	blk_finish_plug(&plug);

fs/f2fs/data.c

+4 −4
Original line number Diff line number Diff line
@@ -1083,7 +1083,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);

	f2fs_update_iostat(sbi, NULL, FS_DATA_READ_IO, F2FS_BLKSIZE);

	__submit_bio(sbi, bio, DATA);

	return 0;

}
@@ -2122,7 +2122,8 @@ 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);

	f2fs_update_iostat(F2FS_I_SB(inode), NULL, FS_DATA_READ_IO,

							F2FS_BLKSIZE);

	ClearPageError(page);

	*last_block_in_bio = block_nr;

	goto out;
@@ -2270,8 +2271,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, 
		refcount_inc(&dic->refcnt);



		inc_page_count(sbi, F2FS_RD_DATA);

		f2fs_update_iostat(sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);

		f2fs_update_iostat(sbi, FS_CDATA_READ_IO, F2FS_BLKSIZE);

		f2fs_update_iostat(sbi, inode, FS_DATA_READ_IO, F2FS_BLKSIZE);

		ClearPageError(page);

		*last_block_in_bio = blkaddr;

	}

fs/f2fs/f2fs.h

+5 −0
Original line number Diff line number Diff line
@@ -1158,7 +1158,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 */
@@ -1172,6 +1175,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

+9 −7
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) 


	ret = filemap_fault(vmf);

	if (!ret)

		f2fs_update_iostat(F2FS_I_SB(inode), APP_MAPPED_READ_IO,

							F2FS_BLKSIZE);

		f2fs_update_iostat(F2FS_I_SB(inode), inode,

					APP_MAPPED_READ_IO, F2FS_BLKSIZE);



	trace_f2fs_filemap_fault(inode, vmf->pgoff, (unsigned long)ret);
@@ -154,7 +154,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) 
	if (!PageUptodate(page))

		SetPageUptodate(page);



	f2fs_update_iostat(sbi, APP_MAPPED_IO, F2FS_BLKSIZE);

	f2fs_update_iostat(sbi, inode, APP_MAPPED_IO, F2FS_BLKSIZE);

	f2fs_update_time(sbi, REQ_TIME);



	trace_f2fs_vm_page_mkwrite(page, DATA);
@@ -4212,7 +4212,7 @@ static int f2fs_dio_read_end_io(struct kiocb *iocb, ssize_t size, int error, 
	dec_page_count(sbi, F2FS_DIO_READ);

	if (error)

		return error;

	f2fs_update_iostat(sbi, APP_DIRECT_READ_IO, size);

	f2fs_update_iostat(sbi, NULL, APP_DIRECT_READ_IO, size);

	return 0;

}
@@ -4301,7 +4301,8 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
	} else {

		ret = filemap_read(iocb, to, 0);

		if (ret > 0)

			f2fs_update_iostat(F2FS_I_SB(inode), APP_BUFFERED_READ_IO, ret);

			f2fs_update_iostat(F2FS_I_SB(inode), inode,

						APP_BUFFERED_READ_IO, ret);

	}

	if (trace_f2fs_dataread_end_enabled())

		trace_f2fs_dataread_end(inode, pos, ret);
@@ -4418,7 +4419,8 @@ static ssize_t f2fs_buffered_write_iter(struct kiocb *iocb, 


	if (ret > 0) {

		iocb->ki_pos += ret;

		f2fs_update_iostat(F2FS_I_SB(inode), APP_BUFFERED_IO, ret);

		f2fs_update_iostat(F2FS_I_SB(inode), inode,

						APP_BUFFERED_IO, ret);

	}

	return ret;

}
@@ -4431,7 +4433,7 @@ static int f2fs_dio_write_end_io(struct kiocb *iocb, ssize_t size, int error, 
	dec_page_count(sbi, F2FS_DIO_WRITE);

	if (error)

		return error;

	f2fs_update_iostat(sbi, APP_DIRECT_IO, size);

	f2fs_update_iostat(sbi, NULL, APP_DIRECT_IO, size);

	return 0;

}

fs/f2fs/gc.c

+7 −5
Original line number Diff line number Diff line
@@ -1202,8 +1202,8 @@ static int ra_data_block(struct inode *inode, pgoff_t index) 
	f2fs_put_page(fio.encrypted_page, 0);

	f2fs_put_page(page, 1);



	f2fs_update_iostat(sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);

	f2fs_update_iostat(sbi, FS_GDATA_READ_IO, F2FS_BLKSIZE);

	f2fs_update_iostat(sbi, inode, FS_DATA_READ_IO, F2FS_BLKSIZE);

	f2fs_update_iostat(sbi, NULL, FS_GDATA_READ_IO, F2FS_BLKSIZE);



	return 0;

put_encrypted_page:
@@ -1303,8 +1303,10 @@ static int move_data_block(struct inode *inode, block_t bidx, 
			goto up_out;

		}



		f2fs_update_iostat(fio.sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);

		f2fs_update_iostat(fio.sbi, FS_GDATA_READ_IO, F2FS_BLKSIZE);

		f2fs_update_iostat(fio.sbi, inode, FS_DATA_READ_IO,

							F2FS_BLKSIZE);

		f2fs_update_iostat(fio.sbi, NULL, FS_GDATA_READ_IO,

							F2FS_BLKSIZE);



		lock_page(mpage);

		if (unlikely(mpage->mapping != META_MAPPING(fio.sbi) ||
@@ -1356,7 +1358,7 @@ static int move_data_block(struct inode *inode, block_t bidx, 
		goto put_page_out;

	}



	f2fs_update_iostat(fio.sbi, FS_GC_DATA_IO, F2FS_BLKSIZE);

	f2fs_update_iostat(fio.sbi, NULL, FS_GC_DATA_IO, F2FS_BLKSIZE);



	f2fs_update_data_blkaddr(&dn, newaddr);

	set_inode_flag(inode, FI_APPEND_WRITE);