From: Don Zickus <dzickus@redhat.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org, rostedt@goodmis.org,
mingo@kernel.org, tglx@linutronix.de
Subject: Re: [PATCH 1/2] watchdog: Fix output
Date: Fri, 18 Mar 2016 12:37:48 -0400 [thread overview]
Message-ID: <20160318163748.GR64531@redhat.com> (raw)
In-Reply-To: <20160318153022.027826871@infradead.org>
On Fri, Mar 18, 2016 at 04:28:03PM +0100, Peter Zijlstra wrote:
> The pr_crap() functions generate idiotic output; use printk().
>
> Broken output:
>
> [ 3538.718135] NMI watchdog: BUG: soft lockup - CPU#2 stuck for 22s! [perf_fuzzer:2646]
> [ 3383.233583] NMI watchdog: Watchdog detected hard LOCKUP on cpu 27
>
> Fixed output:
>
> [14180.328194] BUG: soft lockup - CPU#2 stuck for 23s! [perf_fuzzer:13650]
> [ 1064.914925] BUG: NMI Watchdog detected hard LOCKUP on cpu 11
Would something like this be a better patch?
Cheers,
Don
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index b3ace6e..e3302a0 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -9,7 +9,7 @@
* to those contributors as well.
*/
-#define pr_fmt(fmt) "NMI watchdog: " fmt
+#define pr_fmt(fmt) "Lockup detector: " fmt
#include <linux/mm.h>
#include <linux/cpu.h>
@@ -350,7 +350,7 @@ static void watchdog_overflow_callback(struct perf_event *event,
if (__this_cpu_read(hard_watchdog_warn) == true)
return;
- pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
+ pr_emerg("Detected hard LOCKUP on cpu %d", this_cpu);
print_modules();
print_irqtrace_events(current);
if (regs)
@@ -467,7 +467,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
}
}
- pr_emerg("BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
+ pr_emerg("Detected soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
smp_processor_id(), duration,
current->comm, task_pid_nr(current));
__this_cpu_write(softlockup_task_ptr_saved, current);
>
> Cc: Don Zickus <dzickus@redhat.com>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> kernel/watchdog.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- a/kernel/watchdog.c
> +++ b/kernel/watchdog.c
> @@ -350,7 +350,7 @@ static void watchdog_overflow_callback(s
> if (__this_cpu_read(hard_watchdog_warn) == true)
> return;
>
> - pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
> + printk(KERN_EMERG "BUG: NMI detected hard LOCKUP on cpu %d", this_cpu);
> print_modules();
> print_irqtrace_events(current);
> if (regs)
> @@ -467,7 +467,7 @@ static enum hrtimer_restart watchdog_tim
> }
> }
>
> - pr_emerg("BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
> + printk(KERN_EMERG "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
> smp_processor_id(), duration,
> current->comm, task_pid_nr(current));
> __this_cpu_write(softlockup_task_ptr_saved, current);
>
>
next prev parent reply other threads:[~2016-03-18 16:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-18 15:28 [PATCH 0/2] random debug patches Peter Zijlstra
2016-03-18 15:28 ` [PATCH 1/2] watchdog: Fix output Peter Zijlstra
2016-03-18 16:37 ` Don Zickus [this message]
2016-03-18 16:44 ` Peter Zijlstra
2016-03-18 16:48 ` Peter Zijlstra
2016-03-18 17:42 ` Joe Perches
2016-03-18 18:12 ` Don Zickus
2016-03-18 17:49 ` Peter Zijlstra
2016-03-19 0:11 ` Jiri Kosina
2016-03-19 0:39 ` Jiri Kosina
2016-03-18 15:28 ` [PATCH 2/2] trace: Record and show NMI state Peter Zijlstra
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=20160318163748.GR64531@redhat.com \
--to=dzickus@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/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