LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter
@ 2019-05-21 2:32 Zhenzhong Duan
2019-05-23 18:37 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Zhenzhong Duan @ 2019-05-21 2:32 UTC (permalink / raw)
To: linux-kernel, linux-doc
Cc: paulmck, josh, rostedt, mathieu.desnoyers, jiangshanlai, joel,
corbet, tglx, mingo, gregkh, keescook, srinivas.eeda,
Zhenzhong Duan
The default behavior of hardlockup depends on the config of
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC.
Fix the description of nmi_watchdog to make it clear.
Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-doc@vger.kernel.org
---
v3: add Suggested-by and Acked-by
v2: fix description using words suggested by Steven Rostedt
Documentation/admin-guide/kernel-parameters.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 08df588..b9d4358 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2805,8 +2805,9 @@
0 - turn hardlockup detector in nmi_watchdog off
1 - turn hardlockup detector in nmi_watchdog on
When panic is specified, panic when an NMI watchdog
- timeout occurs (or 'nopanic' to override the opposite
- default). To disable both hard and soft lockup detectors,
+ timeout occurs (or 'nopanic' to not panic on an NMI
+ watchdog, if CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is set)
+ To disable both hard and soft lockup detectors,
please see 'nowatchdog'.
This is useful when you use a panic=... timeout and
need the box quickly up again.
--
1.8.3.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter
2019-05-21 2:32 [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter Zhenzhong Duan
@ 2019-05-23 18:37 ` Steven Rostedt
2019-05-23 19:01 ` Jonathan Corbet
0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2019-05-23 18:37 UTC (permalink / raw)
To: Zhenzhong Duan, corbet
Cc: linux-kernel, linux-doc, paulmck, josh, mathieu.desnoyers,
jiangshanlai, joel, tglx, mingo, gregkh, keescook, srinivas.eeda
On Tue, 21 May 2019 10:32:08 +0800
Zhenzhong Duan <zhenzhong.duan@oracle.com> wrote:
> The default behavior of hardlockup depends on the config of
> CONFIG_BOOTPARAM_HARDLOCKUP_PANIC.
>
Jon,
You want to take this in your tree?
-- Steve
> Fix the description of nmi_watchdog to make it clear.
>
> Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
> Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
> Acked-by: Ingo Molnar <mingo@kernel.org>
> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-doc@vger.kernel.org
> ---
> v3: add Suggested-by and Acked-by
> v2: fix description using words suggested by Steven Rostedt
>
> Documentation/admin-guide/kernel-parameters.txt | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index 08df588..b9d4358 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -2805,8 +2805,9 @@
> 0 - turn hardlockup detector in nmi_watchdog off
> 1 - turn hardlockup detector in nmi_watchdog on
> When panic is specified, panic when an NMI watchdog
> - timeout occurs (or 'nopanic' to override the opposite
> - default). To disable both hard and soft lockup detectors,
> + timeout occurs (or 'nopanic' to not panic on an NMI
> + watchdog, if CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is set)
> + To disable both hard and soft lockup detectors,
> please see 'nowatchdog'.
> This is useful when you use a panic=... timeout and
> need the box quickly up again.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter
2019-05-23 18:37 ` Steven Rostedt
@ 2019-05-23 19:01 ` Jonathan Corbet
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Corbet @ 2019-05-23 19:01 UTC (permalink / raw)
To: Steven Rostedt
Cc: Zhenzhong Duan, linux-kernel, linux-doc, paulmck, josh,
mathieu.desnoyers, jiangshanlai, joel, tglx, mingo, gregkh,
keescook, srinivas.eeda
On Thu, 23 May 2019 14:37:03 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Tue, 21 May 2019 10:32:08 +0800
> Zhenzhong Duan <zhenzhong.duan@oracle.com> wrote:
>
> > The default behavior of hardlockup depends on the config of
> > CONFIG_BOOTPARAM_HARDLOCKUP_PANIC.
> >
>
> Jon,
>
> You want to take this in your tree?
Sure, I'll take it.
Thanks,
jon
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-23 19:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-21 2:32 [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter Zhenzhong Duan
2019-05-23 18:37 ` Steven Rostedt
2019-05-23 19:01 ` Jonathan Corbet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).