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

Commit 55c20926 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: hurry up to issue discard after io interruption 



Once we encounter I/O interruption during issuing discards, we will delay
long time before next round, but if system status is I/O idle during the
time, it may loses opportunity to issue discards. So this patch changes
to hurry up to issue discard after io interruption.

Besides, this patch also fixes to issue discards accurately with assigned
rate.

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

fs/f2fs/segment.c

+15 −2
Original line number Diff line number Diff line
@@ -1142,6 +1142,7 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, bool issue_cond) 
	struct blk_plug plug;

	int iter = 0, issued = 0;

	int i;

	bool io_interrupted = false;



	mutex_lock(&dcc->cmd_lock);

	f2fs_bug_on(sbi,
@@ -1163,11 +1164,20 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, bool issue_cond) 
				continue;

			}



			if (!issue_cond || is_idle(sbi)) {

			if (!issue_cond) {

				__submit_discard_cmd(sbi, dc);

				issued++;

				continue;

			}



			if (is_idle(sbi)) {

				__submit_discard_cmd(sbi, dc);

				issued++;

			} else {

				io_interrupted = true;

			}

			if (issue_cond && iter++ > DISCARD_ISSUE_RATE)



			if (++iter >= DISCARD_ISSUE_RATE)

				goto out;

		}

		if (list_empty(pend_list) && dcc->pend_list_tag[i] & P_TRIM)
@@ -1177,6 +1187,9 @@ out: 
	blk_finish_plug(&plug);

	mutex_unlock(&dcc->cmd_lock);



	if (!issued && io_interrupted)

		issued = -1;



	return issued;

}