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

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

f2fs: introduce CP_TRIMMED_FLAG to avoid unneeded discard 



Introduce CP_TRIMMED_FLAG to indicate all invalid block were trimmed
before umount, so once we do mount with image which contain the flag,
we don't record invalid blocks as undiscard one, when fstrim is being
triggered, we can avoid issuing redundant discard commands.

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

fs/f2fs/checkpoint.c

+3 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,9 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
			sbi->blocks_per_seg - NM_I(sbi)->nat_bits_blocks)

		disable_nat_bits(sbi, false);



	if (cpc->reason & CP_TRIMMED)

		__set_ckpt_flags(ckpt, CP_TRIMMED_FLAG);



	if (cpc->reason & CP_UMOUNT)

		__set_ckpt_flags(ckpt, CP_UMOUNT_FLAG);

	else

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ enum { 
#define	CP_SYNC		0x00000004

#define	CP_RECOVERY	0x00000008

#define	CP_DISCARD	0x00000010

#define CP_TRIMMED	0x00000020



#define DEF_BATCHED_TRIM_SECTIONS	2048

#define BATCHED_TRIM_SEGMENTS(sbi)	\

fs/f2fs/segment.c

+20 −8
Original line number Diff line number Diff line
@@ -3005,11 +3005,18 @@ static void build_sit_entries(struct f2fs_sb_info *sbi) 


			/* build discard map only one time */

			if (f2fs_discard_en(sbi)) {

				memcpy(se->discard_map, se->cur_valid_map,

				if (is_set_ckpt_flags(sbi, CP_TRIMMED_FLAG)) {

					memset(se->discard_map, 0xff,

						SIT_VBLOCK_MAP_SIZE);

				} else {

					memcpy(se->discard_map,

						se->cur_valid_map,

						SIT_VBLOCK_MAP_SIZE);

				sbi->discard_blks += sbi->blocks_per_seg -

					sbi->discard_blks +=

						sbi->blocks_per_seg -

						se->valid_blocks;

				}

			}



			if (sbi->segs_per_sec > 1)

				get_sec_entry(sbi, start)->valid_blocks +=
@@ -3032,11 +3039,16 @@ static void build_sit_entries(struct f2fs_sb_info *sbi) 
		seg_info_from_raw_sit(se, &sit);



		if (f2fs_discard_en(sbi)) {

			if (is_set_ckpt_flags(sbi, CP_TRIMMED_FLAG)) {

				memset(se->discard_map, 0xff,

							SIT_VBLOCK_MAP_SIZE);

			} else {

				memcpy(se->discard_map, se->cur_valid_map,

							SIT_VBLOCK_MAP_SIZE);

				sbi->discard_blks += old_valid_blocks -

							se->valid_blocks;

			}

		}



		if (sbi->segs_per_sec > 1)

			get_sec_entry(sbi, start)->valid_blocks +=

fs/f2fs/super.c

+7 −0
Original line number Diff line number Diff line
@@ -797,6 +797,13 @@ static void f2fs_put_super(struct super_block *sb) 
	/* be sure to wait for any on-going discard commands */

	f2fs_wait_discard_bios(sbi);



	if (!sbi->discard_blks) {

		struct cp_control cpc = {

			.reason = CP_UMOUNT | CP_TRIMMED,

		};

		write_checkpoint(sbi, &cpc);

	}



	/* write_checkpoint can update stat informaion */

	f2fs_destroy_stats(sbi);

include/linux/f2fs_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct f2fs_super_block { 
/*

 * For checkpoint

 */

#define CP_TRIMMED_FLAG		0x00000100

#define CP_NAT_BITS_FLAG	0x00000080

#define CP_CRC_RECOVERY_FLAG	0x00000040

#define CP_FASTBOOT_FLAG	0x00000020