mm/damon/sysfs-schemes: add target_nid on sysfs-schemes

This patch adds target_nid under
  /sys/kernel/mm/damon/admin/kdamonds/<N>/contexts/<N>/schemes/<N>/

The 'target_nid' can be used as the destination node for DAMOS actions
such as DAMOS_MIGRATE_{HOT,COLD} in the follow up patches.

[sj@kernel.org: document target_nid file]
Link: https://lkml.kernel.org/r/20240618213630.84846-3-sj@kernel.org
Link: https://lkml.kernel.org/r/20240614030010.751-4-honggyu.kim@sk.com
Signed-off-by: Hyeongtak Ji <hyeongtak.ji@sk.com>
Signed-off-by: Honggyu Kim <honggyu.kim@sk.com>
Signed-off-by: SeongJae Park <sj@kernel.org>
Cc: Gregory Price <gregory.price@memverge.com>
Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Rakie Kim <rakie.kim@sk.com>
Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-damon b/Documentation/ABI/testing/sysfs-kernel-mm-damon
index cef6e1d20b18559827515f415085481652658060..f1b90cf1249b5f4e5ddd8b0f377f1965cb2ecf00 100644 (file)
--- a/Documentation/ABI/testing/sysfs-kernel-mm-damon
+++ b/Documentation/ABI/testing/sysfs-kernel-mm-damon
@@ -155,6 +155,12 @@ Contact:   SeongJae Park <sj@kernel.org>
 Description:   Writing to and reading from this file sets and gets the action
                of the scheme.
 
+What:          /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/target_nid
+Date:          Jun 2024
+Contact:       SeongJae Park <sj@kernel.org>
+Description:   Action's target NUMA node id.  Supported by only relevant
+               actions.
+
 What:          /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/apply_interval_us
 Date:          Sep 2023
 Contact:       SeongJae Park <sj@kernel.org>

diff --git a/include/linux/damon.h b/include/linux/damon.h
index f7da65e1ac041eceb6b4300b8d8a6d9643f2178c..21d6b69a015ce6169f062ff6df3327c888b3c85b 100644 (file)
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -374,6 +374,7 @@ struct damos_access_pattern {
  * @apply_interval_us: The time between applying the @action.
  * @quota:             Control the aggressiveness of this scheme.
  * @wmarks:            Watermarks for automated (in)activation of this scheme.
+ * @target_nid:                Destination node if @action is "migrate_{hot,cold}".
  * @filters:           Additional set of &struct damos_filter for &action.
  * @stat:              Statistics of this scheme.
  * @list:              List head for siblings.
@@ -389,6 +390,10 @@ struct damos_access_pattern {
  * monitoring context are inactive, DAMON stops monitoring either, and just
  * repeatedly checks the watermarks.
  *
+ * @target_nid is used to set the migration target node for migrate_hot or
+ * migrate_cold actions, which means it's only meaningful when @action is either
+ * "migrate_hot" or "migrate_cold".
+ *
  * Before applying the &action to a memory region, &struct damon_operations
  * implementation could check pages of the region and skip &action to respect
  * &filters
@@ -410,6 +415,9 @@ struct damos {
 /* public: */
        struct damos_quota quota;
        struct damos_watermarks wmarks;
+       union {
+               int target_nid;
+       };
        struct list_head filters;
        struct damos_stat stat;
        struct list_head list;
@@ -726,7 +734,8 @@ struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
                        enum damos_action action,
                        unsigned long apply_interval_us,
                        struct damos_quota *quota,
-                       struct damos_watermarks *wmarks);
+                       struct damos_watermarks *wmarks,
+                       int target_nid);
 void damon_add_scheme(struct damon_ctx *ctx, struct damos *s);
 void damon_destroy_scheme(struct damos *s);
 

diff --git a/mm/damon/core.c b/mm/damon/core.c
index 6392f1cc97a3e0217e64352583e74177b35035f9..c0ec5be4f56e9e5423d6e8126a1ac4c08f90d1b9 100644 (file)
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -354,7 +354,8 @@ struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
                        enum damos_action action,
                        unsigned long apply_interval_us,
                        struct damos_quota *quota,
-                       struct damos_watermarks *wmarks)
+                       struct damos_watermarks *wmarks,
+                       int target_nid)
 {
        struct damos *scheme;
 
@@ -381,6 +382,8 @@ struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
        scheme->wmarks = *wmarks;
        scheme->wmarks.activated = true;
 
+       scheme->target_nid = target_nid;
+
        return scheme;
 }
 

diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c
index 2461cfe2e968833dd67103687ac6bc51a935a0b5..51a6f1cac3854697d3218e71d7d5b3155824ea3f 100644 (file)
--- a/mm/damon/dbgfs.c
+++ b/mm/damon/dbgfs.c
@@ -281,7 +281,7 @@ static struct damos **str_to_schemes(const char *str, ssize_t len,
 
                pos += parsed;
                scheme = damon_new_scheme(&pattern, action, 0, &quota,
-                               &wmarks);
+                               &wmarks, NUMA_NO_NODE);
                if (!scheme)
                        goto fail;
 

diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c
index 3de2916a65c38c372b5ed8472b7a87b34026aed7..3775f0f2743d5c85420277e751991e313d0fe49f 100644 (file)
--- a/mm/damon/lru_sort.c
+++ b/mm/damon/lru_sort.c
@@ -163,7 +163,8 @@ static struct damos *damon_lru_sort_new_scheme(
                        /* under the quota. */
                        &quota,
                        /* (De)activate this according to the watermarks. */
-                       &damon_lru_sort_wmarks);
+                       &damon_lru_sort_wmarks,
+                       NUMA_NO_NODE);
 }
 
 /* Create a DAMON-based operation scheme for hot memory regions */

diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c
index 9bd341d62b4c756b22cbe4d0c171400321c0f7e5..a05ccb41749bda6c3141a0892f3e1857a8a2530a 100644 (file)
--- a/mm/damon/reclaim.c
+++ b/mm/damon/reclaim.c
@@ -177,7 +177,8 @@ static struct damos *damon_reclaim_new_scheme(void)
                        /* under the quota. */
                        &damon_reclaim_quota,
                        /* (De)activate this according to the watermarks. */
-                       &damon_reclaim_wmarks);
+                       &damon_reclaim_wmarks,
+                       NUMA_NO_NODE);
 }
 
 static void damon_reclaim_copy_quota_status(struct damos_quota *dst,

diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c
index bea5bc52846a696f8de50863b8959632e913d21b..0632d28b67f819232e5870f7b65a968d67fba746 100644 (file)
--- a/mm/damon/sysfs-schemes.c
+++ b/mm/damon/sysfs-schemes.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/numa.h>
 
 #include "sysfs-common.h"
 
@@ -1445,6 +1446,7 @@ struct damon_sysfs_scheme {
        struct damon_sysfs_scheme_filters *filters;
        struct damon_sysfs_stats *stats;
        struct damon_sysfs_scheme_regions *tried_regions;
+       int target_nid;
 };
 
 /* This should match with enum damos_action */
@@ -1470,6 +1472,7 @@ static struct damon_sysfs_scheme *damon_sysfs_scheme_alloc(
        scheme->kobj = (struct kobject){};
        scheme->action = action;
        scheme->apply_interval_us = apply_interval_us;
+       scheme->target_nid = NUMA_NO_NODE;
        return scheme;
 }
 
@@ -1692,6 +1695,28 @@ static ssize_t apply_interval_us_store(struct kobject *kobj,
        return err ? err : count;
 }
 
+static ssize_t target_nid_show(struct kobject *kobj,
+               struct kobj_attribute *attr, char *buf)
+{
+       struct damon_sysfs_scheme *scheme = container_of(kobj,
+                       struct damon_sysfs_scheme, kobj);
+
+       return sysfs_emit(buf, "%d\n", scheme->target_nid);
+}
+
+static ssize_t target_nid_store(struct kobject *kobj,
+               struct kobj_attribute *attr, const char *buf, size_t count)
+{
+       struct damon_sysfs_scheme *scheme = container_of(kobj,
+                       struct damon_sysfs_scheme, kobj);
+       int err = 0;
+
+       /* TODO: error handling for target_nid range. */
+       err = kstrtoint(buf, 0, &scheme->target_nid);
+
+       return err ? err : count;
+}
+
 static void damon_sysfs_scheme_release(struct kobject *kobj)
 {
        kfree(container_of(kobj, struct damon_sysfs_scheme, kobj));
@@ -1703,9 +1728,13 @@ static struct kobj_attribute damon_sysfs_scheme_action_attr =
 static struct kobj_attribute damon_sysfs_scheme_apply_interval_us_attr =
                __ATTR_RW_MODE(apply_interval_us, 0600);
 
+static struct kobj_attribute damon_sysfs_scheme_target_nid_attr =
+               __ATTR_RW_MODE(target_nid, 0600);
+
 static struct attribute *damon_sysfs_scheme_attrs[] = {
        &damon_sysfs_scheme_action_attr.attr,
        &damon_sysfs_scheme_apply_interval_us_attr.attr,
+       &damon_sysfs_scheme_target_nid_attr.attr,
        NULL,
 };
 ATTRIBUTE_GROUPS(damon_sysfs_scheme);
@@ -2031,7 +2060,8 @@ static struct damos *damon_sysfs_mk_scheme(
        };
 
        scheme = damon_new_scheme(&pattern, sysfs_scheme->action,
-                       sysfs_scheme->apply_interval_us, &quota, &wmarks);
+                       sysfs_scheme->apply_interval_us, &quota, &wmarks,
+                       sysfs_scheme->target_nid);
        if (!scheme)
                return NULL;
 
@@ -2068,6 +2098,7 @@ static void damon_sysfs_update_scheme(struct damos *scheme,
 
        scheme->action = sysfs_scheme->action;
        scheme->apply_interval_us = sysfs_scheme->apply_interval_us;
+       scheme->target_nid = sysfs_scheme->target_nid;
 
        scheme->quota.ms = sysfs_quotas->ms;
        scheme->quota.sz = sysfs_quotas->sz;