mm-damon-sysfs-schemes-decouple-from-damos_action.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/sysfs-schemes: decouple from damos_action
has been removed from the -mm tree. Its filename was
mm-damon-sysfs-schemes-decouple-from-damos_action.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: SeongJae Park <[email protected]>
Subject: mm/damon/sysfs-schemes: decouple from damos_action
Date: Sun, 22 Jun 2025 14:37:56 -0700
Decouple DAMOS sysfs interface from damos_action. For this, define and use new sysfs-schemes internal data structure that maps the user-space keywords and damos_action, instead of having the implicit and unflexible array index rule.
---
mm/damon/sysfs-schemes.c | 80 ++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 18 deletions(-)
mm/damon/sysfs-schemes.c renamed from mm/damon/sysfs-schemes.c~mm-damon-sysfs-schemes-decouple-from-damos_action +62 -18
@@ -1614,18 +1614,52 @@ struct damon_sysfs_scheme {int target_nid; }; -/* This should match with enum damos_action */ -static const char *const damon_sysfs_damos_action_strs[] = { -"willneed" , -"cold" , -"pageout" , -"hugepage" , -"nohugepage" , -"lru_prio" , -"lru_deprio" , -"migrate_hot" , -"migrate_cold" , -"stat" , +struct damos_sysfs_action_name { +enum damos_action action; +char *name; +}; + +static struct damos_sysfs_action_name damos_sysfs_action_names[] = { + { + .action =DAMOS_WILLNEED , + .name ="willneed" , + }, + { + .action =DAMOS_COLD , + .name ="cold" , + }, + { + .action =DAMOS_PAGEOUT , + .name ="pageout" , + }, + { + .action =DAMOS_HUGEPAGE , + .name ="hugepage" , + }, + { + .action =DAMOS_NOHUGEPAGE , + .name ="nohugepage" , + }, + { + .action =DAMOS_LRU_PRIO , + .name ="lru_prio" , + }, + { + .action =DAMOS_LRU_DEPRIO , + .name ="lru_deprio" , + }, + { + .action =DAMOS_MIGRATE_HOT , + .name ="migrate_hot" , + }, + { + .action =DAMOS_MIGRATE_COLD , + .name ="migrate_cold" , + }, + { + .action =DAMOS_STAT , + .name ="stat" , + }, }; static struct damon_sysfs_scheme *damon_sysfs_scheme_alloc(
@@ -1862,9 +1896,16 @@ static ssize_t action_show(struct kobjec {struct damon_sysfs_scheme *scheme =container_of (kobj, struct damon_sysfs_scheme, kobj); +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_action_names); i++) { +struct damos_sysfs_action_name *action_name; -return sysfs_emit (buf,"%s\n" , - damon_sysfs_damos_action_strs[scheme->action]); + action_name = &damos_sysfs_action_names[i]; +if (action_name->action == scheme->action) +return sysfs_emit (buf,"%s\n" , action_name->name); + } +return -EINVAL ; } static ssize_t action_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -1872,11 +1913,14 @@ static ssize_t action_store(struct kobje {struct damon_sysfs_scheme *scheme =container_of (kobj, struct damon_sysfs_scheme, kobj); -enum damos_action action; +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_action_names); i++) { +struct damos_sysfs_action_name *action_name; -for (action =0 ; action <NR_DAMOS_ACTIONS ; action++) { -if (sysfs_streq (buf, damon_sysfs_damos_action_strs[action])) { - scheme->action = action; + action_name = &damos_sysfs_action_names[i]; +if (sysfs_streq (buf, action_name->name)) { + scheme->action = action_name->action;return count; } }
_
Patches currently in -mm which might be from [email protected] are
selftests-damon-add-drgn-script-for-extracting-damon-status.patch selftests-damon-_damon_sysfs-set-kdamondpid-in-start.patch selftests-damon-add-python-and-drgn-based-damon-sysfs-test.patch selftests-damon-sysfspy-test-monitoring-attribute-parameters.patch selftests-damon-sysfspy-test-adaptive-targets-parameter.patch selftests-damon-sysfspy-test-damos-schemes-parameters-setup.patch mm-damon-add-trace-event-for-auto-tuned-monitoring-intervals.patch mm-damon-add-trace-event-for-effective-size-quota.patch mm-damon-add-trace-event-for-effective-size-quota-fix.patch mm-damon-add-trace-event-for-effective-size-quota-fix-2.patch samples-damon-wsse-fix-boot-time-enable-handling.patch samples-damon-prcl-fix-boot-time-enable-crash.patch samples-damon-mtier-support-boot-time-enable-setup.patch mm-damon-reclaim-reset-enabled-when-damon-start-failed.patch mm-damon-lru_sort-reset-enabled-when-damon-start-failed.patch mm-damon-reclaim-use-parameter-context-correctly.patch samples-damon-wsse-rename-to-have-damon_sample_-prefix.patch samples-damon-prcl-rename-to-have-damon_sample_-prefix.patch samples-damon-mtier-rename-to-have-damon_sample_-prefix.patch mm-damon-sysfs-use-damon-core-api-damon_is_running.patch mm-damon-sysfs-dont-hold-kdamond_lock-in-before_terminate.patch docs-mm-damon-maintainer-profile-update-for-mm-new-tree.patch mm-damon-add-struct-damos_migrate_dests.patch mm-damon-core-add-damos-migrate_dests-field.patch mm-damon-sysfs-schemes-implement-damos-action-destinations-directory.patch mm-damon-sysfs-schemes-set-damos-migrate_dests.patch docs-abi-damon-document-schemes-dests-directory.patch docs-admin-guide-mm-damon-usage-document-dests-directory.patch