]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
samples/damon: change enable parameters to enabled
authorHonggyu Kim <honggyu.kim@sk.com>
Sun, 21 Sep 2025 14:11:18 +0000 (10:11 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2025 09:16:54 +0000 (11:16 +0200)
[ Upstream commit 793020545cea0c9e2a79de6ad5c9746ec4f5bd7e ]

The damon_{lru_sort,reclaim,stat} kernel modules use "enabled" parameter
knobs as follows.

  /sys/module/damon_lru_sort/parameters/enabled
  /sys/module/damon_reclaim/parameters/enabled
  /sys/module/damon_stat/parameters/enabled

However, other sample modules of damon use "enable" parameter knobs so
it'd be better to rename them from "enable" to "enabled" to keep the
consistency with other damon modules.

Before:
  /sys/module/damon_sample_wsse/parameters/enable
  /sys/module/damon_sample_prcl/parameters/enable
  /sys/module/damon_sample_mtier/parameters/enable

After:
  /sys/module/damon_sample_wsse/parameters/enabled
  /sys/module/damon_sample_prcl/parameters/enabled
  /sys/module/damon_sample_mtier/parameters/enabled

There is no functional changes in this patch.

Link: https://lkml.kernel.org/r/20250707024548.1964-1-honggyu.kim@sk.com
Signed-off-by: Honggyu Kim <honggyu.kim@sk.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stable-dep-of: c62cff40481c ("samples/damon/mtier: avoid starting DAMON before initialization")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
samples/damon/mtier.c
samples/damon/prcl.c
samples/damon/wsse.c

index ed6bed8b3d4d99f2490aa175d4e9911dc30e12d8..11cbfea1af67549dbdd208fa50b4982ede5df6f6 100644 (file)
@@ -27,14 +27,14 @@ module_param(node1_end_addr, ulong, 0600);
 static int damon_sample_mtier_enable_store(
                const char *val, const struct kernel_param *kp);
 
-static const struct kernel_param_ops enable_param_ops = {
+static const struct kernel_param_ops enabled_param_ops = {
        .set = damon_sample_mtier_enable_store,
        .get = param_get_bool,
 };
 
-static bool enable __read_mostly;
-module_param_cb(enable, &enable_param_ops, &enable, 0600);
-MODULE_PARM_DESC(enable, "Enable of disable DAMON_SAMPLE_MTIER");
+static bool enabled __read_mostly;
+module_param_cb(enabled, &enabled_param_ops, &enabled, 0600);
+MODULE_PARM_DESC(enabled, "Enable or disable DAMON_SAMPLE_MTIER");
 
 static struct damon_ctx *ctxs[2];
 
@@ -156,20 +156,20 @@ static bool init_called;
 static int damon_sample_mtier_enable_store(
                const char *val, const struct kernel_param *kp)
 {
-       bool enabled = enable;
+       bool is_enabled = enabled;
        int err;
 
-       err = kstrtobool(val, &enable);
+       err = kstrtobool(val, &enabled);
        if (err)
                return err;
 
-       if (enable == enabled)
+       if (enabled == is_enabled)
                return 0;
 
-       if (enable) {
+       if (enabled) {
                err = damon_sample_mtier_start();
                if (err)
-                       enable = false;
+                       enabled = false;
                return err;
        }
        damon_sample_mtier_stop();
@@ -181,10 +181,10 @@ static int __init damon_sample_mtier_init(void)
        int err = 0;
 
        init_called = true;
-       if (enable) {
+       if (enabled) {
                err = damon_sample_mtier_start();
                if (err)
-                       enable = false;
+                       enabled = false;
        }
        return 0;
 }
index a9d7629d70f0ad850faa28d54d1cdb40556ac8ef..223f13a5a4ad432404726306c6c615bd08fb08a6 100644 (file)
@@ -17,14 +17,14 @@ module_param(target_pid, int, 0600);
 static int damon_sample_prcl_enable_store(
                const char *val, const struct kernel_param *kp);
 
-static const struct kernel_param_ops enable_param_ops = {
+static const struct kernel_param_ops enabled_param_ops = {
        .set = damon_sample_prcl_enable_store,
        .get = param_get_bool,
 };
 
-static bool enable __read_mostly;
-module_param_cb(enable, &enable_param_ops, &enable, 0600);
-MODULE_PARM_DESC(enable, "Enable of disable DAMON_SAMPLE_WSSE");
+static bool enabled __read_mostly;
+module_param_cb(enabled, &enabled_param_ops, &enabled, 0600);
+MODULE_PARM_DESC(enabled, "Enable or disable DAMON_SAMPLE_PRCL");
 
 static struct damon_ctx *ctx;
 static struct pid *target_pidp;
@@ -114,20 +114,20 @@ static bool init_called;
 static int damon_sample_prcl_enable_store(
                const char *val, const struct kernel_param *kp)
 {
-       bool enabled = enable;
+       bool is_enabled = enabled;
        int err;
 
-       err = kstrtobool(val, &enable);
+       err = kstrtobool(val, &enabled);
        if (err)
                return err;
 
-       if (enable == enabled)
+       if (enabled == is_enabled)
                return 0;
 
-       if (enable) {
+       if (enabled) {
                err = damon_sample_prcl_start();
                if (err)
-                       enable = false;
+                       enabled = false;
                return err;
        }
        damon_sample_prcl_stop();
@@ -139,10 +139,10 @@ static int __init damon_sample_prcl_init(void)
        int err = 0;
 
        init_called = true;
-       if (enable) {
+       if (enabled) {
                err = damon_sample_prcl_start();
                if (err)
-                       enable = false;
+                       enabled = false;
        }
        return 0;
 }
index e941958b103249f1dde0384baa649b3a7834bccb..d50730ee65a7e7c2316aa76233ec0842b28bf540 100644 (file)
@@ -18,14 +18,14 @@ module_param(target_pid, int, 0600);
 static int damon_sample_wsse_enable_store(
                const char *val, const struct kernel_param *kp);
 
-static const struct kernel_param_ops enable_param_ops = {
+static const struct kernel_param_ops enabled_param_ops = {
        .set = damon_sample_wsse_enable_store,
        .get = param_get_bool,
 };
 
-static bool enable __read_mostly;
-module_param_cb(enable, &enable_param_ops, &enable, 0600);
-MODULE_PARM_DESC(enable, "Enable or disable DAMON_SAMPLE_WSSE");
+static bool enabled __read_mostly;
+module_param_cb(enabled, &enabled_param_ops, &enabled, 0600);
+MODULE_PARM_DESC(enabled, "Enable or disable DAMON_SAMPLE_WSSE");
 
 static struct damon_ctx *ctx;
 static struct pid *target_pidp;
@@ -94,20 +94,20 @@ static bool init_called;
 static int damon_sample_wsse_enable_store(
                const char *val, const struct kernel_param *kp)
 {
-       bool enabled = enable;
+       bool is_enabled = enabled;
        int err;
 
-       err = kstrtobool(val, &enable);
+       err = kstrtobool(val, &enabled);
        if (err)
                return err;
 
-       if (enable == enabled)
+       if (enabled == is_enabled)
                return 0;
 
-       if (enable) {
+       if (enabled) {
                err = damon_sample_wsse_start();
                if (err)
-                       enable = false;
+                       enabled = false;
                return err;
        }
        damon_sample_wsse_stop();
@@ -119,10 +119,10 @@ static int __init damon_sample_wsse_init(void)
        int err = 0;
 
        init_called = true;
-       if (enable) {
+       if (enabled) {
                err = damon_sample_wsse_start();
                if (err)
-                       enable = false;
+                       enabled = false;
        }
        return err;
 }