]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mm/damon/sysfs-schemes: use damos_commit_quota_goals()
authorSeongJae Park <sj@kernel.org>
Tue, 18 Jun 2024 18:18:01 +0000 (11:18 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 4 Jul 2024 02:30:13 +0000 (19:30 -0700)
DAMON_SYSFS manually manipulates the DAMOS quota structs for online quotal
goals parameter update.  Since the struct contains not only input
parameters but also internal status and operation results, it is not that
simple.  Now DAMON core layer provides a function for the usage, namely
damon_commit_quota_goals().  Replace the manual manipulation logic with
the function.  The core layer function could have its own bugs, but this
change removes a source of bugs.

Link: https://lkml.kernel.org/r/20240618181809.82078-5-sj@kernel.org
Signed-off-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/damon/sysfs-schemes.c

index 66fccfa776d7580aae7c943a4cbff1b4eab17a4f..1bccf2619e1131c6c483cd2065ef241de7da8cae 100644 (file)
@@ -1983,10 +1983,13 @@ int damos_sysfs_set_quota_scores(struct damon_sysfs_schemes *sysfs_schemes,
                struct damon_ctx *ctx)
 {
        struct damos *scheme;
+       struct damos_quota quota = {};
        int i = 0;
 
+       INIT_LIST_HEAD(&quota.goals);
        damon_for_each_scheme(scheme, ctx) {
                struct damon_sysfs_scheme *sysfs_scheme;
+               struct damos_quota_goal *g, *g_next;
                int err;
 
                /* user could have removed the scheme sysfs dir */
@@ -1995,9 +1998,16 @@ int damos_sysfs_set_quota_scores(struct damon_sysfs_schemes *sysfs_schemes,
 
                sysfs_scheme = sysfs_schemes->schemes_arr[i];
                err = damos_sysfs_set_quota_score(sysfs_scheme->quotas->goals,
-                               &scheme->quota);
+                               &quota);
+               if (err) {
+                       damos_for_each_quota_goal_safe(g, g_next, &quota)
+                               damos_destroy_quota_goal(g);
+                       return err;
+               }
+               err = damos_commit_quota_goals(&scheme->quota, &quota);
+               damos_for_each_quota_goal_safe(g, g_next, &quota)
+                       damos_destroy_quota_goal(g);
                if (err)
-                       /* kdamond will clean up schemes and terminated */
                        return err;
                i++;
        }