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

Commit e78d4d14 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "f2fs: fix unnecessary periodic wakeup of discard thread when dev is busy"

parents e65b6bdd 8145e491

fs/f2fs/f2fs.h

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ enum { 
#define DEF_MAX_DISCARD_REQUEST		8	/* issue 8 discards per round */

#define DEF_MAX_DISCARD_LEN		512	/* Max. 2MB per discard */

#define DEF_MIN_DISCARD_ISSUE_TIME	50	/* 50 ms, if exists */

#define DEF_MID_DISCARD_ISSUE_TIME	500	/* 500 ms, if device busy */

#define DEF_MAX_DISCARD_ISSUE_TIME	60000	/* 60 s, if no candidates */

#define DEF_DISCARD_URGENT_UTIL		80	/* do more discard over 80% */

#define DEF_CP_INTERVAL			60	/* 60 secs */
@@ -282,6 +283,7 @@ enum { 
struct discard_policy {

	int type;			/* type of discard */

	unsigned int min_interval;	/* used for candidates exist */

	unsigned int mid_interval;	/* used for device busy */

	unsigned int max_interval;	/* used for candidates not exist */

	unsigned int max_requests;	/* # of discards issued per round */

	unsigned int io_aware_gran;	/* minimum granularity discard not be aware of I/O */

fs/f2fs/segment.c

+11 −1
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi, 


	if (discard_type == DPOLICY_BG) {

		dpolicy->min_interval = DEF_MIN_DISCARD_ISSUE_TIME;

		dpolicy->mid_interval = DEF_MID_DISCARD_ISSUE_TIME;

		dpolicy->max_interval = DEF_MAX_DISCARD_ISSUE_TIME;

		dpolicy->io_aware = true;

		dpolicy->sync = false;
@@ -943,6 +944,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi, 
		}

	} else if (discard_type == DPOLICY_FORCE) {

		dpolicy->min_interval = DEF_MIN_DISCARD_ISSUE_TIME;

		dpolicy->mid_interval = DEF_MID_DISCARD_ISSUE_TIME;

		dpolicy->max_interval = DEF_MAX_DISCARD_ISSUE_TIME;

		dpolicy->io_aware = false;

	} else if (discard_type == DPOLICY_FSTRIM) {
@@ -1382,6 +1384,8 @@ static int issue_discard_thread(void *data) 
	struct discard_policy dpolicy;

	unsigned int wait_ms = DEF_MIN_DISCARD_ISSUE_TIME;

	int issued;

	unsigned long interval = sbi->interval_time[REQ_TIME] * HZ;

	long delta;



	set_freezable();
@@ -1409,9 +1413,15 @@ static int issue_discard_thread(void *data) 
		sb_start_intwrite(sbi->sb);



		issued = __issue_discard_cmd(sbi, &dpolicy);

		if (issued) {

		if (issued > 0) {

			__wait_all_discard_cmd(sbi, &dpolicy);

			wait_ms = dpolicy.min_interval;

		} else if (issued == -1){

			delta = (sbi->last_time[REQ_TIME] + interval) - jiffies;

			if (delta > 0)

				wait_ms = jiffies_to_msecs(delta);

			else

				wait_ms = dpolicy.mid_interval;

		} else {

			wait_ms = dpolicy.max_interval;

		}