From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1DFDECDE46 for ; Wed, 24 Oct 2018 16:53:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82F1A207DD for ; Wed, 24 Oct 2018 16:53:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82F1A207DD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727562AbeJYBWS (ORCPT ); Wed, 24 Oct 2018 21:22:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48159 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727535AbeJYBWS (ORCPT ); Wed, 24 Oct 2018 21:22:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75AE330F8BEA; Wed, 24 Oct 2018 16:53:29 +0000 (UTC) Received: from loberhel74.redhat.com (ovpn-121-56.rdu2.redhat.com [10.10.121.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D7EB79806; Wed, 24 Oct 2018 16:53:25 +0000 (UTC) From: Laurence Oberman To: linux-kernel@vger.kernel.org, loberman@redhat.com Cc: rdunlap@infradead.org, tglx@linutronix.de Subject: [PATCH] V3 init/main.c Enable watchdog_thresh control from kernel line Date: Wed, 24 Oct 2018 12:53:12 -0400 Message-Id: <1540399992-23448-1-git-send-email-loberman@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 24 Oct 2018 16:53:29 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Both graphics and serial consoles are exposed to hard lockups when handling a large amount of messaging. The kernel watchdog_thresh parameter up to now has not been available to be set on the kernel line for early boot. This patch allows the setting of watchdog_thresh to be increased when needed to avoid the hard lockups in the console code. Signed-off-by: Laurence Oberman --- Documentation/admin-guide/kernel-parameters.txt | 8 ++++++++ init/main.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 4cdcd1a..cd8d588 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4932,6 +4932,14 @@ or other driver-specific files in the Documentation/watchdog/ directory. + watchdog_thresh= + This parameter is now available as a kernel line + parameter. Use watchdog_thresh=30 as example + This will allow early boot changes of the current + default of 10s to be increased when needed to + avoid hard lockups. + Default: 10 + workqueue.watchdog_thresh= If CONFIG_WQ_WATCHDOG is configured, workqueue can warn stall conditions and dump internal state to diff --git a/init/main.c b/init/main.c index 1c3f902..88cbed9 100644 --- a/init/main.c +++ b/init/main.c @@ -1038,6 +1038,15 @@ static int __init set_debug_rodata(char *str) __setup("rodata=", set_debug_rodata); #endif +static int __init +is_watchdog_thresh_setup(char *str) +{ + get_option(&str, &watchdog_thresh); + return 1; +} +__setup("watchdog_thresh=", is_watchdog_thresh_setup); + + #ifdef CONFIG_STRICT_KERNEL_RWX static void mark_readonly(void) { -- 1.8.3.1