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

f2fs: support lower priority asynchronous readahead in ra_meta_pages 



Now, we use ra_meta_pages to reads continuous physical blocks as much as
possible to improve performance of following reads. However, ra_meta_pages
uses a synchronous readahead approach by submitting bio with READ, as READ
is with high priority, it can not be used in the case of preloading blocks,
and it's not sure when these RAed pages will be used.

This patch supports asynchronous readahead in ra_meta_pages by tagging bio
with READA flag in order to allow preloading.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2b947003

fs/f2fs/checkpoint.c

+5 −4
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ bool is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type) 
/*

 * Readahead CP/NAT/SIT/SSA pages

 */

int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, int type)

int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,

							int type, bool sync)

{

	block_t prev_blk_addr = 0;

	struct page *page;
@@ -148,7 +149,7 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, int type 
	struct f2fs_io_info fio = {

		.sbi = sbi,

		.type = META,

		.rw = READ_SYNC | REQ_META | REQ_PRIO,

		.rw = sync ? (READ_SYNC | REQ_META | REQ_PRIO) : READA,

		.encrypted_page = NULL,

	};
@@ -214,7 +215,7 @@ void ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index) 
	f2fs_put_page(page, 0);



	if (readahead)

		ra_meta_pages(sbi, index, MAX_BIO_BLOCKS(sbi), META_POR);

		ra_meta_pages(sbi, index, MAX_BIO_BLOCKS(sbi), META_POR, true);

}



static int f2fs_write_meta_page(struct page *page,
@@ -521,7 +522,7 @@ int recover_orphan_inodes(struct f2fs_sb_info *sbi) 
	start_blk = __start_cp_addr(sbi) + 1 + __cp_payload(sbi);

	orphan_blocks = __start_sum_addr(sbi) - 1 - __cp_payload(sbi);



	ra_meta_pages(sbi, start_blk, orphan_blocks, META_CP);

	ra_meta_pages(sbi, start_blk, orphan_blocks, META_CP, true);



	for (i = 0; i < orphan_blocks; i++) {

		struct page *page = get_meta_page(sbi, start_blk + i);

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -1808,7 +1808,7 @@ struct page *grab_meta_page(struct f2fs_sb_info *, pgoff_t); 
struct page *get_meta_page(struct f2fs_sb_info *, pgoff_t);

struct page *get_tmp_page(struct f2fs_sb_info *, pgoff_t);

bool is_valid_blkaddr(struct f2fs_sb_info *, block_t, int);

int ra_meta_pages(struct f2fs_sb_info *, block_t, int, int);

int ra_meta_pages(struct f2fs_sb_info *, block_t, int, int, bool);

void ra_meta_pages_cond(struct f2fs_sb_info *, pgoff_t);

long sync_meta_pages(struct f2fs_sb_info *, enum page_type, long);

void add_dirty_inode(struct f2fs_sb_info *, nid_t, int type);

fs/f2fs/gc.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ gc_more: 
	/* readahead multi ssa blocks those have contiguous address */

	if (sbi->segs_per_sec > 1)

		ra_meta_pages(sbi, GET_SUM_BLOCK(sbi, segno), sbi->segs_per_sec,

								META_SSA);

							META_SSA, true);



	for (i = 0; i < sbi->segs_per_sec; i++) {

		/*

fs/f2fs/node.c

+3 −2
Original line number Diff line number Diff line
@@ -1529,7 +1529,8 @@ static void build_free_nids(struct f2fs_sb_info *sbi) 
		return;



	/* readahead nat pages to be scanned */

	ra_meta_pages(sbi, NAT_BLOCK_OFFSET(nid), FREE_NID_PAGES, META_NAT);

	ra_meta_pages(sbi, NAT_BLOCK_OFFSET(nid), FREE_NID_PAGES,

							META_NAT, true);



	while (1) {

		struct page *page = get_current_nat_page(sbi, nid);
@@ -1804,7 +1805,7 @@ int restore_node_summary(struct f2fs_sb_info *sbi, 
		nrpages = min(last_offset - i, bio_blocks);



		/* readahead node pages */

		ra_meta_pages(sbi, addr, nrpages, META_POR);

		ra_meta_pages(sbi, addr, nrpages, META_POR, true);



		for (idx = addr; idx < addr + nrpages; idx++) {

			struct page *page = get_tmp_page(sbi, idx);

fs/f2fs/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) 
	curseg = CURSEG_I(sbi, CURSEG_WARM_NODE);

	blkaddr = NEXT_FREE_BLKADDR(sbi, curseg);



	ra_meta_pages(sbi, blkaddr, 1, META_POR);

	ra_meta_pages(sbi, blkaddr, 1, META_POR, true);



	while (1) {

		struct fsync_inode_entry *entry;

CRA Git | Maintained and supported by SUSTech CRA and CCSE