Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp4680431img; Tue, 26 Mar 2019 14:32:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzDIyK+9xqmVUU0CzR+T8ba8orD/Oyk0bXlCaP7NOkzCpTGLXdcZnjR9X8icSi4Z8/HjCD4 X-Received: by 2002:a62:52c3:: with SMTP id g186mr17049318pfb.173.1553635946420; Tue, 26 Mar 2019 14:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553635946; cv=none; d=google.com; s=arc-20160816; b=teQqzUtdcGyo2HcMy1kbfN48HeJgwTnPKEdep/Byj10WyESRaVyavz+RJ0cBL+6/S0 AiXbhrTv/f5zpKV2C4a/GmS8fXRl6VUOWoPA/msK+P2rNrzEFYsFtU7D9Gow5kpzjnR2 47KHYhHQ0cO2/wLQynBqIzM3/F7JJsaD3hVC1X3hBrzVlpPtC5qW0bxFdP+AgQN5WmGn ifUlLmTHb2iaNqUFK/4w0auzeXCbhjviymbvPMj7YkRuGNfpSUJvVt0qVyiMKpeYvJoh wV09Abgbuzj7vzKUJJ91Ck4zW62nnWAb8uXvinQm/4ThLewlsLcqXb5fDYqTbKr4OSG1 oAyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :message-id:in-reply-to:subject:cc:to:from:date; bh=lp2AbJ0jaJL1UP/PaIB4c6sfeH7HMnoEw1XYZQIpg/Q=; b=bxZ9ZPmbGe4znnnePU6WrbtrKYRtJ1gj1DDv0++R6oXg87Ik+MkdRO1xiAFO9HZQWf 224c2Lu+lbFaP4mpFAaRyJrKLuvzP8TUZWHp69H26HJlnHn1uHknkuGIQb3avGc2e/ZY BK4+3tQsfpoip8L6I1rtl6wgbCP1FnCGaU4xXbPiqS6rM3ziocE6C3MpD8/dHYbrXtBY HyEz0lAvpNf+CdyOHpegEz+OWvkBkoKBrY3SDQBQva8DbmYwQCG1kn9RjjiR/io7c0DF VCjmdFZ2M/+kg3QPbSn8eAWRrOd7yw26fA/BrHG+OX+yrgS/EBkSoT7TNAlIzwbNqbMK sGtQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a14si16840972pgd.176.2019.03.26.14.32.10; Tue, 26 Mar 2019 14:32:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732727AbfCZVaC (ORCPT + 99 others); Tue, 26 Mar 2019 17:30:02 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:49532 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731617AbfCZVaC (ORCPT ); Tue, 26 Mar 2019 17:30:02 -0400 Received: from p5492e2fc.dip0.t-ipconnect.de ([84.146.226.252] helo=nanos) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1h8tdp-0006le-Dw; Tue, 26 Mar 2019 22:29:53 +0100 Date: Tue, 26 Mar 2019 22:29:52 +0100 (CET) From: Thomas Gleixner To: Ricardo Neri cc: Ingo Molnar , Borislav Petkov , Ashok Raj , Andi Kleen , Peter Zijlstra , "Ravi V. Shankar" , x86@kernel.org, linux-kernel@vger.kernel.org, Ricardo Neri , "H. Peter Anvin" , Tony Luck , Clemens Ladisch , Arnd Bergmann , Philippe Ombredanne , Kate Stewart , "Rafael J. Wysocki" , Mimi Zohar , Jan Kiszka , Nick Desaulniers , Masahiro Yamada , Nayna Jain Subject: Re: [RFC PATCH v2 13/14] watchdog/hardlockup/hpet: Only enable the HPET watchdog via a boot parameter In-Reply-To: <1551283518-18922-14-git-send-email-ricardo.neri-calderon@linux.intel.com> Message-ID: References: <1551283518-18922-1-git-send-email-ricardo.neri-calderon@linux.intel.com> <1551283518-18922-14-git-send-email-ricardo.neri-calderon@linux.intel.com> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 27 Feb 2019, Ricardo Neri wrote: > + When hpet is specified, the NMI watchdog will be driven > + by an HPET timer, if available in the system. Otherwise, > + the perf-based implementation will be used. Specifying > + hpet implies that nmi_watchdog is on. How so? > +static int __init hardlockup_detector_hpet_setup(char *str) > +{ > + if (strstr(str, "hpet")) > + hardlockup_use_hpet = true; strstr()? Not really. > + > + return 0; > +} > +__setup("nmi_watchdog=", hardlockup_detector_hpet_setup); > + > /** > * hardlockup_detector_hpet_init() - Initialize the hardlockup detector > * > @@ -405,6 +422,9 @@ int __init hardlockup_detector_hpet_init(void) > { > int ret; > > + if (!hardlockup_use_hpet) > + return -ENODEV; This should have been there in the patch which introduces hardlockup_detector_hpet_init(). And this patch merily adds the command line magic which sets that flag. > + > if (!is_hpet_enabled()) > return -ENODEV; > > diff --git a/kernel/watchdog.c b/kernel/watchdog.c > index 367aa81294ef..28cad7310378 100644 > --- a/kernel/watchdog.c > +++ b/kernel/watchdog.c > @@ -78,7 +78,7 @@ static int __init hardlockup_panic_setup(char *str) > nmi_watchdog_user_enabled = 0; > else if (!strncmp(str, "1", 1)) > nmi_watchdog_user_enabled = 1; > - return 1; > + return 0; Why? Thanks, tglx