Skip to contentSkip to conversation

mm/damon: Fix the timer always stays active

PATCH Superseded Hailong Tu 2 participants 2 messages Apr 21, 2022

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Hailong Tu

author
#0 lore raw

PATCH v3 1/1 mm/damon: Fix the timer always stays active

The timer stays active even if the reclaim mechanism is never enabled.
It is unnecessary overhead can be completely avoided by using module_param_call() for enabled flag.

---
 mm/damon/reclaim.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
mm/damon/reclaim.c +17 -2
index e34c4d0c4d93..46505c501cd6 100644
@@ -28,7 +28,6 @@
  * this.
  */
 static bool enabled __read_mostly;
-module_param(enabled, bool, 0600);
 
 /*
  * Time threshold for cold memory regions identification in microseconds.
@@ -358,11 +357,27 @@ static void damon_reclaim_timer_fn(struct work_struct *work)
 			enabled = last_enabled;
 	}
 
-	schedule_delayed_work(&damon_reclaim_timer,
+	if (enabled)
+		schedule_delayed_work(&damon_reclaim_timer,
 			msecs_to_jiffies(ENABLE_CHECK_INTERVAL_MS));
 }
 static DECLARE_DELAYED_WORK(damon_reclaim_timer, damon_reclaim_timer_fn);
 
+static int enabled_store(const char *val,
+		const struct kernel_param *kp)
+{
+	int rc = param_set_bool(val, kp);
+
+	if (rc < 0)
+		return rc;
+
+	if (enabled)
+		schedule_delayed_work(&damon_reclaim_timer, 0);
+
+	return 0;
+}
+module_param_call(enabled, enabled_store, param_get_bool, &enabled, 0600);
+
 static int damon_reclaim_after_aggregation(struct damon_ctx *c)
 {
 	struct damos *s;
Signature · 1 line
2.25.1
maintainer
#1 lore raw

Hi Hailong,

Quoted 1 line · On Thu, 21 Apr 2022 09:06:41 +0800 Hailong Tu <[email protected]> wrote:

The timer stays active even if the reclaim mechanism is never enabled.

I'd like to make it clear that this change is for DAMON_RECLAIM by making the first part of the subject 'mm/damon/reclaim:', and adjusting above sentence.

Quoted 1 line

It is unnecessary overhead can be completely avoided by using module_param_call() for enabled flag.

Let's wrap the line at 75 columns
(https://docs.kernel.org/process/submitting-patches.html#the-canonical-patch-format).

Quoted 33 lines
---
 mm/damon/reclaim.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
mm/damon/reclaim.c +6 -2
index e34c4d0c4d93..46505c501cd6 100644
@@ -28,7 +28,6 @@
  * this.
  */
 static bool enabled __read_mostly;
-module_param(enabled, bool, 0600);
 
 /*
  * Time threshold for cold memory regions identification in microseconds.
@@ -358,11 +357,27 @@ static void damon_reclaim_timer_fn(struct work_struct *work)
 			enabled = last_enabled;
 	}
 
-	schedule_delayed_work(&damon_reclaim_timer,
+	if (enabled)
+		schedule_delayed_work(&damon_reclaim_timer,
 			msecs_to_jiffies(ENABLE_CHECK_INTERVAL_MS));
 }
 static DECLARE_DELAYED_WORK(damon_reclaim_timer, damon_reclaim_timer_fn);
 
+static int enabled_store(const char *val,
+		const struct kernel_param *kp)
+{
+	int rc = param_set_bool(val, kp);

mm/damon/reclaim.c static void damon_reclaim_timer_fn(struct work_struct *work) · line 379

Quoted 10 lines
mm/damon/reclaim.c +10 -0
+
+	if (rc < 0)
+		return rc;
+
+	if (enabled)
+		schedule_delayed_work(&damon_reclaim_timer, 0);
+
+	return 0;
+}
+module_param_call(enabled, enabled_store, param_get_bool, &enabled, 0600);

module_param_call() is commented as obsolete. Could we use module_param_cb() instead as suggested by the comment?

Quoted 7 lines
mm/damon/reclaim.c +1 -0
+
 static int damon_reclaim_after_aggregation(struct damon_ctx *c)
 {
 	struct damos *s;
Signature · 1 line
2.25.1

Thanks,
SJ