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

Commit 8dcf2ff7 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: count the number of inmemory pages 



This patch adds counting # of inmemory pages in the page cache.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 12662234

fs/f2fs/debug.c

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) 
	si->ndirty_dent = get_pages(sbi, F2FS_DIRTY_DENTS);

	si->ndirty_dirs = sbi->n_dirty_dirs;

	si->ndirty_meta = get_pages(sbi, F2FS_DIRTY_META);

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

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

	si->rsvd_segs = reserved_segments(sbi);

	si->overp_segs = overprovision_segments(sbi);
@@ -249,6 +250,8 @@ static int stat_show(struct seq_file *s, void *v) 
		seq_printf(s, "\nExtent Hit Ratio: %d / %d\n",

			   si->hit_ext, si->total_ext);

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

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

			   si->inmem_pages);

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

			   si->ndirty_node, si->node_pages);

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

fs/f2fs/f2fs.h

+2 −1
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ enum count_type { 
	F2FS_DIRTY_DENTS,

	F2FS_DIRTY_NODES,

	F2FS_DIRTY_META,

	F2FS_INMEM_PAGES,

	NR_COUNT_TYPE,

};
@@ -1498,7 +1499,7 @@ struct f2fs_stat_info { 
	int ndirty_node, ndirty_dent, ndirty_dirs, ndirty_meta;

	int nats, sits, fnids;

	int total_count, utilization;

	int bg_gc, inline_inode, inline_dir;

	int bg_gc, inline_inode, inline_dir, inmem_pages;

	unsigned int valid_count, valid_node_count, valid_inode_count;

	unsigned int bimodal, avg_vblocks;

	int util_free, util_valid, util_invalid;

fs/f2fs/segment.c

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ void register_inmem_page(struct inode *inode, struct page *page) 
	}

	get_page(page);

	list_add_tail(&new->list, &fi->inmem_pages);

	inc_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES);

	mutex_unlock(&fi->inmem_lock);

}
@@ -216,6 +217,7 @@ void invalidate_inmem_page(struct inode *inode, struct page *page) 
		f2fs_put_page(cur->page, 0);

		list_del(&cur->list);

		kmem_cache_free(inmem_entry_slab, cur);

		dec_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES);

	}

	mutex_unlock(&fi->inmem_lock);

}
@@ -257,6 +259,7 @@ void commit_inmem_pages(struct inode *inode, bool abort) 
		f2fs_put_page(cur->page, 1);

		list_del(&cur->list);

		kmem_cache_free(inmem_entry_slab, cur);

		dec_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES);

	}

	if (submit_bio)

		f2fs_submit_merged_bio(sbi, DATA, WRITE);