PM: sleep: Expose last succeeded resumed timestamp in sysfs
Commit Message
From: Masami Hiramatsu <mhiramat@kernel.org>
Expose last succeeded resumed timestamp as last_success_resume_time
attribute of suspend_stats in sysfs. This timestamp is recorded in
CLOCK_MONOTONIC. So user can find the actual resumed time and
measure the elapsed time from the time when the kernel finished
the resume to the user-space action (e.g. display the UI).
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
---
Documentation/ABI/testing/sysfs-power | 10 ++++++++++
include/linux/suspend.h | 2 ++
kernel/power/main.c | 14 ++++++++++++++
kernel/power/suspend.c | 1 +
4 files changed, 27 insertions(+)
Comments
Hi Masami,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on v6.6-rc7 next-20231027]
[cannot apply to pavel-leds/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Masami-Hiramatsu-Google/PM-sleep-Expose-last-succeeded-resumed-timestamp-in-sysfs/20231027-215311
base: linus/master
patch link: https://lore.kernel.org/r/169841470363.1307628.18049455026067747896.stgit%40mhiramat.roam.corp.google.com
patch subject: [PATCH] PM: sleep: Expose last succeeded resumed timestamp in sysfs
config: mips-allyesconfig (https://download.01.org/0day-ci/archive/20231028/202310280256.JJlmxwDy-lkp@intel.com/config)
compiler: mips-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231028/202310280256.JJlmxwDy-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202310280256.JJlmxwDy-lkp@intel.com/
All warnings (new ones prefixed by >>):
kernel/power/main.c: In function 'last_success_resume_time_show':
>> kernel/power/main.c:427:32: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'time64_t' {aka 'long long int'} [-Wformat=]
427 | return sprintf(buf, "%lu.%lu\n",
| ~~^
| |
| long unsigned int
| %llu
428 | suspend_stats.last_success_resume_time.tv_sec,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| time64_t {aka long long int}
kernel/power/main.c: In function 'suspend_stats_show':
kernel/power/main.c:528:58: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'time64_t' {aka 'long long int'} [-Wformat=]
528 | seq_printf(s, " last_success_resume_time:\t%-lu.%lu\n",
| ~~~^
| |
| long unsigned int
| %-llu
529 | suspend_stats.last_success_resume_time.tv_sec,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| time64_t {aka long long int}
vim +427 kernel/power/main.c
423
424 static ssize_t last_success_resume_time_show(struct kobject *kobj,
425 struct kobj_attribute *attr, char *buf)
426 {
> 427 return sprintf(buf, "%lu.%lu\n",
428 suspend_stats.last_success_resume_time.tv_sec,
429 suspend_stats.last_success_resume_time.tv_nsec);
430 }
431 static struct kobj_attribute last_success_resume_time =
432 __ATTR_RO(last_success_resume_time);
433
@@ -442,6 +442,16 @@ Description:
'total_hw_sleep' and 'last_hw_sleep' may not be accurate.
This number is measured in microseconds.
+What: /sys/power/suspend_stats/last_success_resume_time
+Date: Oct 2023
+Contact: Masami Hiramatsu <mhiramat@kernel.org>
+Description:
+ The /sys/power/suspend_stats/last_success_resume_time file
+ contains the timestamp of when the kernel successfully
+ resumed from suspend/hibernate.
+ This floating number is measured in seconds by monotonic
+ clock.
+
What: /sys/power/sync_on_suspend
Date: October 2019
Contact: Jonas Meurer <jonas@freesources.org>
@@ -8,6 +8,7 @@
#include <linux/pm.h>
#include <linux/mm.h>
#include <linux/freezer.h>
+#include <linux/timekeeping.h>
#include <asm/errno.h>
#ifdef CONFIG_VT
@@ -71,6 +72,7 @@ struct suspend_stats {
u64 last_hw_sleep;
u64 total_hw_sleep;
u64 max_hw_sleep;
+ struct timespec64 last_success_resume_time;
enum suspend_stat_step failed_steps[REC_FAILED_NUM];
};
@@ -421,6 +421,16 @@ static ssize_t last_failed_step_show(struct kobject *kobj,
}
static struct kobj_attribute last_failed_step = __ATTR_RO(last_failed_step);
+static ssize_t last_success_resume_time_show(struct kobject *kobj,
+ struct kobj_attribute *attr, char *buf)
+{
+ return sprintf(buf, "%lu.%lu\n",
+ suspend_stats.last_success_resume_time.tv_sec,
+ suspend_stats.last_success_resume_time.tv_nsec);
+}
+static struct kobj_attribute last_success_resume_time =
+ __ATTR_RO(last_success_resume_time);
+
static struct attribute *suspend_attrs[] = {
&success.attr,
&fail.attr,
@@ -438,6 +448,7 @@ static struct attribute *suspend_attrs[] = {
&last_hw_sleep.attr,
&total_hw_sleep.attr,
&max_hw_sleep.attr,
+ &last_success_resume_time.attr,
NULL,
};
@@ -514,6 +525,9 @@ static int suspend_stats_show(struct seq_file *s, void *unused)
suspend_step_name(
suspend_stats.failed_steps[index]));
}
+ seq_printf(s, " last_success_resume_time:\t%-lu.%lu\n",
+ suspend_stats.last_success_resume_time.tv_sec,
+ suspend_stats.last_success_resume_time.tv_nsec);
return 0;
}
@@ -622,6 +622,7 @@ int pm_suspend(suspend_state_t state)
dpm_save_failed_errno(error);
} else {
suspend_stats.success++;
+ ktime_get_ts64(&suspend_stats.last_success_resume_time);
}
pr_info("suspend exit\n");
return error;