Skip to contentSkip to conversation

mm/damon/core: fix memory leaks and ignored inputs from damon_commit_ctx()

PATCH Applied SeongJae Park 1 participant 3 messages Dec 22, 2024

Subsystems (3)
lore
Share & tools
lore

SeongJae Park

author maintainer
#0 lore raw

cover mm/damon/core: fix memory leaks and ignored inputs from damon_commit_ctx()

Due to two bugs in damon_commit_targets() and damon_commit_schemes(), which are called from damon_commit_ctx(), some user inputs can be ignored, and some mmeory objects can be leaked. Fix those.

Note that only DAMON sysfs interface users are affected. Other DAMON core API user modules that more focused more on simple and dedicated production usages, including DAMON_RECLAIM and DAMON_LRU_SORT are not using the buggy function in the way, so not affected.

SeongJae Park (2):
mm/damon/core: fix new damon_target objects leaks on
damon_commit_targets()
mm/damon/core: fix ignored quota goals and filters of newly committed
schemes

 mm/damon/core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

base-commit: a2b6c37664ce2d7ab39837dae4078fcb01078f13

Signature · 1 line
2.39.5
author maintainer
#1 lore raw

PATCH 1/2 mm/damon/core: fix new damon_target objects leaks on damon_commit_targets()

When new DAMON targets are added via damon_commit_targets(), the newly created targets are not deallocated when updating the internal data (damon_commit_target()) is failed. Worse yet, even if the setup is successfully done, the new target is not linked to the context. Hence, the new targets are always leaked regardless of the internal data setup failure. Fix the leaks.

Fixes 9cb3d0b9dfce ("mm/damon/core: implement DAMON context commit function")
---
 mm/damon/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
mm/damon/core.c +4 -1
index a71703e05300..931e8e4b1333 100644
@@ -961,8 +961,11 @@ static int damon_commit_targets(
 			return -ENOMEM;
 		err = damon_commit_target(new_target, false,
 				src_target, damon_target_has_pid(src));
-		if (err)
+		if (err) {
+			damon_destroy_target(new_target);
 			return err;
+		}
+		damon_add_target(dst, new_target);
 	}
 	return 0;
 }
Signature · 1 line
2.39.5
author maintainer
#2 lore raw

PATCH 2/2 mm/damon/core: fix ignored quota goals and filters of newly committed schemes

In reply to SeongJae Park

damon_commit_schemes() ignores quota goals and filters of the newly committed schemes. This makes users confused about the behaviors. Correctly handle those inputs.

Fixes 9cb3d0b9dfce ("mm/damon/core: implement DAMON context commit function")
---
 mm/damon/core.c | 5 +++++
 1 file changed, 5 insertions(+)
mm/damon/core.c +5 -0
index 931e8e4b1333..5192ee29f6cf 100644
@@ -868,6 +868,11 @@ static int damon_commit_schemes(struct damon_ctx *dst, struct damon_ctx *src)
 				NUMA_NO_NODE);
 		if (!new_scheme)
 			return -ENOMEM;
+		err = damos_commit(new_scheme, src_scheme);
+		if (err) {
+			damon_destroy_scheme(new_scheme);
+			return err;
+		}
 		damon_add_scheme(dst, new_scheme);
 	}
 	return 0;
Signature · 1 line
2.39.5