From: SeongJae Park <sj@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: SeongJae Park <sj@kernel.org>,
damon@lists.linux.dev, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 08/12] mm/damon/sysfs-schemes: rename *_set_{schemes,scheme_filters,quota_score,schemes}()
Date: Tue, 18 Jun 2024 11:18:05 -0700 [thread overview]
Message-ID: <20240618181809.82078-9-sj@kernel.org> (raw)
In-Reply-To: <20240618181809.82078-1-sj@kernel.org>
The functions were for updating DAMON structs that may or may not be
partially populated. Hence it was not for only adding items, but also
removing unnecessary items and updating items in-place. A previous
commit has changed the functions to assume the structs are not partially
populated, and do only adding items. Make the names better explain the
behavior.
Signed-off-by: SeongJae Park <sj@kernel.org>
---
mm/damon/sysfs-common.h | 2 +-
mm/damon/sysfs-schemes.c | 12 ++++++------
mm/damon/sysfs.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mm/damon/sysfs-common.h b/mm/damon/sysfs-common.h
index a63f51577cff..9a18f3c535d3 100644
--- a/mm/damon/sysfs-common.h
+++ b/mm/damon/sysfs-common.h
@@ -38,7 +38,7 @@ void damon_sysfs_schemes_rm_dirs(struct damon_sysfs_schemes *schemes);
extern const struct kobj_type damon_sysfs_schemes_ktype;
-int damon_sysfs_set_schemes(struct damon_ctx *ctx,
+int damon_sysfs_add_schemes(struct damon_ctx *ctx,
struct damon_sysfs_schemes *sysfs_schemes);
void damon_sysfs_schemes_update_stats(
diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c
index 77c0265dff5c..b095457380b5 100644
--- a/mm/damon/sysfs-schemes.c
+++ b/mm/damon/sysfs-schemes.c
@@ -1908,7 +1908,7 @@ static int damon_sysfs_memcg_path_to_id(char *memcg_path, unsigned short *id)
return found ? 0 : -EINVAL;
}
-static int damon_sysfs_set_scheme_filters(struct damos *scheme,
+static int damon_sysfs_add_scheme_filters(struct damos *scheme,
struct damon_sysfs_scheme_filters *sysfs_filters)
{
int i;
@@ -1947,7 +1947,7 @@ static int damon_sysfs_set_scheme_filters(struct damos *scheme,
return 0;
}
-static int damos_sysfs_set_quota_score(
+static int damos_sysfs_add_quota_score(
struct damos_sysfs_quota_goals *sysfs_goals,
struct damos_quota *quota)
{
@@ -1990,7 +1990,7 @@ int damos_sysfs_set_quota_scores(struct damon_sysfs_schemes *sysfs_schemes,
break;
sysfs_scheme = sysfs_schemes->schemes_arr[i];
- err = damos_sysfs_set_quota_score(sysfs_scheme->quotas->goals,
+ err = damos_sysfs_add_quota_score(sysfs_scheme->quotas->goals,
"a);
if (err) {
damos_for_each_quota_goal_safe(g, g_next, "a)
@@ -2070,13 +2070,13 @@ static struct damos *damon_sysfs_mk_scheme(
if (!scheme)
return NULL;
- err = damos_sysfs_set_quota_score(sysfs_quotas->goals, &scheme->quota);
+ err = damos_sysfs_add_quota_score(sysfs_quotas->goals, &scheme->quota);
if (err) {
damon_destroy_scheme(scheme);
return NULL;
}
- err = damon_sysfs_set_scheme_filters(scheme, sysfs_filters);
+ err = damon_sysfs_add_scheme_filters(scheme, sysfs_filters);
if (err) {
damon_destroy_scheme(scheme);
return NULL;
@@ -2084,7 +2084,7 @@ static struct damos *damon_sysfs_mk_scheme(
return scheme;
}
-int damon_sysfs_set_schemes(struct damon_ctx *ctx,
+int damon_sysfs_add_schemes(struct damon_ctx *ctx,
struct damon_sysfs_schemes *sysfs_schemes)
{
int i;
diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c
index f83ea6a166c6..cffc755e7775 100644
--- a/mm/damon/sysfs.c
+++ b/mm/damon/sysfs.c
@@ -1286,7 +1286,7 @@ static int damon_sysfs_apply_inputs(struct damon_ctx *ctx,
err = damon_sysfs_add_targets(ctx, sys_ctx->targets);
if (err)
return err;
- return damon_sysfs_set_schemes(ctx, sys_ctx->schemes);
+ return damon_sysfs_add_schemes(ctx, sys_ctx->schemes);
}
static struct damon_ctx *damon_sysfs_build_ctx(
--
2.39.2
next prev parent reply other threads:[~2024-06-18 18:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 18:17 [PATCH 00/12] mm/damon: introduce DAMON parameters online commit function SeongJae Park
2024-06-18 18:17 ` [PATCH 01/12] mm/damon/core: implement DAMOS quota goals " SeongJae Park
2024-06-18 18:17 ` [PATCH 02/12] mm/damon/core: implement DAMON context " SeongJae Park
2024-06-18 18:18 ` [PATCH 03/12] mm/damon/sysfs: use damon_commit_ctx() SeongJae Park
2024-06-18 18:18 ` [PATCH 04/12] mm/damon/sysfs-schemes: use damos_commit_quota_goals() SeongJae Park
2024-06-18 18:18 ` [PATCH 05/12] mm/damon/sysfs: remove unnecessary online tuning handling code SeongJae Park
2024-06-18 18:18 ` [PATCH 06/12] mm/damon/sysfs: rename damon_sysfs_set_targets() to ...add_targets() SeongJae Park
2024-06-18 18:18 ` [PATCH 07/12] mm/damon/sysfs-schemes: remove unnecessary online tuning handling code SeongJae Park
2024-06-18 18:18 ` SeongJae Park [this message]
2024-06-18 18:18 ` [PATCH 09/12] mm/damon/reclaim: use damon_commit_ctx() SeongJae Park
2024-06-18 18:18 ` [PATCH 10/12] mm/damon/reclaim: remove unnecessary code for online tuning SeongJae Park
2024-06-18 18:18 ` [PATCH 11/12] mm/damon/lru_sort: use damon_commit_ctx() SeongJae Park
2024-06-18 18:18 ` [PATCH 12/12] mm/damon/lru_sort: remove unnecessary online tuning handling code SeongJae Park
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240618181809.82078-9-sj@kernel.org \
--to=sj@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=damon@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox