From patchwork Fri Oct 27 13:51:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 158940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp618382vqb; Fri, 27 Oct 2023 06:52:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGLfP23VfOHzMsA3WhreUMunV28yMG/083C4A+jiDAcxTQvLIrtatenzdF3QE0Q2GNgwgNQ X-Received: by 2002:a05:6871:8108:b0:1dc:9714:e2b3 with SMTP id sn8-20020a056871810800b001dc9714e2b3mr2865788oab.7.1698414753376; Fri, 27 Oct 2023 06:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698414753; cv=none; d=google.com; s=arc-20160816; b=Yzq1ftECae79OXNCc0rfkM9ggwTAxDJ4UuqRwh5FA8VjPJ3goA4DsxTf3m8XKET/et QYYDCLLbjYxJPLw8DgEOVY43KWUs9X3XE7GPTAz1EtuVinmkhJhAB00eeh05eYvgRq4v za4fv/wwuwsZOOS1mWQ+xhdtvt3/+J+Kb6djRToXb3tRKF5pAbSPlhEAmkkGZNJt/0MD t8XsSUpqg9GRCPDJykAdI71IaQ0kbuJhdz2A3BAquYtZpAcQnVo+jQ9X/8csx21gaHdm LKL+u+b/7T3meYWLnagEyALdNt1iiA+e1uDgie3kAN+nxpj8FFRJsnVAY9TPoGVam/pV QCbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:message-id:date:subject:cc:to:from:dkim-signature; bh=nOVvC8+1wxJlVuLfnbM7yKnTKRM7yExVUvv2gUkBKtA=; fh=vosOEIJD+PFkocQxJzkb0pF69x0x09bgqchiV1K24k0=; b=bCNYLK4mFt1xZoacxzflr9MBLCZ68DXV9jg3UcskyZqROlbLOX313EvE6RgKsWTYw3 mrPchdoRBCIB+7Rv+j+AdyiOK0v8EOUlMlHVNIY1MujUgHaQATcm6efrQsBcxHqEDOF3 cG6NBTNLDB/ZyA8Xsj0865fKvg4ExFiEBtuKi9PdIprKqx9uQxlr8+mG4zTVutslf/w4 1jnkJrtg5v9OqbZQi5T0cdxEUGO2emd26CcxhBU0AEc633/TZ1hK2K/tiXHTOifFAYIa QadDKh1muWNuqFP8s04y4q7cHFpFKHD1zwzOAr694A9CklON9PlxwgywCwjXyvmGxJhL TYwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sqGbuQ5s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id r14-20020a25ac4e000000b00d9ab9e76ccbsi2774820ybd.186.2023.10.27.06.52.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 06:52:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sqGbuQ5s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id AE46A836E5E9; Fri, 27 Oct 2023 06:52:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346023AbjJ0Nvv (ORCPT + 25 others); Fri, 27 Oct 2023 09:51:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345994AbjJ0Nvu (ORCPT ); Fri, 27 Oct 2023 09:51:50 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B8359D; Fri, 27 Oct 2023 06:51:48 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B5DBC433C8; Fri, 27 Oct 2023 13:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698414707; bh=Oh+Z5xG5avS0dMkgxiarLcVCx5WCzuXgr1/L6i+1S/8=; h=From:To:Cc:Subject:Date:From; b=sqGbuQ5sa8RK2Gnzv6tf7yG71QrwA04iw1U/4NDqBBmlcEN66U0Qi6ck90lvb4Ntx 9dGh/6opnrg7zRQBGAzrSTRwbthp+rGHihleTuRorD7kugGaBiXLCJ9K/TWq3+9+6/ zoMJcH9WX+QMXs1XZJzl/vIxmY44W/Icl+gpBFXHgEI6d87SUdNHAegkK99q6idx0A CSEHqOS8OVgFsUCFiqij4G2vPYlpUeExNqW1utL99j9CNBpzYOi5NvAsQ2O3B79Kza jMWKqkFZB3IibbQq0Mc2k6l/Q7qLfPIAK0DoBLMUHXXzfO0/vK/bVOErVYdYl6nF6+ jhFw13voSi/Pg== From: "Masami Hiramatsu (Google)" To: "Rafael J . Wysocki" , Pavel Machek , Len Brown Cc: suleiman@google.com, briannorris@google.com, Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH] PM: sleep: Expose last succeeded resumed timestamp in sysfs Date: Fri, 27 Oct 2023 22:51:43 +0900 Message-ID: <169841470363.1307628.18049455026067747896.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 27 Oct 2023 06:52:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780916948660079038 X-GMAIL-MSGID: 1780916948660079038 From: Masami Hiramatsu 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) --- 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(+) diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power index a3942b1036e2..63659765dee1 100644 --- a/Documentation/ABI/testing/sysfs-power +++ b/Documentation/ABI/testing/sysfs-power @@ -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 +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 diff --git a/include/linux/suspend.h b/include/linux/suspend.h index ef503088942d..ddd789044960 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #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]; }; diff --git a/kernel/power/main.c b/kernel/power/main.c index f6425ae3e8b0..e134d61c5ab2 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -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; } diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index fa3bf161d13f..33334565d5a6 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -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;