Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752586AbdLKOnv (ORCPT ); Mon, 11 Dec 2017 09:43:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42882 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751593AbdLKOnt (ORCPT ); Mon, 11 Dec 2017 09:43:49 -0500 Date: Mon, 11 Dec 2017 09:43:48 -0500 From: Don Zickus To: Scott Wood Cc: Jonathan Corbet , linux-kernel@vger.kernel.org, Christoph von Recklinghausen Subject: Re: [PATCH] Documentation: Better document the hardlockup_panic sysctl Message-ID: <20171211144347.dcxxv2cfonyrjmca@redhat.com> References: <20171210074846.20180-1-swood@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171210074846.20180-1-swood@redhat.com> User-Agent: NeoMutt/20171027 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 11 Dec 2017 14:43:49 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2314 Lines: 64 On Sun, Dec 10, 2017 at 01:48:46AM -0600, Scott Wood wrote: > Commit ac1f591249d95372f ("kernel/watchdog.c: add sysctl knob > hardlockup_panic") added the hardlockup_panic sysctl, but did not add it > to Documentation/sysctl/kernel.txt. Add this, and reference it from the > corresponding entry in Documentation/admin-guide/kernel-parameters.txt. Acked-by: Don Zickus > > Signed-off-by: Scott Wood > --- > Documentation/admin-guide/kernel-parameters.txt | 3 +++ > Documentation/sysctl/kernel.txt | 14 ++++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt > index 6571fbfdb2a1..dfb7c35b5826 100644 > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@ -2538,6 +2538,9 @@ > This is useful when you use a panic=... timeout and > need the box quickly up again. > > + These settings can be accessed at runtime via > + the nmi_watchdog and hardlockup_panic sysctls. > + > netpoll.carrier_timeout= > [NET] Specifies amount of time (in seconds) that > netpoll should wait for a carrier. By default netpoll > diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt > index 694968c7523c..63663039acb7 100644 > --- a/Documentation/sysctl/kernel.txt > +++ b/Documentation/sysctl/kernel.txt > @@ -34,6 +34,7 @@ show up in /proc/sys/kernel: > - hostname > - hotplug > - hardlockup_all_cpu_backtrace > +- hardlockup_panic > - hung_task_panic > - hung_task_check_count > - hung_task_timeout_secs > @@ -313,6 +314,19 @@ will be initiated. > 1: on detection capture more debug information. > ============================================================== > > +hardlockup_panic: > + > +This parameter can be used to control whether the kernel panics > +when a hard lockup is detected. > + > + 0 - don't panic on hard lockup > + 1 - panic on hard lockup > + > +See Documentation/lockup-watchdogs.txt for more information. This can > +also be set using the nmi_watchdog kernel parameter. > + > +============================================================== > + > hotplug: > > Path for the hotplug policy agent. > -- > 2.9.5 >