Commit fdb7ccc3 authored by Yangtao Li's avatar Yangtao Li Committed by Jaegeuk Kim
Browse files

f2fs: introduce IS_F2FS_IPU_* macro 



IS_F2FS_IPU_* macro can be used to identify whether
f2fs ipu related policies are enabled.

BTW, convert to use BIT() instead of open code.

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent fdbf69a7

fs/f2fs/data.c

+10 −15
Original line number Diff line number Diff line
@@ -2539,34 +2539,29 @@ static inline bool check_inplace_update_policy(struct inode *inode, 
				struct f2fs_io_info *fio)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	unsigned int policy = SM_I(sbi)->ipu_policy;



	if (policy & (0x1 << F2FS_IPU_HONOR_OPU_WRITE) &&

	if (IS_F2FS_IPU_HONOR_OPU_WRITE(sbi) &&

	    is_inode_flag_set(inode, FI_OPU_WRITE))

		return false;

	if (policy & (0x1 << F2FS_IPU_FORCE))

	if (IS_F2FS_IPU_FORCE(sbi))

		return true;

	if (policy & (0x1 << F2FS_IPU_SSR) && f2fs_need_SSR(sbi))

	if (IS_F2FS_IPU_SSR(sbi) && f2fs_need_SSR(sbi))

		return true;

	if (policy & (0x1 << F2FS_IPU_UTIL) &&

			utilization(sbi) > SM_I(sbi)->min_ipu_util)

	if (IS_F2FS_IPU_UTIL(sbi) && utilization(sbi) > SM_I(sbi)->min_ipu_util)

		return true;

	if (policy & (0x1 << F2FS_IPU_SSR_UTIL) && f2fs_need_SSR(sbi) &&

	if (IS_F2FS_IPU_SSR_UTIL(sbi) && f2fs_need_SSR(sbi) &&

	    utilization(sbi) > SM_I(sbi)->min_ipu_util)

		return true;



	/*

	 * IPU for rewrite async pages

	 */

	if (policy & (0x1 << F2FS_IPU_ASYNC) &&

			fio && fio->op == REQ_OP_WRITE &&

			!(fio->op_flags & REQ_SYNC) &&

			!IS_ENCRYPTED(inode))

	if (IS_F2FS_IPU_ASYNC(sbi) && fio && fio->op == REQ_OP_WRITE &&

	    !(fio->op_flags & REQ_SYNC) && !IS_ENCRYPTED(inode))

		return true;



	/* this is only set during fdatasync */

	if (policy & (0x1 << F2FS_IPU_FSYNC) &&

			is_inode_flag_set(inode, FI_NEED_IPU))

	if (IS_F2FS_IPU_FSYNC(sbi) && is_inode_flag_set(inode, FI_NEED_IPU))

		return true;



	if (unlikely(fio && is_sbi_flag_set(sbi, SBI_CP_DISABLED) &&

fs/f2fs/segment.c

+2 −2
Original line number Diff line number Diff line
@@ -3487,7 +3487,7 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio) 


	stat_inc_inplace_blocks(fio->sbi);



	if (fio->bio && !(SM_I(sbi)->ipu_policy & (1 << F2FS_IPU_NOCACHE)))

	if (fio->bio && !IS_F2FS_IPU_NOCACHE(sbi))

		err = f2fs_merge_page_bio(fio);

	else

		err = f2fs_submit_page_bio(fio);
@@ -5126,7 +5126,7 @@ int f2fs_build_segment_manager(struct f2fs_sb_info *sbi) 
		sm_info->rec_prefree_segments = DEF_MAX_RECLAIM_PREFREE_SEGMENTS;



	if (!f2fs_lfs_mode(sbi))

		sm_info->ipu_policy = 1 << F2FS_IPU_FSYNC;

		sm_info->ipu_policy = BIT(F2FS_IPU_FSYNC);

	sm_info->min_ipu_util = DEF_MIN_IPU_UTIL;

	sm_info->min_fsync_blocks = DEF_MIN_FSYNC_BLOCKS;

	sm_info->min_seq_blocks = sbi->blocks_per_seg;

fs/f2fs/segment.h

+15 −0
Original line number Diff line number Diff line
@@ -681,6 +681,21 @@ enum { 
	F2FS_IPU_HONOR_OPU_WRITE,

};



#define F2FS_IPU_POLICY(name)					\

static inline int IS_##name(struct f2fs_sb_info *sbi)		\

{								\

	return SM_I(sbi)->ipu_policy & BIT(name);		\

}



F2FS_IPU_POLICY(F2FS_IPU_FORCE);

F2FS_IPU_POLICY(F2FS_IPU_SSR);

F2FS_IPU_POLICY(F2FS_IPU_UTIL);

F2FS_IPU_POLICY(F2FS_IPU_SSR_UTIL);

F2FS_IPU_POLICY(F2FS_IPU_FSYNC);

F2FS_IPU_POLICY(F2FS_IPU_ASYNC);

F2FS_IPU_POLICY(F2FS_IPU_NOCACHE);

F2FS_IPU_POLICY(F2FS_IPU_HONOR_OPU_WRITE);



static inline unsigned int curseg_segno(struct f2fs_sb_info *sbi,

		int type)

{

fs/f2fs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -4089,8 +4089,8 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi) 
		if (f2fs_block_unit_discard(sbi))

			SM_I(sbi)->dcc_info->discard_granularity =

						MIN_DISCARD_GRANULARITY;

		SM_I(sbi)->ipu_policy = 1 << F2FS_IPU_FORCE |

					1 << F2FS_IPU_HONOR_OPU_WRITE;

		SM_I(sbi)->ipu_policy = BIT(F2FS_IPU_FORCE) |

					BIT(F2FS_IPU_HONOR_OPU_WRITE);

	}



	sbi->readdir_ra = true;