Skip to contentSkip to conversation

mm/khugepaged: Factor out common logic in [scan,alloc]_sleep_millisecs_store()

PATCH Applied Leon Hwang 5 participants 5 messages Oct 21, 2025 – Oct 22, 2025

Subsystems (2)
lore
Share & tools
lore

Leon Hwang

author
#0 lore raw

PATCH v2 1/1 mm/khugepaged: Factor out common logic in [scan,alloc]_sleep_millisecs_store()

Both scan_sleep_millisecs_store() and alloc_sleep_millisecs_store() perform the same operations: parse the input value, update their respective sleep interval, reset khugepaged_sleep_expire, and wake up the khugepaged thread.

Factor out this duplicated logic into a helper function __sleep_millisecs_store(), and simplify both store functions.

No functional change intended.

---
v1 -> v2:
- Simplify callsites of __sleep_millisecs_store() (per Lorenzo).
- Collect Reviewed-by from Lorenzo, Zi and Lance - thanks!
- https://lore.kernel.org/linux-mm/[email protected]/

 mm/khugepaged.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)
mm/khugepaged.c +11 -16
index 6f2ae2238b5b..5b7276bc14b1 100644
@@ -129,9 +129,8 @@ static ssize_t scan_sleep_millisecs_show(struct kobject *kobj,
 	return sysfs_emit(buf, "%u\n", khugepaged_scan_sleep_millisecs);
 }
 
-static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
-					  struct kobj_attribute *attr,
-					  const char *buf, size_t count)
+static ssize_t __sleep_millisecs_store(const char *buf, size_t count,
+				       unsigned int *millisecs)
 {
 	unsigned int msecs;
 	int err;
@@ -140,12 +139,19 @@ static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
 	if (err)
 		return -EINVAL;
 
-	khugepaged_scan_sleep_millisecs = msecs;
+	*millisecs = msecs;
 	khugepaged_sleep_expire = 0;
 	wake_up_interruptible(&khugepaged_wait);
 
 	return count;
 }
+
+static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
+					  struct kobj_attribute *attr,
+					  const char *buf, size_t count)
+{
+	return __sleep_millisecs_store(buf, count, &khugepaged_scan_sleep_millisecs);
+}
 static struct kobj_attribute scan_sleep_millisecs_attr =
 	__ATTR_RW(scan_sleep_millisecs);
 
@@ -160,18 +166,7 @@ static ssize_t alloc_sleep_millisecs_store(struct kobject *kobj,
 					   struct kobj_attribute *attr,
 					   const char *buf, size_t count)
 {
-	unsigned int msecs;
-	int err;
-
-	err = kstrtouint(buf, 10, &msecs);
-	if (err)
-		return -EINVAL;
-
-	khugepaged_alloc_sleep_millisecs = msecs;
-	khugepaged_sleep_expire = 0;
-	wake_up_interruptible(&khugepaged_wait);
-
-	return count;
+	return __sleep_millisecs_store(buf, count, &khugepaged_alloc_sleep_millisecs);
 }
 static struct kobj_attribute alloc_sleep_millisecs_attr =
 	__ATTR_RW(alloc_sleep_millisecs);

--
2.51.0

Acked-by on v2 1/1
#1 lore raw
Quoted 8 lines · Leon Hwang

Both scan_sleep_millisecs_store() and alloc_sleep_millisecs_store() perform the same operations: parse the input value, update their respective sleep interval, reset khugepaged_sleep_expire, and wake up the khugepaged thread.

Factor out this duplicated logic into a helper function __sleep_millisecs_store(), and simplify both store functions.

Quoted 7 lines

No functional change intended.

---

Signature · 3 lines
Cheers

David / dhildenb
Acked-by on v2 1/1
#2 lore raw
In reply to Leon Hwang
Quoted 9 lines · Leon Hwang

Both scan_sleep_millisecs_store() and alloc_sleep_millisecs_store() perform the same operations: parse the input value, update their respective sleep interval, reset khugepaged_sleep_expire, and wake up the khugepaged thread.

Factor out this duplicated logic into a helper function __sleep_millisecs_store(), and simplify both store functions.

Quoted 6 lines

No functional change intended.

Nice cleanup!

Quoted 69 lines

---
v1 -> v2:
- Simplify callsites of __sleep_millisecs_store() (per Lorenzo).
- Collect Reviewed-by from Lorenzo, Zi and Lance - thanks!
- https://lore.kernel.org/linux-mm/[email protected]/

 mm/khugepaged.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)
mm/khugepaged.c +11 -17
index 6f2ae2238b5b..5b7276bc14b1 100644
@@ -129,9 +129,8 @@ static ssize_t scan_sleep_millisecs_show(struct kobject *kobj,
        return sysfs_emit(buf, "%u\n", khugepaged_scan_sleep_millisecs);
 }
 
-static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
-                                         struct kobj_attribute *attr,
-                                         const char *buf, size_t count)
+static ssize_t __sleep_millisecs_store(const char *buf, size_t count,
+                                      unsigned int *millisecs)
 {
        unsigned int msecs;
        int err;
@@ -140,12 +139,19 @@ static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
        if (err)
                return -EINVAL;
 
-       khugepaged_scan_sleep_millisecs = msecs;
+       *millisecs = msecs;
        khugepaged_sleep_expire = 0;
        wake_up_interruptible(&khugepaged_wait);
 
        return count;
 }
+
+static ssize_t scan_sleep_millisecs_store(struct kobject *kobj,
+                                         struct kobj_attribute *attr,
+                                         const char *buf, size_t count)
+{
+       return __sleep_millisecs_store(buf, count, &khugepaged_scan_sleep_millisecs);
+}
 static struct kobj_attribute scan_sleep_millisecs_attr =
        __ATTR_RW(scan_sleep_millisecs);
 
@@ -160,18 +166,7 @@ static ssize_t alloc_sleep_millisecs_store(struct kobject *kobj,
                                           struct kobj_attribute *attr,
                                           const char *buf, size_t count)
 {
-       unsigned int msecs;
-       int err;
-
-       err = kstrtouint(buf, 10, &msecs);
-       if (err)
-               return -EINVAL;
-
-       khugepaged_alloc_sleep_millisecs = msecs;
-       khugepaged_sleep_expire = 0;
-       wake_up_interruptible(&khugepaged_wait);
-
-       return count;
+       return __sleep_millisecs_store(buf, count, &khugepaged_alloc_sleep_millisecs);
 }
 static struct kobj_attribute alloc_sleep_millisecs_attr =
        __ATTR_RW(alloc_sleep_millisecs);
--

2.51.0

Reviewed-by on v2 1/1
#3 lore raw
In reply to Leon Hwang
Quoted 8 lines · On Tue, 21 Oct 2025 21:44:31 +0800 Leon Hwang <[email protected]> wrote:

Both scan_sleep_millisecs_store() and alloc_sleep_millisecs_store() perform the same operations: parse the input value, update their respective sleep interval, reset khugepaged_sleep_expire, and wake up the khugepaged thread.

Factor out this duplicated logic into a helper function __sleep_millisecs_store(), and simplify both store functions.

Quoted 6 lines

No functional change intended.

Thanks,
SJ

[...]

reviewer Reviewed-by on v2 1/1
#4 lore raw
In reply to Leon Hwang
Quoted 8 lines · Leon Hwang

Both scan_sleep_millisecs_store() and alloc_sleep_millisecs_store() perform the same operations: parse the input value, update their respective sleep interval, reset khugepaged_sleep_expire, and wake up the khugepaged thread.

Factor out this duplicated logic into a helper function __sleep_millisecs_store(), and simplify both store functions.

Quoted 8 lines

No functional change intended.

---