Skip to content

Commit

Permalink
mm/damon/reclaim: deduplicate 'commit_inputs' handling
Browse files Browse the repository at this point in the history
DAMON_RECLAIM's handling of 'commit_inputs' parameter is duplicated in
'after_aggregation()' and 'after_wmarks_check()' callbacks.  This commit
deduplicates the code for better maintenance.

Link: https://lkml.kernel.org/r/20220606182310.48781-4-sj@kernel.org
Signed-off-by: SeongJae Park <sj@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
SeongJae Park authored and akpm committed Jul 4, 2022
1 parent c9e124e commit f25ab3b
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions mm/damon/reclaim.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,21 @@ module_param_cb(enabled, &enabled_param_ops, &enabled, 0600);
MODULE_PARM_DESC(enabled,
"Enable or disable DAMON_RECLAIM (default: disabled)");

static int damon_reclaim_handle_commit_inputs(void)
{
int err;

if (!commit_inputs)
return 0;

err = damon_reclaim_apply_parameters();
commit_inputs = false;
return err;
}

static int damon_reclaim_after_aggregation(struct damon_ctx *c)
{
struct damos *s;
int err = 0;

/* update the stats parameter */
damon_for_each_scheme(s, c) {
Expand All @@ -417,22 +428,12 @@ static int damon_reclaim_after_aggregation(struct damon_ctx *c)
nr_quota_exceeds = s->stat.qt_exceeds;
}

if (commit_inputs) {
err = damon_reclaim_apply_parameters();
commit_inputs = false;
}
return err;
return damon_reclaim_handle_commit_inputs();
}

static int damon_reclaim_after_wmarks_check(struct damon_ctx *c)
{
int err = 0;

if (commit_inputs) {
err = damon_reclaim_apply_parameters();
commit_inputs = false;
}
return err;
return damon_reclaim_handle_commit_inputs();
}

static int __init damon_reclaim_init(void)
Expand Down

0 comments on commit f25ab3b

Please sign in to comment.