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

Commit 55828d6e authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Jaegeuk Kim
Browse files

f2fs: speed up gc_urgent mode with SSR 



commit b3a97a2a9a7b2d50bcf13d32857cd6f5695c6b65 upstream.

This patch activates SSR in gc_urgent mode.

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

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -2625,6 +2625,7 @@ void destroy_node_manager_caches(void); 
/*

 * segment.c

 */

bool need_SSR(struct f2fs_sb_info *sbi);

void register_inmem_page(struct inode *inode, struct page *page);

void drop_inmem_pages(struct inode *inode);

void drop_inmem_page(struct inode *inode, struct page *page);

fs/f2fs/segment.c

+15 −0
Original line number Diff line number Diff line
@@ -169,6 +169,21 @@ found: 
	return result - size + __reverse_ffz(tmp);

}



bool need_SSR(struct f2fs_sb_info *sbi)

{

	int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);

	int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);

	int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);



	if (test_opt(sbi, LFS))

		return false;

	if (sbi->gc_thread && sbi->gc_thread->gc_urgent)

		return true;



	return free_sections(sbi) <= (node_secs + 2 * dent_secs + imeta_secs +

						2 * reserved_sections(sbi));

}



void register_inmem_page(struct inode *inode, struct page *page)

{

	struct f2fs_inode_info *fi = F2FS_I(inode);

fs/f2fs/segment.h

+0 −13
Original line number Diff line number Diff line
@@ -496,19 +496,6 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi) 
	return GET_SEC_FROM_SEG(sbi, (unsigned int)reserved_segments(sbi));

}



static inline bool need_SSR(struct f2fs_sb_info *sbi)

{

	int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);

	int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);

	int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);



	if (test_opt(sbi, LFS))

		return false;



	return free_sections(sbi) <= (node_secs + 2 * dent_secs + imeta_secs +

						2 * reserved_sections(sbi));

}



static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,

					int freed, int needed)

{