Merge "f2fs: fix the periodic wakeups of discard thread" (3bfa948f) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/f2fs/node.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -44,11 +44,15 @@ int f2fs_check_nid_range(struct f2fs_sb_info *sbi, nid_t nid)
		bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)
		{
		struct f2fs_nm_info *nm_i = NM_I(sbi);
		struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
		struct sysinfo val;
		unsigned long avail_ram;
		unsigned long mem_size = 0;
		bool res = false;

		if (!nm_i)
		return true;

		si_meminfo(&val);

		/* only uses low memory */
		@@ -90,6 +94,10 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)
		/* it allows 20% / total_ram for inmemory pages */
		mem_size = get_pages(sbi, F2FS_INMEM_PAGES);
		res = mem_size < (val.totalram / 5);
		} else if (type == DISCARD_CACHE) {
		mem_size = (atomic_read(&dcc->discard_cmd_cnt) *
		sizeof(struct discard_cmd)) >> PAGE_SHIFT;
		res = mem_size < (avail_ram * nm_i->ram_thresh / 100);
		} else {
		if (!sbi->sb->s_bdi->wb.dirty_exceeded)
		return true;

+1 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,7 @@ enum mem_type {
		INO_ENTRIES, /* indicates inode entries */
		EXTENT_CACHE, /* indicates extent cache */
		INMEM_PAGES, /* indicates inmemory pages */
		DISCARD_CACHE, /* indicates memory of cached discard cmds */
		BASE_CHECK, /* check kernel status */
		};

+14 −6

Original line number	Diff line number	Diff line
		@@ -1072,6 +1072,8 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi,
		struct discard_policy *dpolicy,
		int discard_type, unsigned int granularity)
		{
		struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;

		/* common policy */
		dpolicy->type = discard_type;
		dpolicy->sync = true;
		@@ -1091,7 +1093,9 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi,
		dpolicy->ordered = true;
		if (utilization(sbi) > DEF_DISCARD_URGENT_UTIL) {
		dpolicy->granularity = 1;
		dpolicy->max_interval = DEF_MIN_DISCARD_ISSUE_TIME;
		if (atomic_read(&dcc->discard_cmd_cnt))
		dpolicy->max_interval =
		DEF_MIN_DISCARD_ISSUE_TIME;
		}
		} else if (discard_type == DPOLICY_FORCE) {
		dpolicy->min_interval = DEF_MIN_DISCARD_ISSUE_TIME;
		@@ -1707,9 +1711,16 @@ static int issue_discard_thread(void *data)
		set_freezable();

		do {
		if (sbi->gc_mode == GC_URGENT \|\|
		!f2fs_available_free_memory(sbi, DISCARD_CACHE))
		__init_discard_policy(sbi, &dpolicy, DPOLICY_FORCE, 1);
		else
		__init_discard_policy(sbi, &dpolicy, DPOLICY_BG,
		dcc->discard_granularity);

		if (!atomic_read(&dcc->discard_cmd_cnt))
		wait_ms = dpolicy.max_interval;

		wait_event_interruptible_timeout(*q,
		kthread_should_stop() \|\| freezing(current) \|\|
		dcc->discard_wake,
		@@ -1733,9 +1744,6 @@ static int issue_discard_thread(void *data)
		continue;
		}

		if (sbi->gc_mode == GC_URGENT)
		__init_discard_policy(sbi, &dpolicy, DPOLICY_FORCE, 1);

		sb_start_intwrite(sbi->sb);

		issued = __issue_discard_cmd(sbi, &dpolicy);