From: SeongJae Park <sj@kernel.org>
Date: Sun, 22 Dec 2024 23:12:22 +0000 (-0800)
Subject: mm/damon/core: fix ignored quota goals and filters of newly committed schemes
X-Git-Tag: v6.13-rc6~2^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d390b53067ef745e2d9bee5a9683df4c96b80a0;p=thirdparty%2Flinux.git

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

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

Link: https://lkml.kernel.org/r/20241222231222.85060-3-sj@kernel.org
Fixes: 9cb3d0b9dfce ("mm/damon/core: implement DAMON context commit function")
Signed-off-by: SeongJae Park <sj@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/damon/core.c b/mm/damon/core.c
index dc52361f18634..0776452a1abbb 100644
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -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;