mm-damon-rename-damos-filters-to-damos-core_filters.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon: rename damos->filters to damos->core_filters
has been removed from the -mm tree. Its filename was
mm-damon-rename-damos-filters-to-damos-core_filters.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: rename damos->filters to damos->core_filters
Date: Wed, 12 Nov 2025 07:41:05 -0800
DAMOS filters that are handled by the ops layer are linked to damos->ops_filters. Owing to the ops_ prefix on the name, it is easy to understand it is for ops layer handled filters. The other types of filters, which are handled by the core layer, are linked to damos->filters. Because of the name, it is easy to confuse the list is there for not only core layer handled ones but all filters. Avoid such confusions by renaming the field to core_filters.
Signed-off-by SeongJae Park <[email protected]>
Cc Bill Wendling <[email protected]>
Cc Brendan Higgins <[email protected]>
Cc David Gow <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Justin Stitt <[email protected]>
Cc Liam Howlett <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Miguel Ojeda <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Nathan Chancellor <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/damon.h | 10 +++++----- mm/damon/core.c | 6 +++--- mm/damon/tests/core-kunit.h | 4 ++-- tools/testing/selftests/damon/drgn_dump_damon_status.py | 8 ++++---- tools/testing/selftests/damon/sysfs.py | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-rename-damos-filters-to-damos-core_filters +5 -5
@@ -492,7 +492,7 @@ struct damos_migrate_dests {* @wmarks: Watermarks for automated (in)activation of this scheme. * @migrate_dests: Destination nodes if @action is "migrate_{hot,cold}". * @target_nid: Destination node if @action is "migrate_{hot,cold}". -* @filters: Additional set of &struct damos_filter for &action. +* @core_filters: Additional set of &struct damos_filter for &action. * @ops_filters: ops layer handling &struct damos_filter objects list. * @last_applied: Last @action applied ops-managing entity. * @stat: Statistics of this scheme.
@@ -518,7 +518,7 @@ struct damos_migrate_dests {* * Before applying the &action to a memory region, &struct damon_operations * implementation could check pages of the region and skip &action to respect -* &filters +* &core_filters * * The minimum entity that @action can be applied depends on the underlying * &struct damon_operations. Since it may not be aligned with the core layer
@@ -562,7 +562,7 @@ struct damos {struct damos_migrate_dests migrate_dests; }; }; -struct list_head filters; +struct list_head core_filters;struct list_head ops_filters;void *last_applied;struct damos_stat stat;
@@ -872,10 +872,10 @@ static inline unsigned long damon_sz_reg list_for_each_entry_safe(goal, next, &(quota)->goals, list)#define damos_for_each_core_filter (f, scheme) \ - list_for_each_entry(f, &(scheme)->filters, list) + list_for_each_entry(f, &(scheme)->core_filters, list)#define damos_for_each_core_filter_safe (f, next, scheme) \ - list_for_each_entry_safe(f, next, &(scheme)->filters, list) + list_for_each_entry_safe(f, next, &(scheme)->core_filters, list)#define damos_for_each_ops_filter (f, scheme) \ list_for_each_entry(f, &(scheme)->ops_filters, list)
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-rename-damos-filters-to-damos-core_filters +3 -3
@@ -306,7 +306,7 @@ void damos_add_filter(struct damos *s, sif (damos_filter_for_ops (f->type))list_add_tail (&f->list, &s->ops_filters);else -list_add_tail (&f->list, &s->filters); +list_add_tail (&f->list, &s->core_filters); }static void damos_del_filter (struct damos_filter *f)
@@ -397,7 +397,7 @@ struct damos *damon_new_scheme(struct da*/ scheme->next_apply_sis =0 ; scheme->walk_completed = false; -INIT_LIST_HEAD (&scheme->filters); +INIT_LIST_HEAD (&scheme->core_filters);INIT_LIST_HEAD (&scheme->ops_filters); scheme->stat = (struct damos_stat ){};INIT_LIST_HEAD (&scheme->list);
@@ -995,7 +995,7 @@ static void damos_set_filters_default_re s->core_filters_default_reject = false; else s->core_filters_default_reject = -damos_filters_default_reject (&s->filters); +damos_filters_default_reject (&s->core_filters); s->ops_filters_default_reject =damos_filters_default_reject (&s->ops_filters); }
mm/damon/tests/core-kunit.h renamed from mm/damon/tests/core-kunit.h~mm-damon-rename-damos-filters-to-damos-core_filters +2 -2
@@ -876,7 +876,7 @@ static void damos_test_commit_filter(strstatic void damos_test_help_initailize_scheme (struct damos *scheme) {INIT_LIST_HEAD (&scheme->quota.goals); -INIT_LIST_HEAD (&scheme->filters); +INIT_LIST_HEAD (&scheme->core_filters);INIT_LIST_HEAD (&scheme->ops_filters); }
@@ -1140,7 +1140,7 @@ static void damon_test_set_filters_defaustruct damos scheme;struct damos_filter *target_filter, *anon_filter; -INIT_LIST_HEAD (&scheme.filters); +INIT_LIST_HEAD (&scheme.core_filters);INIT_LIST_HEAD (&scheme.ops_filters);damos_set_filters_default_reject (&scheme);
tools/testing/selftests/damon/drgn_dump_damon_status.py renamed from tools/testing/selftests/damon/drgn_dump_damon_status.py~mm-damon-rename-damos-filters-to-damos-core_filters +4 -4
@@ -175,11 +175,11 @@ def scheme_to_dict(scheme): ['target_nid', int], ['migrate_dests', damos_migrate_dests_to_dict], ]) - filters = [] + core_filters = [] for f in list_for_each_entry( - 'struct damos_filter', scheme.filters.address_of_(), 'list'): - filters.append(damos_filter_to_dict(f)) - dict_['filters'] = filters + 'struct damos_filter', scheme.core_filters.address_of_(), 'list'): + core_filters.append(damos_filter_to_dict(f)) + dict_['core_filters'] = core_filters ops_filters = [] for f in list_for_each_entry( 'struct damos_filter', scheme.ops_filters.address_of_(), 'list'):
tools/testing/selftests/damon/sysfs.py renamed from tools/testing/selftests/damon/sysfs.py~mm-damon-rename-damos-filters-to-damos-core_filters +1 -1
@@ -132,7 +132,7 @@ def assert_scheme_committed(scheme, dump assert_watermarks_committed(scheme.watermarks, dump['wmarks']) # TODO: test filters directory for idx, f in enumerate(scheme.core_filters.filters): - assert_filter_committed(f, dump['filters'][idx]) + assert_filter_committed(f, dump['core_filters'][idx]) for idx, f in enumerate(scheme.ops_filters.filters): assert_filter_committed(f, dump['ops_filters'][idx])
_
Patches currently in -mm which might be from [email protected] are