mm-damon-sysfs-schemes-decouple-from-damos_wmark_metric.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/sysfs-schemes: decouple from damos_wmark_metric
has been removed from the -mm tree. Its filename was
mm-damon-sysfs-schemes-decouple-from-damos_wmark_metric.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_wmark_metric
Date: Sun, 22 Jun 2025 14:37:57 -0700
Decouple DAMOS sysfs interface from damos_wmark_metric. For this, define and use new sysfs-schemes internal data structure that maps the user-space keywords and damos_wmark_metric, instead of having the implicit and unflexible array index rule.
---
mm/damon/sysfs-schemes.c | 41 +++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-)
mm/damon/sysfs-schemes.c renamed from mm/damon/sysfs-schemes.c~mm-damon-sysfs-schemes-decouple-from-damos_wmark_metric +31 -10
@@ -785,10 +785,21 @@ static struct damon_sysfs_watermarks *dareturn watermarks; } -/* Should match with enum damos_wmark_metric */ -static const char *const damon_sysfs_wmark_metric_strs[] = { -"none" , -"free_mem_rate" , +struct damos_sysfs_wmark_metric_name { +enum damos_wmark_metric metric; +char *name; +}; + +static const struct damos_sysfs_wmark_metric_name +damos_sysfs_wmark_metric_names[] = { + { + .metric =DAMOS_WMARK_NONE , + .name ="none" , + }, + { + .metric =DAMOS_WMARK_FREE_MEM_RATE , + .name ="free_mem_rate" , + }, }; static ssize_t metric_show(struct kobject *kobj, struct kobj_attribute *attr,
@@ -796,9 +807,16 @@ static ssize_t metric_show(struct kobjec {struct damon_sysfs_watermarks *watermarks =container_of (kobj, struct damon_sysfs_watermarks, kobj); +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_wmark_metric_names); i++) { +const struct damos_sysfs_wmark_metric_name *metric_name; -return sysfs_emit (buf,"%s\n" , - damon_sysfs_wmark_metric_strs[watermarks->metric]); + metric_name = &damos_sysfs_wmark_metric_names[i]; +if (metric_name->metric == watermarks->metric) +return sysfs_emit (buf,"%s\n" , metric_name->name); + } +return -EINVAL ; } static ssize_t metric_store(struct kobject *kobj, struct kobj_attribute *attr,
@@ -806,11 +824,14 @@ static ssize_t metric_store(struct kobje {struct damon_sysfs_watermarks *watermarks =container_of (kobj, struct damon_sysfs_watermarks, kobj); -enum damos_wmark_metric metric; +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_wmark_metric_names); i++) { +const struct damos_sysfs_wmark_metric_name *metric_name; -for (metric =0 ; metric <NR_DAMOS_WMARK_METRICS ; metric++) { -if (sysfs_streq (buf, damon_sysfs_wmark_metric_strs[metric])) { - watermarks->metric = metric; + metric_name = &damos_sysfs_wmark_metric_names[i]; +if (sysfs_streq (buf, metric_name->name)) { + watermarks->metric = metric_name->metric;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