| Message ID | 20250506155659.95212-1-pmenzel@molgen.mpg.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | PM: thaw_processes: Rewrite restarting tasks log to remove stray *done.* | expand |
On Tue, May 6, 2025 at 5:57 PM Paul Menzel <pmenzel@molgen.mpg.de> wrote: > > `pr_cont()` unfortunately does not work here, as other parts of the > Linux kernel log between the two log lines: > > [18445.295056] r8152-cfgselector 4-1.1.3: USB disconnect, device number 5 > [18445.295112] OOM killer enabled. > [18445.295115] Restarting tasks ... > [18445.295185] usb 3-1: USB disconnect, device number 2 > [18445.295193] usb 3-1.1: USB disconnect, device number 3 > [18445.296262] usb 3-1.5: USB disconnect, device number 4 > [18445.297017] done. > [18445.297029] random: crng reseeded on system resumption > > `pr_cont()` also uses the default log level, normally warning, if the > corresponding log line is interrupted. > > Therefore, replace the `pr_cont()`, and explicitly log it as a separate > line with log level info: > > Restarting tasks ... > […] > Done restarting tasks. > > Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> > --- > kernel/power/process.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kernel/power/process.c b/kernel/power/process.c > index 66ac067d9ae6..92daf1dce8c3 100644 > --- a/kernel/power/process.c > +++ b/kernel/power/process.c > @@ -189,7 +189,7 @@ void thaw_processes(void) > > oom_killer_enable(); > > - pr_info("Restarting tasks ... "); > + pr_info("Restarting tasks ...\n"); I would prefer something like pr_info("Restarting tasks: Starting\n"); > > __usermodehelper_set_disable_depth(UMH_FREEZING); > thaw_workqueues(); > @@ -208,7 +208,7 @@ void thaw_processes(void) > usermodehelper_enable(); > > schedule(); > - pr_cont("done.\n"); > + pr_info("Done restarting tasks.\n"); And pr_info("Restarting tasks: Done\n"); here so the messages are more visually similar. Otherwise this change is fine by me. Thanks! > trace_suspend_resume(TPS("thaw_processes"), 0, false); > } > > -- > 2.49.0 >
Dear Raphael, Am 09.05.25 um 18:48 schrieb Rafael J. Wysocki: > On Tue, May 6, 2025 at 5:57 PM Paul Menzel <pmenzel@molgen.mpg.de> wrote: >> >> `pr_cont()` unfortunately does not work here, as other parts of the >> Linux kernel log between the two log lines: >> >> [18445.295056] r8152-cfgselector 4-1.1.3: USB disconnect, device number 5 >> [18445.295112] OOM killer enabled. >> [18445.295115] Restarting tasks ... >> [18445.295185] usb 3-1: USB disconnect, device number 2 >> [18445.295193] usb 3-1.1: USB disconnect, device number 3 >> [18445.296262] usb 3-1.5: USB disconnect, device number 4 >> [18445.297017] done. >> [18445.297029] random: crng reseeded on system resumption >> >> `pr_cont()` also uses the default log level, normally warning, if the >> corresponding log line is interrupted. >> >> Therefore, replace the `pr_cont()`, and explicitly log it as a separate >> line with log level info: >> >> Restarting tasks ... >> […] >> Done restarting tasks. >> >> Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> >> --- >> kernel/power/process.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/kernel/power/process.c b/kernel/power/process.c >> index 66ac067d9ae6..92daf1dce8c3 100644 >> --- a/kernel/power/process.c >> +++ b/kernel/power/process.c >> @@ -189,7 +189,7 @@ void thaw_processes(void) >> >> oom_killer_enable(); >> >> - pr_info("Restarting tasks ... "); >> + pr_info("Restarting tasks ...\n"); > > I would prefer something like > > pr_info("Restarting tasks: Starting\n"); > >> >> __usermodehelper_set_disable_depth(UMH_FREEZING); >> thaw_workqueues(); >> @@ -208,7 +208,7 @@ void thaw_processes(void) >> usermodehelper_enable(); >> >> schedule(); >> - pr_cont("done.\n"); >> + pr_info("Done restarting tasks.\n"); > > And > > pr_info("Restarting tasks: Done\n"); > > here so the messages are more visually similar. > > Otherwise this change is fine by me. > > Thanks! > >> trace_suspend_resume(TPS("thaw_processes"), 0, false); >> } Thank you for your review. I sent v2 [1]. Kind regards, Paul [1]: https://lore.kernel.org/linux-pm/20250511174648.950430-1-pmenzel@molgen.mpg.de/T/#u
diff --git a/kernel/power/process.c b/kernel/power/process.c index 66ac067d9ae6..92daf1dce8c3 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -189,7 +189,7 @@ void thaw_processes(void) oom_killer_enable(); - pr_info("Restarting tasks ... "); + pr_info("Restarting tasks ...\n"); __usermodehelper_set_disable_depth(UMH_FREEZING); thaw_workqueues(); @@ -208,7 +208,7 @@ void thaw_processes(void) usermodehelper_enable(); schedule(); - pr_cont("done.\n"); + pr_info("Done restarting tasks.\n"); trace_suspend_resume(TPS("thaw_processes"), 0, false); }
`pr_cont()` unfortunately does not work here, as other parts of the Linux kernel log between the two log lines: [18445.295056] r8152-cfgselector 4-1.1.3: USB disconnect, device number 5 [18445.295112] OOM killer enabled. [18445.295115] Restarting tasks ... [18445.295185] usb 3-1: USB disconnect, device number 2 [18445.295193] usb 3-1.1: USB disconnect, device number 3 [18445.296262] usb 3-1.5: USB disconnect, device number 4 [18445.297017] done. [18445.297029] random: crng reseeded on system resumption `pr_cont()` also uses the default log level, normally warning, if the corresponding log line is interrupted. Therefore, replace the `pr_cont()`, and explicitly log it as a separate line with log level info: Restarting tasks ... […] Done restarting tasks. Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de> --- kernel/power/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)