Skip to content

Commit 5039a35

Browse files
sjp38gregkh
authored andcommitted
mm/damon/core: handle zero schemes apply interval
commit 8e7bde6 upstream. DAMON's logics to determine if this is the time to apply damos schemes assumes next_apply_sis is always set larger than current passed_sample_intervals. And therefore assume continuously incrementing passed_sample_intervals will make it reaches to the next_apply_sis in future. The logic hence does apply the scheme and update next_apply_sis only if passed_sample_intervals is same to next_apply_sis. If Schemes apply interval is set as zero, however, next_apply_sis is set same to current passed_sample_intervals, respectively. And passed_sample_intervals is incremented before doing the next_apply_sis check. Hence, next_apply_sis becomes larger than next_apply_sis, and the logic says it is not the time to apply schemes and update next_apply_sis. In other words, DAMON stops applying schemes until passed_sample_intervals overflows. Based on the documents and the common sense, a reasonable behavior for such inputs would be applying the schemes for every sampling interval. Handle the case by removing the assumption. Link: https://lkml.kernel.org/r/20241031183757.49610-3-sj@kernel.org Fixes: 42f994b ("mm/damon/core: implement scheme-specific apply interval") Signed-off-by: SeongJae Park <sj@kernel.org> Cc: <stable@vger.kernel.org> [6.7.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c672a4b commit 5039a35

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

mm/damon/core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,7 +1406,7 @@ static void damon_do_apply_schemes(struct damon_ctx *c,
14061406
damon_for_each_scheme(s, c) {
14071407
struct damos_quota *quota = &s->quota;
14081408

1409-
if (c->passed_sample_intervals != s->next_apply_sis)
1409+
if (c->passed_sample_intervals < s->next_apply_sis)
14101410
continue;
14111411

14121412
if (!s->wmarks.activated)
@@ -1627,7 +1627,7 @@ static void kdamond_apply_schemes(struct damon_ctx *c)
16271627
bool has_schemes_to_apply = false;
16281628

16291629
damon_for_each_scheme(s, c) {
1630-
if (c->passed_sample_intervals != s->next_apply_sis)
1630+
if (c->passed_sample_intervals < s->next_apply_sis)
16311631
continue;
16321632

16331633
if (!s->wmarks.activated)
@@ -1647,9 +1647,9 @@ static void kdamond_apply_schemes(struct damon_ctx *c)
16471647
}
16481648

16491649
damon_for_each_scheme(s, c) {
1650-
if (c->passed_sample_intervals != s->next_apply_sis)
1650+
if (c->passed_sample_intervals < s->next_apply_sis)
16511651
continue;
1652-
s->next_apply_sis +=
1652+
s->next_apply_sis = c->passed_sample_intervals +
16531653
(s->apply_interval_us ? s->apply_interval_us :
16541654
c->attrs.aggr_interval) / sample_interval;
16551655
}

0 commit comments

Comments
 (0)