Commit ad4d307f authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: avoid very large discard command 



This patch adds MAX_DISCARD_BLOCKS() to avoid issuing too much large single
discard command.

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

fs/f2fs/f2fs.h

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ enum { 
		(SM_I(sbi)->trim_sections * (sbi)->segs_per_sec)

#define BATCHED_TRIM_BLOCKS(sbi)	\

		(BATCHED_TRIM_SEGMENTS(sbi) << (sbi)->log_blocks_per_seg)



#define MAX_DISCARD_BLOCKS(sbi)						\

		((1 << (sbi)->log_blocks_per_seg) * (sbi)->segs_per_sec)

#define DISCARD_ISSUE_RATE	8

#define DEF_CP_INTERVAL			60	/* 60 secs */

#define DEF_IDLE_INTERVAL		5	/* 5 secs */

fs/f2fs/segment.c

+2 −1
Original line number Diff line number Diff line
@@ -886,7 +886,8 @@ static void __add_discard_entry(struct f2fs_sb_info *sbi, 
	if (!list_empty(head)) {

		last = list_last_entry(head, struct discard_entry, list);

		if (START_BLOCK(sbi, cpc->trim_start) + start ==

						last->blkaddr + last->len) {

				last->blkaddr + last->len &&

				last->len < MAX_DISCARD_BLOCKS(sbi)) {

			last->len += end - start;

			goto done;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE