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 05/12] mm/damon/sysfs: remove unnecessary online tuning handling code
Date: Tue, 18 Jun 2024 11:18:02 -0700 [thread overview]
Message-ID: <20240618181809.82078-6-sj@kernel.org> (raw)
In-Reply-To: <20240618181809.82078-1-sj@kernel.org>
damon/sysfs.c contains code for handling of online DAMON parameters
update edge cases. It is no more necessary since damon_commit_ctx()
takes care of the cases. Remove the unnecessary code.
Signed-off-by: SeongJae Park <sj@kernel.org>
---
mm/damon/sysfs-test.h | 2 +-
mm/damon/sysfs.c | 60 ++-----------------------------------------
2 files changed, 3 insertions(+), 59 deletions(-)
diff --git a/mm/damon/sysfs-test.h b/mm/damon/sysfs-test.h
index 73bdce2452c1..43a15156a7c3 100644
--- a/mm/damon/sysfs-test.h
+++ b/mm/damon/sysfs-test.h
@@ -62,7 +62,7 @@ static void damon_sysfs_test_set_targets(struct kunit *test)
sysfs_target->pid = __damon_sysfs_test_get_any_pid(
sysfs_target->pid + 1, 200);
damon_sysfs_set_targets(ctx, sysfs_targets);
- KUNIT_EXPECT_EQ(test, 1u, nr_damon_targets(ctx));
+ KUNIT_EXPECT_EQ(test, 2u, nr_damon_targets(ctx));
damon_destroy_ctx(ctx);
kfree(sysfs_targets->targets_arr);
diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c
index 0f9fe18beb40..c729222797b8 100644
--- a/mm/damon/sysfs.c
+++ b/mm/damon/sysfs.c
@@ -1162,72 +1162,16 @@ static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target,
return err;
}
-static int damon_sysfs_update_target_pid(struct damon_target *target, int pid)
-{
- struct pid *pid_new;
-
- pid_new = find_get_pid(pid);
- if (!pid_new)
- return -EINVAL;
-
- if (pid_new == target->pid) {
- put_pid(pid_new);
- return 0;
- }
-
- put_pid(target->pid);
- target->pid = pid_new;
- return 0;
-}
-
-static int damon_sysfs_update_target(struct damon_target *target,
- struct damon_ctx *ctx,
- struct damon_sysfs_target *sys_target)
-{
- int err = 0;
-
- if (damon_target_has_pid(ctx)) {
- err = damon_sysfs_update_target_pid(target, sys_target->pid);
- if (err)
- return err;
- }
-
- /*
- * Do monitoring target region boundary update only if one or more
- * regions are set by the user. This is for keeping current monitoring
- * target results and range easier, especially for dynamic monitoring
- * target regions update ops like 'vaddr'.
- */
- if (sys_target->regions->nr)
- err = damon_sysfs_set_regions(target, sys_target->regions);
- return err;
-}
-
static int damon_sysfs_set_targets(struct damon_ctx *ctx,
struct damon_sysfs_targets *sysfs_targets)
{
- struct damon_target *t, *next;
- int i = 0, err;
+ int i, err;
/* Multiple physical address space monitoring targets makes no sense */
if (ctx->ops.id == DAMON_OPS_PADDR && sysfs_targets->nr > 1)
return -EINVAL;
- damon_for_each_target_safe(t, next, ctx) {
- if (i < sysfs_targets->nr) {
- err = damon_sysfs_update_target(t, ctx,
- sysfs_targets->targets_arr[i]);
- if (err)
- return err;
- } else {
- if (damon_target_has_pid(ctx))
- put_pid(t->pid);
- damon_destroy_target(t);
- }
- i++;
- }
-
- for (; i < sysfs_targets->nr; i++) {
+ for (i = 0; i < sysfs_targets->nr; i++) {
struct damon_sysfs_target *st = sysfs_targets->targets_arr[i];
err = damon_sysfs_add_target(st, 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 ` SeongJae Park [this message]
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 ` [PATCH 08/12] mm/damon/sysfs-schemes: rename *_set_{schemes,scheme_filters,quota_score,schemes}() SeongJae Park
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-6-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