mm-damon-sysfs-schemes-decouple-from-damos_filter_type.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/sysfs-schemes: decouple from damos_filter_type
has been removed from the -mm tree. Its filename was
mm-damon-sysfs-schemes-decouple-from-damos_filter_type.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_filter_type
Date: Sun, 22 Jun 2025 14:37:58 -0700
Decouple DAMOS sysfs interface from damos_filter_type. For this, define and use new sysfs-schemes internal data structure that maps the user-space keywords and damos_filter_type, instead of having the implicit and unflexible array index rule.
---
mm/damon/sysfs-schemes.c | 75 ++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 18 deletions(-)
mm/damon/sysfs-schemes.c renamed from mm/damon/sysfs-schemes.c~mm-damon-sysfs-schemes-decouple-from-damos_filter_type +57 -18
@@ -341,16 +341,45 @@ static struct damon_sysfs_scheme_filterreturn filter; } -/* Should match with enum damos_filter_type */ -static const char *const damon_sysfs_scheme_filter_type_strs[] = { -"anon" , -"active" , -"memcg" , -"young" , -"hugepage_size" , -"unmapped" , -"addr" , -"target" , +struct damos_sysfs_filter_type_name { +enum damos_filter_type type; +char *name; +}; + +static const struct damos_sysfs_filter_type_name +damos_sysfs_filter_type_names[] = { + { + .type =DAMOS_FILTER_TYPE_ANON , + .name ="anon" , + }, + { + .type =DAMOS_FILTER_TYPE_ACTIVE , + .name ="active" , + }, + { + .type =DAMOS_FILTER_TYPE_MEMCG , + .name ="memcg" , + }, + { + .type =DAMOS_FILTER_TYPE_YOUNG , + .name ="young" , + }, + { + .type =DAMOS_FILTER_TYPE_HUGEPAGE_SIZE , + .name ="hugepage_size" , + }, + { + .type =DAMOS_FILTER_TYPE_UNMAPPED , + .name ="unmapped" , + }, + { + .type =DAMOS_FILTER_TYPE_ADDR , + .name ="addr" , + }, + { + .type =DAMOS_FILTER_TYPE_TARGET , + .name ="target" , + }, }; static ssize_t type_show(struct kobject *kobj,
@@ -358,9 +387,16 @@ static ssize_t type_show(struct kobject {struct damon_sysfs_scheme_filter *filter =container_of (kobj, struct damon_sysfs_scheme_filter, kobj); +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_filter_type_names); i++) { +const struct damos_sysfs_filter_type_name *type_name; -return sysfs_emit (buf,"%s\n" , - damon_sysfs_scheme_filter_type_strs[filter->type]); + type_name = &damos_sysfs_filter_type_names[i]; +if (type_name->type == filter->type) +return sysfs_emit (buf,"%s\n" , type_name->name); + } +return -EINVAL ; } static bool damos_sysfs_scheme_filter_valid_type(
@@ -385,16 +421,19 @@ static ssize_t type_store(struct kobject {struct damon_sysfs_scheme_filter *filter =container_of (kobj, struct damon_sysfs_scheme_filter, kobj); -enum damos_filter_type type;ssize_t ret = -EINVAL ; +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_filter_type_names); i++) { +const struct damos_sysfs_filter_type_name *type_name; -for (type =0 ; type <NR_DAMOS_FILTER_TYPES ; type++) { -if (sysfs_streq (buf, damon_sysfs_scheme_filter_type_strs[ - type])) { + type_name = &damos_sysfs_filter_type_names[i]; +if (sysfs_streq (buf, type_name->name)) {if (!damos_sysfs_scheme_filter_valid_type ( - filter->handle_layer, type)) + filter->handle_layer, + type_name->type))break ; - filter->type = type; + filter->type = type_name->type; ret = count;break ; }
_
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