mm/damon/core: fix commit_ops_filters by using correct nth function
Subsystems (3)
PATCH v3 1/1 mm/damon/core: fix commit_ops_filters by using correct nth function
damos_commit_ops_filters() incorrectly uses damos_nth_filter() which iterates core_filters. As a result, performing a commit unintentionally corrupts ops_filters.
Add damos_nth_ops_filter() which iterates ops_filters. Use this function to fix issues caused by wrong iteration.
--- mm/damon/core.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
mm/damon/core.c +13 -1
@@ -862,6 +862,18 @@ static struct damos_filter *damos_nth_filter(int n, struct damos *s)return NULL ; } +static struct damos_filter *damos_nth_ops_filter (int n,struct damos *s) +{ +struct damos_filter *filter; +int i =0 ; + +damos_for_each_ops_filter (filter, s) { +if (i++ == n) +return filter; + } +return NULL ; +} +static void damos_commit_filter_arg (struct damos_filter *dst,struct damos_filter *src) {
@@ -925,7 +937,7 @@ static int damos_commit_ops_filters(struct damos *dst, struct damos *src)int i =0 , j =0 ;damos_for_each_ops_filter_safe (dst_filter, next, dst) { - src_filter =damos_nth_filter (i++, src); + src_filter =damos_nth_ops_filter (i++, src);if (src_filter)damos_commit_filter (dst_filter, src_filter);else
Signature · 1 line
2.43.0
Quoted 5 lines · Sang-Heon Jeon
damos_commit_ops_filters()incorrectly usesdamos_nth_filter()which iteratescore_filters. As a result, performing a commit unintentionally corruptsops_filters.
Quoted 7 lines
Add
damos_nth_ops_filter()which iteratesops_filters. Use this function to fix issues caused by wrong iteration.Fixes 3607cc590f18 ("mm/damon/core: support committing ops_filters") # 6.15.xSigned-off-by Sang-Heon Jeon <[email protected]>---
I just forgot to add change logs.
Changes from v1 [1]:
1. Fix code and commit message style.
2. Merge patch set into one patch.
3. Add fixes and cc section for backporting.
Changes from v2 [2]:
1. Separate the patch into two parts(code modifications and tests) And this is part of code
[1] https://lore.kernel.org/damon/[email protected]/
[2] https://lore.kernel.org/damon/[email protected]/
Quoted 38 lines
mm/damon/core.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)mm/damon/core.c +13
-2@@ -862,6 +862,18 @@ static struct damos_filter *damos_nth_filter(int n, struct damos *s)return NULL ; } +static struct damos_filter *damos_nth_ops_filter (int n,struct damos *s) +{ +struct damos_filter *filter; +int i =0 ; + +damos_for_each_ops_filter (filter, s) { +if (i++ == n) +return filter; + } +return NULL ; +} +static void damos_commit_filter_arg (struct damos_filter *dst,struct damos_filter *src) {@@ -925,7 +937,7 @@ static int damos_commit_ops_filters(struct damos *dst, struct damos *src)int i =0 , j =0 ;damos_for_each_ops_filter_safe (dst_filter, next, dst) { - src_filter =damos_nth_filter (i++, src); + src_filter =damos_nth_ops_filter (i++, src);if (src_filter)damos_commit_filter (dst_filter, src_filter);else --2.43.0
+ Andrew
Quoted 10 lines · On Sun, 10 Aug 2025 21:42:01 +0900 Sang-Heon Jeon <[email protected]> wrote:
damos_commit_ops_filters()incorrectly usesdamos_nth_filter()which iteratescore_filters. As a result, performing a commit unintentionally corruptsops_filters.Add
damos_nth_ops_filter()which iteratesops_filters. Use this function to fix issues caused by wrong iteration.Fixes 3607cc590f18 ("mm/damon/core: support committing ops_filters") # 6.15.xSigned-off-by Sang-Heon Jeon <[email protected]>
Thanks,
SJ
[...]