From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM <linux-pm@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
"Thomas Weißschuh" <linux@weissschuh.net>,
"Petr Mladek" <pmladek@suse.com>,
"Lukas Bulwahn" <lukas.bulwahn@gmail.com>,
"Joe Perches" <joe@perches.com>,
"Todd Brandt" <todd.e.brandt@linux.intel.com>
Subject: [PATCH v1 2/2] PM: sleep: Refine error message in try_to_freeze_tasks()
Date: Thu, 01 Dec 2022 19:34:44 +0100 [thread overview]
Message-ID: <2122394.irdbgypaU6@kreacher> (raw)
In-Reply-To: <4441789.LvFx2qVVIh@kreacher>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
A previous change amended try_to_freeze_tasks() with the "what"
variable pointing to a string describing the group of tasks subject to
the freezing which may be used in the error message in there too, so
make that happen.
Accordingly, update sleepgraph.py to catch the modified error message
as appropriate.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
kernel/power/process.c | 4 ++--
tools/power/pm-graph/sleepgraph.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-pm/kernel/power/process.c
===================================================================
--- linux-pm.orig/kernel/power/process.c
+++ linux-pm/kernel/power/process.c
@@ -86,8 +86,8 @@ static int try_to_freeze_tasks(bool user
elapsed_msecs = ktime_to_ms(elapsed);
if (todo) {
- pr_err("Freezing of tasks %s after %d.%03d seconds "
- "(%d tasks refusing to freeze, wq_busy=%d):\n",
+ pr_err("Freezing %s %s after %d.%03d seconds "
+ "(%d tasks refusing to freeze, wq_busy=%d):\n", what,
wakeup ? "aborted" : "failed",
elapsed_msecs / 1000, elapsed_msecs % 1000,
todo - wq_busy, wq_busy);
Index: linux-pm/tools/power/pm-graph/sleepgraph.py
===================================================================
--- linux-pm.orig/tools/power/pm-graph/sleepgraph.py
+++ linux-pm/tools/power/pm-graph/sleepgraph.py
@@ -1462,7 +1462,7 @@ class Data:
'TIMEOUT' : r'(?i).*\bTIMEOUT\b.*',
'ABORT' : r'(?i).*\bABORT\b.*',
'IRQ' : r'.*\bgenirq: .*',
- 'TASKFAIL': r'.*Freezing of tasks *.*',
+ 'TASKFAIL': r'.*Freezing .*after *.*',
'ACPI' : r'.*\bACPI *(?P<b>[A-Za-z]*) *Error[: ].*',
'DISKFULL': r'.*\bNo space left on device.*',
'USBERR' : r'.*usb .*device .*, error [0-9-]*',
next prev parent reply other threads:[~2022-12-01 18:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-01 18:31 [PATCH v1 0/2] PM: sleep: Avoid using pr_cont() in tasks freezing code Rafael J. Wysocki
2022-12-01 18:33 ` [PATCH v1 1/2] PM: sleep: Avoid using pr_cont() in the " Rafael J. Wysocki
2022-12-01 18:34 ` Rafael J. Wysocki [this message]
2022-12-06 8:22 ` [PATCH v1 0/2] PM: sleep: Avoid using pr_cont() in " Petr Mladek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2122394.irdbgypaU6@kreacher \
--to=rjw@rjwysocki.net \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@weissschuh.net \
--cc=lukas.bulwahn@gmail.com \
--cc=pmladek@suse.com \
--cc=todd.e.brandt@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox