Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 648d50ba authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: show the max number of volatile operations 



This patch adds to show the max number of volatile operations which are
conducting concurrently.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 30a61ddf

fs/f2fs/debug.c

+8 −2
Original line number Diff line number Diff line
@@ -51,7 +51,9 @@ static void update_general_status(struct f2fs_sb_info *sbi) 
	si->ndirty_all = sbi->ndirty_inode[DIRTY_META];

	si->inmem_pages = get_pages(sbi, F2FS_INMEM_PAGES);

	si->aw_cnt = atomic_read(&sbi->aw_cnt);

	si->vw_cnt = atomic_read(&sbi->vw_cnt);

	si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt);

	si->max_vw_cnt = atomic_read(&sbi->max_vw_cnt);

	si->nr_wb_cp_data = get_pages(sbi, F2FS_WB_CP_DATA);

	si->nr_wb_data = get_pages(sbi, F2FS_WB_DATA);

	if (SM_I(sbi) && SM_I(sbi)->fcc_info)
@@ -337,8 +339,10 @@ static int stat_show(struct seq_file *s, void *v) 
		seq_printf(s, "  - IO (CP: %4d, Data: %4d, Flush: %4d, Discard: %4d)\n",

			   si->nr_wb_cp_data, si->nr_wb_data,

			   si->nr_flush, si->nr_discard);

		seq_printf(s, "  - inmem: %4d, atomic IO: %4d (Max. %4d)\n",

			   si->inmem_pages, si->aw_cnt, si->max_aw_cnt);

		seq_printf(s, "  - inmem: %4d, atomic IO: %4d (Max. %4d), "

			"volatile IO: %4d (Max. %4d)\n",

			   si->inmem_pages, si->aw_cnt, si->max_aw_cnt,

			   si->vw_cnt, si->max_vw_cnt);

		seq_printf(s, "  - nodes: %4d in %4d\n",

			   si->ndirty_node, si->node_pages);

		seq_printf(s, "  - dents: %4d in dirs:%4d (%4d)\n",
@@ -438,7 +442,9 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi) 
	atomic_set(&sbi->inplace_count, 0);



	atomic_set(&sbi->aw_cnt, 0);

	atomic_set(&sbi->vw_cnt, 0);

	atomic_set(&sbi->max_aw_cnt, 0);

	atomic_set(&sbi->max_vw_cnt, 0);



	mutex_lock(&f2fs_stat_mutex);

	list_add_tail(&si->stat_list, &f2fs_stat_list);

fs/f2fs/f2fs.h

+17 −1
Original line number Diff line number Diff line
@@ -915,7 +915,9 @@ struct f2fs_sb_info { 
	atomic_t inline_inode;			/* # of inline_data inodes */

	atomic_t inline_dir;			/* # of inline_dentry inodes */

	atomic_t aw_cnt;			/* # of atomic writes */

	atomic_t vw_cnt;			/* # of volatile writes */

	atomic_t max_aw_cnt;			/* max # of atomic writes */

	atomic_t max_vw_cnt;			/* max # of volatile writes */

	int bg_gc;				/* background gc calls */

	unsigned int ndirty_inode[NR_INODE_TYPE];	/* # of dirty inodes */

#endif
@@ -2328,7 +2330,7 @@ struct f2fs_stat_info { 
	int total_count, utilization;

	int bg_gc, nr_wb_cp_data, nr_wb_data, nr_flush, nr_discard;

	int inline_xattr, inline_inode, inline_dir, append, update, orphans;

	int aw_cnt, max_aw_cnt;

	int aw_cnt, max_aw_cnt, vw_cnt, max_vw_cnt;

	unsigned int valid_count, valid_node_count, valid_inode_count, discard_blks;

	unsigned int bimodal, avg_vblocks;

	int util_free, util_valid, util_invalid;
@@ -2411,6 +2413,17 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi) 
		if (cur > max)						\

			atomic_set(&F2FS_I_SB(inode)->max_aw_cnt, cur);	\

	} while (0)

#define stat_inc_volatile_write(inode)					\

		(atomic_inc(&F2FS_I_SB(inode)->vw_cnt))

#define stat_dec_volatile_write(inode)					\

		(atomic_dec(&F2FS_I_SB(inode)->vw_cnt))

#define stat_update_max_volatile_write(inode)				\

	do {								\

		int cur = atomic_read(&F2FS_I_SB(inode)->vw_cnt);	\

		int max = atomic_read(&F2FS_I_SB(inode)->max_vw_cnt);	\

		if (cur > max)						\

			atomic_set(&F2FS_I_SB(inode)->max_vw_cnt, cur);	\

	} while (0)

#define stat_inc_seg_count(sbi, type, gc_type)				\

	do {								\

		struct f2fs_stat_info *si = F2FS_STAT(sbi);		\
@@ -2467,6 +2480,9 @@ void f2fs_destroy_root_stats(void); 
#define stat_inc_atomic_write(inode)

#define stat_dec_atomic_write(inode)

#define stat_update_max_atomic_write(inode)

#define stat_inc_volatile_write(inode)

#define stat_dec_volatile_write(inode)

#define stat_update_max_volatile_write(inode)

#define stat_inc_seg_type(sbi, curseg)

#define stat_inc_block_count(sbi, curseg)

#define stat_inc_inplace_blocks(sbi)

fs/f2fs/file.c

+5 −0
Original line number Diff line number Diff line
@@ -1426,6 +1426,7 @@ static int f2fs_release_file(struct inode *inode, struct file *filp) 
		drop_inmem_pages(inode);

	if (f2fs_is_volatile_file(inode)) {

		clear_inode_flag(inode, FI_VOLATILE_FILE);

		stat_dec_volatile_write(inode);

		set_inode_flag(inode, FI_DROP_CACHE);

		filemap_fdatawrite(inode->i_mapping);

		clear_inode_flag(inode, FI_DROP_CACHE);
@@ -1613,6 +1614,9 @@ static int f2fs_ioc_start_volatile_write(struct file *filp) 
	if (ret)

		goto out;



	stat_inc_volatile_write(inode);

	stat_update_max_volatile_write(inode);



	set_inode_flag(inode, FI_VOLATILE_FILE);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

out:
@@ -1668,6 +1672,7 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp) 
		drop_inmem_pages(inode);

	if (f2fs_is_volatile_file(inode)) {

		clear_inode_flag(inode, FI_VOLATILE_FILE);

		stat_dec_volatile_write(inode);

		ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);

	}