Commit 366f8f3b authored by SeongJae Park's avatar SeongJae Park Committed by Wen Zhiwei
Browse files

mm/damon/core: check apply interval in damon_do_apply_schemes() 

stable inclusion
from stable-v6.6.63
commit b0fb9543b1198b797afe08c03699e90828ca8074
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBI1RP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b0fb9543b1198b797afe08c03699e90828ca8074

--------------------------------

commit e9e3db69966d5e9e6f7e7d017b407c0025180fe5 upstream.

kdamond_apply_schemes() checks apply intervals of schemes and avoid
further applying any schemes if no scheme passed its apply interval.
However, the following schemes applying function, damon_do_apply_schemes()
iterates all schemes without the apply interval check.  As a result, the
shortest apply interval is applied to all schemes.  Fix the problem by
checking the apply interval in damon_do_apply_schemes().

Link: https://lkml.kernel.org/r/20240205201306.88562-1-sj@kernel.org


Fixes: 42f994b71404 ("mm/damon/core: implement scheme-specific apply interval")
Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Cc: <stable@vger.kernel.org>	[6.7.x]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent d8f5a7e0

mm/damon/core.c

+11 −4
Original line number Diff line number Diff line
@@ -989,6 +989,9 @@ static void damon_do_apply_schemes(struct damon_ctx *c, 
	damon_for_each_scheme(s, c) {

		struct damos_quota *quota = &s->quota;



		if (c->passed_sample_intervals != s->next_apply_sis)

			continue;



		if (!s->wmarks.activated)

			continue;
@@ -1089,10 +1092,6 @@ static void kdamond_apply_schemes(struct damon_ctx *c) 
		if (c->passed_sample_intervals != s->next_apply_sis)

			continue;



		s->next_apply_sis +=

			(s->apply_interval_us ? s->apply_interval_us :

			 c->attrs.aggr_interval) / sample_interval;



		if (!s->wmarks.activated)

			continue;
@@ -1108,6 +1107,14 @@ static void kdamond_apply_schemes(struct damon_ctx *c) 
		damon_for_each_region_safe(r, next_r, t)

			damon_do_apply_schemes(c, t, r);

	}



	damon_for_each_scheme(s, c) {

		if (c->passed_sample_intervals != s->next_apply_sis)

			continue;

		s->next_apply_sis +=

			(s->apply_interval_us ? s->apply_interval_us :

			 c->attrs.aggr_interval) / sample_interval;

	}

}



/*