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

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

f2fs: add undiscard blocks stat 



This patch adds to account undiscard blocks.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
parent 001c584c

fs/f2fs/debug.c

+3 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) 
			atomic_read(&SM_I(sbi)->dcc_info->issing_discard);

		si->nr_discard_cmd =

			atomic_read(&SM_I(sbi)->dcc_info->discard_cmd_cnt);

		si->undiscard_blks = SM_I(sbi)->dcc_info->undiscard_blks;

	}

	si->total_count = (int)sbi->user_block_count / sbi->blocks_per_seg;

	si->rsvd_segs = reserved_segments(sbi);
@@ -348,11 +349,11 @@ static int stat_show(struct seq_file *s, void *v) 
				si->ext_tree, si->zombie_tree, si->ext_node);

		seq_puts(s, "\nBalancing F2FS Async:\n");

		seq_printf(s, "  - IO (CP: %4d, Data: %4d, Flush: (%4d %4d), "

			"Discard: (%4d %4d)) cmd: %4d\n",

			"Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",

			   si->nr_wb_cp_data, si->nr_wb_data,

			   si->nr_flushing, si->nr_flushed,

			   si->nr_discarding, si->nr_discarded,

			   si->nr_discard_cmd);

			   si->nr_discard_cmd, si->undiscard_blks);

		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,

fs/f2fs/f2fs.h

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ struct discard_cmd_control { 
	struct mutex cmd_lock;

	int nr_discards;			/* # of discards in the list */

	int max_discards;			/* max. discards to be issued */

	unsigned int undiscard_blks;		/* # of undiscard blocks */

	atomic_t issued_discard;		/* # of issued discard */

	atomic_t issing_discard;		/* # of issing discard */

	atomic_t discard_cmd_cnt;		/* # of cached cmd count */
@@ -2390,6 +2391,7 @@ struct f2fs_stat_info { 
	int bg_gc, nr_wb_cp_data, nr_wb_data;

	int nr_flushing, nr_flushed, nr_discarding, nr_discarded;

	int nr_discard_cmd;

	unsigned int undiscard_blks;

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

	int aw_cnt, max_aw_cnt, vw_cnt, max_vw_cnt;

	unsigned int valid_count, valid_node_count, valid_inode_count, discard_blks;

fs/f2fs/segment.c

+9 −0
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ static struct discard_cmd *__create_discard_cmd(struct f2fs_sb_info *sbi, 
	init_completion(&dc->wait);

	list_add_tail(&dc->list, pend_list);

	atomic_inc(&dcc->discard_cmd_cnt);

	dcc->undiscard_blks += len;



	return dc;

}
@@ -723,6 +724,7 @@ static void __detach_discard_cmd(struct discard_cmd_control *dcc, 


	list_del(&dc->list);

	rb_erase(&dc->rb_node, &dcc->root);

	dcc->undiscard_blks -= dc->len;



	kmem_cache_free(discard_cmd_slab, dc);
@@ -830,8 +832,11 @@ static void __punch_discard_cmd(struct f2fs_sb_info *sbi, 
		return;

	}



	dcc->undiscard_blks -= di.len;



	if (blkaddr > di.lstart) {

		dc->len = blkaddr - dc->lstart;

		dcc->undiscard_blks += dc->len;

		__relocate_discard_cmd(dcc, dc);

		f2fs_bug_on(sbi, !__check_rb_tree_consistence(sbi, &dcc->root));

		modified = true;
@@ -849,6 +854,7 @@ static void __punch_discard_cmd(struct f2fs_sb_info *sbi, 
			dc->lstart++;

			dc->len--;

			dc->start++;

			dcc->undiscard_blks += dc->len;

			__relocate_discard_cmd(dcc, dc);

			f2fs_bug_on(sbi,

				!__check_rb_tree_consistence(sbi, &dcc->root));
@@ -910,6 +916,7 @@ static void __update_discard_tree_range(struct f2fs_sb_info *sbi, 
			prev_dc->bdev == bdev &&

			__is_discard_back_mergeable(&di, &prev_dc->di)) {

			prev_dc->di.len += di.len;

			dcc->undiscard_blks += di.len;

			__relocate_discard_cmd(dcc, prev_dc);

			f2fs_bug_on(sbi,

				!__check_rb_tree_consistence(sbi, &dcc->root));
@@ -924,6 +931,7 @@ static void __update_discard_tree_range(struct f2fs_sb_info *sbi, 
			next_dc->di.lstart = di.lstart;

			next_dc->di.len += di.len;

			next_dc->di.start = di.start;

			dcc->undiscard_blks += di.len;

			__relocate_discard_cmd(dcc, next_dc);

			if (tdc)

				__remove_discard_cmd(sbi, tdc);
@@ -1357,6 +1365,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi) 
	atomic_set(&dcc->discard_cmd_cnt, 0);

	dcc->nr_discards = 0;

	dcc->max_discards = 0;

	dcc->undiscard_blks = 0;

	dcc->root = RB_ROOT;



	init_waitqueue_head(&dcc->discard_wait_queue);