* [PATCH v3] PM / sleep: add configurable delay for pm_test
@ 2025-05-07 6:35 Zihuan Zhang
2025-05-07 15:49 ` Randy Dunlap
0 siblings, 1 reply; 4+ messages in thread
From: Zihuan Zhang @ 2025-05-07 6:35 UTC (permalink / raw)
To: corbet, rafael, len.brown, pavel, akpm, paulmck, rostedt, thuth,
bp, ardb, gregkh
Cc: linux-doc, linux-kernel, linux-pm, Zihuan Zhang
This patch turns this 5 second delay into a configurable module
parameter, so users can determine how long to wait in this
pseudo-hibernate state before resuming the system.
The configurable delay parameter has been added to suspend and
synchronized to hibernation.
Example (wait 30 seconds);
# echo 30 > /sys/module/hibernate/parameters/pm_test_delay
# echo core > /sys/power/pm_test
Signed-off-by: Zihuan Zhang <zhangzihuan@kylinos.cn>
---
v3:
- Fix the location of the hibernate.pm_test_delay parameter in
kernel-parameters.txt.
- Update ‘[hibernate]’ to ‘[HIBERNATION]’
v2:
- Fix typos.
---
Documentation/admin-guide/kernel-parameters.txt | 7 +++++++
kernel/power/hibernate.c | 9 +++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index d9fd26b95b34..a110cbb37f20 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1828,6 +1828,13 @@
lz4: Select LZ4 compression algorithm to
compress/decompress hibernation image.
+ hibernate.pm_test_delay=
+ [HIBERNATION]
+ Sets the number of seconds to remain in a hibernation test
+ mode before resuming the system (see
+ /sys/power/pm_test). Only available when CONFIG_PM_DEBUG
+ is set. Default value is 5.
+
highmem=nn[KMG] [KNL,BOOT,EARLY] forces the highmem zone to have an exact
size of <nn>. This works even on boxes that have no
highmem otherwise. This also works to reduce highmem
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 23c0f4e6cb2f..485133af884d 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -133,10 +133,15 @@ bool system_entering_hibernation(void)
EXPORT_SYMBOL(system_entering_hibernation);
#ifdef CONFIG_PM_DEBUG
+static unsigned int pm_test_delay = 5;
+module_param(pm_test_delay, uint, 0644);
+MODULE_PARM_DESC(pm_test_delay,
+ "Number of seconds to wait before resuming from hibernation test");
static void hibernation_debug_sleep(void)
{
- pr_info("debug: Waiting for 5 seconds.\n");
- mdelay(5000);
+ pr_info("hibernation debug: Waiting for %d second(s).\n",
+ pm_test_delay);
+ mdelay(pm_test_delay * 1000);
}
static int hibernation_test(int level)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] PM / sleep: add configurable delay for pm_test
2025-05-07 6:35 [PATCH v3] PM / sleep: add configurable delay for pm_test Zihuan Zhang
@ 2025-05-07 15:49 ` Randy Dunlap
2025-05-09 14:01 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2025-05-07 15:49 UTC (permalink / raw)
To: Zihuan Zhang, corbet, rafael, len.brown, pavel, akpm, paulmck,
rostedt, thuth, bp, ardb, gregkh
Cc: linux-doc, linux-kernel, linux-pm
On 5/6/25 11:35 PM, Zihuan Zhang wrote:
> This patch turns this 5 second delay into a configurable module
> parameter, so users can determine how long to wait in this
> pseudo-hibernate state before resuming the system.
>
> The configurable delay parameter has been added to suspend and
> synchronized to hibernation.
>
> Example (wait 30 seconds);
>
> # echo 30 > /sys/module/hibernate/parameters/pm_test_delay
> # echo core > /sys/power/pm_test
>
> Signed-off-by: Zihuan Zhang <zhangzihuan@kylinos.cn>
Looks good. Thanks.
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
> ---
> v3:
> - Fix the location of the hibernate.pm_test_delay parameter in
> kernel-parameters.txt.
> - Update ‘[hibernate]’ to ‘[HIBERNATION]’
> v2:
> - Fix typos.
> ---
> Documentation/admin-guide/kernel-parameters.txt | 7 +++++++
> kernel/power/hibernate.c | 9 +++++++--
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index d9fd26b95b34..a110cbb37f20 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -1828,6 +1828,13 @@
> lz4: Select LZ4 compression algorithm to
> compress/decompress hibernation image.
>
> + hibernate.pm_test_delay=
> + [HIBERNATION]
> + Sets the number of seconds to remain in a hibernation test
> + mode before resuming the system (see
> + /sys/power/pm_test). Only available when CONFIG_PM_DEBUG
> + is set. Default value is 5.
> +
> highmem=nn[KMG] [KNL,BOOT,EARLY] forces the highmem zone to have an exact
> size of <nn>. This works even on boxes that have no
> highmem otherwise. This also works to reduce highmem
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index 23c0f4e6cb2f..485133af884d 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -133,10 +133,15 @@ bool system_entering_hibernation(void)
> EXPORT_SYMBOL(system_entering_hibernation);
>
> #ifdef CONFIG_PM_DEBUG
> +static unsigned int pm_test_delay = 5;
> +module_param(pm_test_delay, uint, 0644);
> +MODULE_PARM_DESC(pm_test_delay,
> + "Number of seconds to wait before resuming from hibernation test");
> static void hibernation_debug_sleep(void)
> {
> - pr_info("debug: Waiting for 5 seconds.\n");
> - mdelay(5000);
> + pr_info("hibernation debug: Waiting for %d second(s).\n",
> + pm_test_delay);
> + mdelay(pm_test_delay * 1000);
> }
>
> static int hibernation_test(int level)
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] PM / sleep: add configurable delay for pm_test
2025-05-07 15:49 ` Randy Dunlap
@ 2025-05-09 14:01 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2025-05-09 14:01 UTC (permalink / raw)
To: Randy Dunlap
Cc: Zihuan Zhang, corbet, rafael, len.brown, pavel, akpm, paulmck,
rostedt, thuth, bp, ardb, gregkh, linux-doc, linux-kernel,
linux-pm
On Wed, May 7, 2025 at 5:49 PM Randy Dunlap <rdunlap@infradead.org> wrote:
>
>
>
> On 5/6/25 11:35 PM, Zihuan Zhang wrote:
> > This patch turns this 5 second delay into a configurable module
> > parameter, so users can determine how long to wait in this
> > pseudo-hibernate state before resuming the system.
> >
> > The configurable delay parameter has been added to suspend and
> > synchronized to hibernation.
> >
> > Example (wait 30 seconds);
> >
> > # echo 30 > /sys/module/hibernate/parameters/pm_test_delay
> > # echo core > /sys/power/pm_test
> >
> > Signed-off-by: Zihuan Zhang <zhangzihuan@kylinos.cn>
>
> Looks good. Thanks.
>
> Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Applied as 6.16 material, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3] PM / sleep: add configurable delay for pm_test
2015-02-22 8:26 ` [PATCH v2] " Brian Norris
@ 2015-02-23 5:16 ` Brian Norris
0 siblings, 0 replies; 4+ messages in thread
From: Brian Norris @ 2015-02-23 5:16 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Linux Kernel, linux-pm, Len Brown, Pavel Machek,
Florian Fainelli, Kevin Cernekee, Chirantan Ekbote
When CONFIG_PM_DEBUG=y, we provide a sysfs file (/sys/power/pm_test) for
selecting one of a few suspend test modes, where rather than entering a
full suspend state, the kernel will perform some subset of suspend
steps, wait 5 seconds, and then resume back to normal operation.
This mode is useful for (among other things) observing the state of the
system just before entering a sleep mode, for debugging or analysis
purposes. However, a constant 5 second wait is not sufficient for some
sorts of analysis; for example, on an SoC, one might want to use
external tools to probe the power states of various on-chip controllers
or clocks.
This patch turns this 5 second delay into a configurable module
parameter, so users can determine how long to wait in this
pseudo-suspend state before resuming the system.
Example (wait 30 seconds);
# echo 30 > /sys/module/suspend/parameters/pm_test_delay
# echo core > /sys/power/pm_test
# time echo mem > /sys/power/state
...
[ 17.583625] suspend debug: Waiting for 30 second(s).
...
real 0m30.381s
user 0m0.017s
sys 0m0.080s
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Kevin Cernekee <cernekee@chromium.org>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
v3: - document in a few more places
v2: - make this a module param instead of an explicit sysfs file
- drop the for loop; mdelay() does the same loop internally
- decrease +36 lines of code and +2 lines of doc, to +6 lines of code and
+2 lines of doc
Documentation/kernel-parameters.txt | 7 +++++++
Documentation/power/basic-pm-debugging.txt | 10 ++++++----
kernel/power/suspend.c | 13 +++++++++++--
3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 176d4fe4f076..0b8a1fd0d08d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3433,6 +3433,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
improve throughput, but will also increase the
amount of memory reserved for use by the client.
+ suspend.pm_test_delay=
+ [SUSPEND]
+ Sets the number of seconds to remain in a suspend test
+ mode before resuming the system (see
+ /sys/power/pm_test). Only available when CONFIG_PM_DEBUG
+ is set. Default value is 5.
+
swapaccount=[0|1]
[KNL] Enable accounting of swap in memory resource
controller if no parameter or 1 is given or disable
diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt
index edeecd447d23..b96098ccfe69 100644
--- a/Documentation/power/basic-pm-debugging.txt
+++ b/Documentation/power/basic-pm-debugging.txt
@@ -75,12 +75,14 @@ you should do the following:
# echo platform > /sys/power/disk
# echo disk > /sys/power/state
-Then, the kernel will try to freeze processes, suspend devices, wait 5 seconds,
-resume devices and thaw processes. If "platform" is written to
+Then, the kernel will try to freeze processes, suspend devices, wait a few
+seconds (5 by default, but configurable by the suspend.pm_test_delay module
+parameter), resume devices and thaw processes. If "platform" is written to
/sys/power/pm_test , then after suspending devices the kernel will additionally
invoke the global control methods (eg. ACPI global control methods) used to
-prepare the platform firmware for hibernation. Next, it will wait 5 seconds and
-invoke the platform (eg. ACPI) global methods used to cancel hibernation etc.
+prepare the platform firmware for hibernation. Next, it will wait a
+configurable number of seconds and invoke the platform (eg. ACPI) global
+methods used to cancel hibernation etc.
Writing "none" to /sys/power/pm_test causes the kernel to switch to the normal
hibernation/suspend operations. Also, when open for reading, /sys/power/pm_test
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index c347e3ce3a55..aee23dab0a55 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -28,6 +28,7 @@
#include <linux/ftrace.h>
#include <trace/events/power.h>
#include <linux/compiler.h>
+#include <linux/moduleparam.h>
#include "power.h"
@@ -204,12 +205,20 @@ static bool platform_suspend_again(suspend_state_t state)
suspend_ops->suspend_again() : false;
}
+#ifdef CONFIG_PM_DEBUG
+static unsigned int pm_test_delay = 5;
+module_param(pm_test_delay, uint, 0644);
+MODULE_PARM_DESC(pm_test_delay,
+ "Number of seconds to wait before resuming from suspend test");
+#endif
+
static int suspend_test(int level)
{
#ifdef CONFIG_PM_DEBUG
if (pm_test_level == level) {
- printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n");
- mdelay(5000);
+ printk(KERN_INFO "suspend debug: Waiting for %d second(s).\n",
+ pm_test_delay);
+ mdelay(pm_test_delay * 1000);
return 1;
}
#endif /* !CONFIG_PM_DEBUG */
--
2.3.0
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-05-09 14:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-07 6:35 [PATCH v3] PM / sleep: add configurable delay for pm_test Zihuan Zhang
2025-05-07 15:49 ` Randy Dunlap
2025-05-09 14:01 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2014-09-03 23:55 [PATCH] " Brian Norris
2015-02-22 8:26 ` [PATCH v2] " Brian Norris
2015-02-23 5:16 ` [PATCH v3] " Brian Norris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®