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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA55DC77B73 for ; Fri, 5 May 2023 02:44:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbjEECoG (ORCPT ); Thu, 4 May 2023 22:44:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjEECoF (ORCPT ); Thu, 4 May 2023 22:44:05 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F05DAD38; Thu, 4 May 2023 19:44:04 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-64115e652eeso16772131b3a.0; Thu, 04 May 2023 19:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683254644; x=1685846644; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=6p6u1lFjW4Kf09rSTKWsXMKlDYVeiQSooaSY9v1sr/Q=; b=QbKGfhq0/VukYKNOHSY0v6xool59GlcBA7iNCg/HZdPbfNOI2U2wcnjPXAdf3zpDkj neU9jKCAtRwHCKxj/dP2KmEw7WoZ+/fSgnPuru60Zr2cLV8DFMTJpFsvQUp0osYoWylv rT8pWaBnXgiHvYDJMiG4neHu+4VqKhfWNnr1tIHtYOjRAWtH4DTqcyx92QPeDmU7q82E frpiNSAXqak7qrwnnS0dIUPjc5fXWsiEuhJKdxFLctM5Zvbjdi+fLfjCp2V83M1r4jnH XnrKN5LRxqq3UGh5iew5MwCe4VHRQcAXT4k2Gtdn/87diQ/0Tf+k5/0FugOrgI2Vifc8 agSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683254644; x=1685846644; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6p6u1lFjW4Kf09rSTKWsXMKlDYVeiQSooaSY9v1sr/Q=; b=L5ekQbkZHtWH51W3Sabydq4SwZI+SRDKDdghlzHsgNxcrL813KxuI7X6/F9k56gmh7 Ya/D4wuO83wBkMD9NKnwpLCYM/36Nj/flnTnUsTcBjOwidYOaIm8x/YEBARed31oMfpW HgrzmiErBkgWYsivqq5eE0NcAGbnaVEHKl9fZWczAfGjA7LZaVwwGB7FDIvpZOj8Qz+B McOdewwepS90/mEzJgQSzQo73b7jFSK00u1u+RlYm44Ta5oziw42+7PsPT8eRRl017A7 1rvHR0NPPUZMDFn5X6YKW4eg0j4CZWQeMTuNAArb9y4Mpokk5wyPHr2oZ3FirGHYL16Z pXIg== X-Gm-Message-State: AC+VfDxSntdqslAhy73dOnTiIW57AdqpWEjPbdDca3mwMZP1OVO6+E+u 8sRcAm1B04I2lRE26hGND6g= X-Google-Smtp-Source: ACHHUZ4FBwflGrFFYjYNCYAzAyBJY99qsAdoPf2uCzMYjlcj4Lp1AfSMQ3BwlsR14zq5zCM3V2Gwxg== X-Received: by 2002:a05:6a20:4309:b0:f4:c0d6:87c with SMTP id h9-20020a056a20430900b000f4c0d6087cmr202733pzk.14.1683254643632; Thu, 04 May 2023 19:44:03 -0700 (PDT) Received: from localhost ([203.59.190.92]) by smtp.gmail.com with ESMTPSA id n7-20020aa79047000000b00642ea56f06fsm435666pfo.0.2023.05.04.19.43.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 May 2023 19:44:02 -0700 (PDT) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 05 May 2023 12:43:49 +1000 Message-Id: Cc: "Sumit Garg" , "Mark Rutland" , "Matthias Kaehlcke" , "Stephane Eranian" , "Stephen Boyd" , , "Tzung-Bi Shih" , "Lecopzer Chen" , , "Masayoshi Mizuma" , "Guenter Roeck" , "Pingfan Liu" , "Andi Kleen" , "Ian Rogers" , , , , "Randy Dunlap" , "Chen-Yu Tsai" , , , , , "Will Deacon" , , , "Marc Zyngier" , "Catalin Marinas" , "Daniel Thompson" Subject: Re: [PATCH v4 01/17] watchdog/perf: Define dummy watchdog_update_hrtimer_threshold() on correct config From: "Nicholas Piggin" To: "Douglas Anderson" , "Petr Mladek" , "Andrew Morton" X-Mailer: aerc 0.14.0 References: <20230504221349.1535669-1-dianders@chromium.org> <20230504151100.v4.1.I8cbb2f4fa740528fcfade4f5439b6cdcdd059251@changeid> In-Reply-To: <20230504151100.v4.1.I8cbb2f4fa740528fcfade4f5439b6cdcdd059251@changeid> Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org On Fri May 5, 2023 at 8:13 AM AEST, Douglas Anderson wrote: > The real watchdog_update_hrtimer_threshold() is defined in > watchdog_hardlockup_perf.c. That file is included if In kernel/watchdog_hld.c. > CONFIG_HARDLOCKUP_DETECTOR_PERF and the function is defined in that > file if CONFIG_HARDLOCKUP_CHECK_TIMESTAMP. > > The dummy version of the function in "nmi.h" didn't get that quite > right. While this doesn't appear to be a huge deal, it's nice to make > it consistent. It doesn't break builds because CHECK_TIMESTAMP is only defined by x86 so others don't get a double definition, and x86 uses perf lockup detector, so it gets the out of line version. So has no functional change but should be fixed. Reviewed-by: Nicholas Piggin > > Fixes: 7edaeb6841df ("kernel/watchdog: Prevent false positives with turbo= modes") > Signed-off-by: Douglas Anderson > --- > > Changes in v4: > - ("Define dummy watchdog_update_hrtimer_threshold() ...") new for v4. > > include/linux/nmi.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/nmi.h b/include/linux/nmi.h > index 048c0b9aa623..771d77b62bc1 100644 > --- a/include/linux/nmi.h > +++ b/include/linux/nmi.h > @@ -197,7 +197,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh); > #endif > =20 > #if defined(CONFIG_HARDLOCKUP_CHECK_TIMESTAMP) && \ > - defined(CONFIG_HARDLOCKUP_DETECTOR) > + defined(CONFIG_HARDLOCKUP_DETECTOR_PERF) > void watchdog_update_hrtimer_threshold(u64 period); > #else > static inline void watchdog_update_hrtimer_threshold(u64 period) { } > --=20 > 2.40.1.521.gf1e218fcd8-goog 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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BDDEAC7EE23 for ; Fri, 5 May 2023 02:44:59 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QCFQf1ljpz3fFW for ; Fri, 5 May 2023 12:44:58 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=QbKGfhq0; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::430; helo=mail-pf1-x430.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=QbKGfhq0; dkim-atps=neutral Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QCFPh15SJz2xHT for ; Fri, 5 May 2023 12:44:06 +1000 (AEST) Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-64115e652eeso16772130b3a.0 for ; Thu, 04 May 2023 19:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683254644; x=1685846644; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=6p6u1lFjW4Kf09rSTKWsXMKlDYVeiQSooaSY9v1sr/Q=; b=QbKGfhq0/VukYKNOHSY0v6xool59GlcBA7iNCg/HZdPbfNOI2U2wcnjPXAdf3zpDkj neU9jKCAtRwHCKxj/dP2KmEw7WoZ+/fSgnPuru60Zr2cLV8DFMTJpFsvQUp0osYoWylv rT8pWaBnXgiHvYDJMiG4neHu+4VqKhfWNnr1tIHtYOjRAWtH4DTqcyx92QPeDmU7q82E frpiNSAXqak7qrwnnS0dIUPjc5fXWsiEuhJKdxFLctM5Zvbjdi+fLfjCp2V83M1r4jnH XnrKN5LRxqq3UGh5iew5MwCe4VHRQcAXT4k2Gtdn/87diQ/0Tf+k5/0FugOrgI2Vifc8 agSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683254644; x=1685846644; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6p6u1lFjW4Kf09rSTKWsXMKlDYVeiQSooaSY9v1sr/Q=; b=ZxAtNJpf5YP6rhQ146bYvu/V9JulmO92sTWYb4t6nRnu+TSHgpYJ9CmxpLUuiWRhHq IYRZjN7y21y+ylpiq7TULidngNY2muSs3J651wEifnI76/AciIns9QSUV2pB5SWU+QNB 1QK36BY81Un4CDaxUFVxf1EwB+NZLxaa7II9P+dqiBKIt91Niei/VSo1mJUjujXAQzSZ JszqvNuJPr0J7vn2oe+HcmTnQ7/rznTGJixLafQF/URKJzWMz7u1JbBbIRX4kTTqeK7o lQyWp46rw9GzJua2kmXNciCw7nyVJvWBZIZI+uKHwYGkhv8Q4cfsCNR+bwry6hdwQ1HF 3/jA== X-Gm-Message-State: AC+VfDxW2Jb0vKM5FJJ4oQt07+4jneFCECCw4jYlP1Rwjc5HztDI0pcU TvjCbAd4jjBDTq2PX/Dqafw= X-Google-Smtp-Source: ACHHUZ4FBwflGrFFYjYNCYAzAyBJY99qsAdoPf2uCzMYjlcj4Lp1AfSMQ3BwlsR14zq5zCM3V2Gwxg== X-Received: by 2002:a05:6a20:4309:b0:f4:c0d6:87c with SMTP id h9-20020a056a20430900b000f4c0d6087cmr202733pzk.14.1683254643632; Thu, 04 May 2023 19:44:03 -0700 (PDT) Received: from localhost ([203.59.190.92]) by smtp.gmail.com with ESMTPSA id n7-20020aa79047000000b00642ea56f06fsm435666pfo.0.2023.05.04.19.43.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 May 2023 19:44:02 -0700 (PDT) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 05 May 2023 12:43:49 +1000 Message-Id: Subject: Re: [PATCH v4 01/17] watchdog/perf: Define dummy watchdog_update_hrtimer_threshold() on correct config From: "Nicholas Piggin" To: "Douglas Anderson" , "Petr Mladek" , "Andrew Morton" X-Mailer: aerc 0.14.0 References: <20230504221349.1535669-1-dianders@chromium.org> <20230504151100.v4.1.I8cbb2f4fa740528fcfade4f5439b6cdcdd059251@changeid> In-Reply-To: <20230504151100.v4.1.I8cbb2f4fa740528fcfade4f5439b6cdcdd059251@changeid> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Ian Rogers , Randy Dunlap , Lecopzer Chen , kgdb-bugreport@lists.sourceforge.net, ricardo.neri@intel.com, Stephane Eranian , Guenter Roeck , sparclinux@vger.kernel.org, Will Deacon , Daniel Thompson , Andi Kleen , Chen-Yu Tsai , Matthias Kaehlcke , Catalin Marinas , Masayoshi Mizuma , ravi.v.shankar@intel.com, Tzung-Bi Shih , Stephen Boyd , Pingfan Liu , linux-arm-kernel@lists.infradead.org, Sumit Garg , ito-yuichi@fujitsu.com, linux-perf-users@vger.kernel.org, Marc Zyngier , linuxppc-dev@lists.ozlabs.org, davem@davemloft.net Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Fri May 5, 2023 at 8:13 AM AEST, Douglas Anderson wrote: > The real watchdog_update_hrtimer_threshold() is defined in > watchdog_hardlockup_perf.c. That file is included if In kernel/watchdog_hld.c. > CONFIG_HARDLOCKUP_DETECTOR_PERF and the function is defined in that > file if CONFIG_HARDLOCKUP_CHECK_TIMESTAMP. > > The dummy version of the function in "nmi.h" didn't get that quite > right. While this doesn't appear to be a huge deal, it's nice to make > it consistent. It doesn't break builds because CHECK_TIMESTAMP is only defined by x86 so others don't get a double definition, and x86 uses perf lockup detector, so it gets the out of line version. So has no functional change but should be fixed. Reviewed-by: Nicholas Piggin > > Fixes: 7edaeb6841df ("kernel/watchdog: Prevent false positives with turbo= modes") > Signed-off-by: Douglas Anderson > --- > > Changes in v4: > - ("Define dummy watchdog_update_hrtimer_threshold() ...") new for v4. > > include/linux/nmi.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/nmi.h b/include/linux/nmi.h > index 048c0b9aa623..771d77b62bc1 100644 > --- a/include/linux/nmi.h > +++ b/include/linux/nmi.h > @@ -197,7 +197,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh); > #endif > =20 > #if defined(CONFIG_HARDLOCKUP_CHECK_TIMESTAMP) && \ > - defined(CONFIG_HARDLOCKUP_DETECTOR) > + defined(CONFIG_HARDLOCKUP_DETECTOR_PERF) > void watchdog_update_hrtimer_threshold(u64 period); > #else > static inline void watchdog_update_hrtimer_threshold(u64 period) { } > --=20 > 2.40.1.521.gf1e218fcd8-goog 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41D55C77B7C for ; Fri, 5 May 2023 02:44:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:To:From:Subject: Cc:Message-Id:Date:Mime-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uncoDQRNBhJP00C/AHvCHMYz1qlQJmala/xNc4ALDQQ=; b=tGImzNoO3kr6GL NMYGdJieBnC/4+RMt3PaIO7F2mCqVsMZx/7+OqeBNYPiDEjjhOF22cTTiPS35RaiSWtAdwfuPfySK v1EZkIktJ4aVIvaZeUUpFgwB/ytmz09GaSQ2KbOZdSBivlS2HHWwh5XV6Stm3ng9ozT8Amh0kFS+9 UJnQE927OU0LvAKxzuulGnJVdz1pyopxZDvRshu/JiU580QbgzRPJ67F1E2gxWfjBtrnfuCkoz++R /eT8yYYRCvK888f1evzAFtAtNBQRtZfCU/67Z4FXuDzlPMdT+ypScYUuaTbUZWG5x32YJ4j025huB 7kqXrggOpcmpJylv9K/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pulQV-009YjG-21; Fri, 05 May 2023 02:44:07 +0000 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pulQS-009YiV-3D for linux-arm-kernel@lists.infradead.org; Fri, 05 May 2023 02:44:06 +0000 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-64115eef620so16658531b3a.1 for ; Thu, 04 May 2023 19:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683254644; x=1685846644; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=6p6u1lFjW4Kf09rSTKWsXMKlDYVeiQSooaSY9v1sr/Q=; b=QbKGfhq0/VukYKNOHSY0v6xool59GlcBA7iNCg/HZdPbfNOI2U2wcnjPXAdf3zpDkj neU9jKCAtRwHCKxj/dP2KmEw7WoZ+/fSgnPuru60Zr2cLV8DFMTJpFsvQUp0osYoWylv rT8pWaBnXgiHvYDJMiG4neHu+4VqKhfWNnr1tIHtYOjRAWtH4DTqcyx92QPeDmU7q82E frpiNSAXqak7qrwnnS0dIUPjc5fXWsiEuhJKdxFLctM5Zvbjdi+fLfjCp2V83M1r4jnH XnrKN5LRxqq3UGh5iew5MwCe4VHRQcAXT4k2Gtdn/87diQ/0Tf+k5/0FugOrgI2Vifc8 agSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683254644; x=1685846644; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6p6u1lFjW4Kf09rSTKWsXMKlDYVeiQSooaSY9v1sr/Q=; b=DgYcnbKiwKq+xkhGteN+IluL4Ogd0H3zarbH3WZwere7zxmOfUgxhlXsmcdElhOtNZ 4qIOXZHDMXZ9g/NkZsCGSUfw2HtqpTYTuIMnY8SYMxt2pupWk6TwIuagtx1twrF7Lo14 b5vzc1xcethnhqDeopcGbx1G+C7o2ma5gPa4NdTnH8vrq+Ec+KIdH+Fzv4MunKZy8gHy kzXr2jFsbjASBxyo5CV0hHC2wnGgOtFvKzXHRZaoD8P3tHjkKqVhIJGEoekwz/TomG3S JHIqXOARap8oOe16chd6bojhxdULyGUTK4UxaGpBaVdTZwkHq2UuIyLcoLIV8SkclOeQ LzsA== X-Gm-Message-State: AC+VfDzyj1vT1eDmVUo/s1jOAyfvIynwfbt2z8+5ntOQZqnjilagWe3M pjETyr3jS/RyPqfixcgcDvg= X-Google-Smtp-Source: ACHHUZ4FBwflGrFFYjYNCYAzAyBJY99qsAdoPf2uCzMYjlcj4Lp1AfSMQ3BwlsR14zq5zCM3V2Gwxg== X-Received: by 2002:a05:6a20:4309:b0:f4:c0d6:87c with SMTP id h9-20020a056a20430900b000f4c0d6087cmr202733pzk.14.1683254643632; Thu, 04 May 2023 19:44:03 -0700 (PDT) Received: from localhost ([203.59.190.92]) by smtp.gmail.com with ESMTPSA id n7-20020aa79047000000b00642ea56f06fsm435666pfo.0.2023.05.04.19.43.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 May 2023 19:44:02 -0700 (PDT) Mime-Version: 1.0 Date: Fri, 05 May 2023 12:43:49 +1000 Message-Id: Cc: "Sumit Garg" , "Mark Rutland" , "Matthias Kaehlcke" , "Stephane Eranian" , "Stephen Boyd" , , "Tzung-Bi Shih" , "Lecopzer Chen" , , "Masayoshi Mizuma" , "Guenter Roeck" , "Pingfan Liu" , "Andi Kleen" , "Ian Rogers" , , , , "Randy Dunlap" , "Chen-Yu Tsai" , , , , , "Will Deacon" , , , "Marc Zyngier" , "Catalin Marinas" , "Daniel Thompson" Subject: Re: [PATCH v4 01/17] watchdog/perf: Define dummy watchdog_update_hrtimer_threshold() on correct config From: "Nicholas Piggin" To: "Douglas Anderson" , "Petr Mladek" , "Andrew Morton" X-Mailer: aerc 0.14.0 References: <20230504221349.1535669-1-dianders@chromium.org> <20230504151100.v4.1.I8cbb2f4fa740528fcfade4f5439b6cdcdd059251@changeid> In-Reply-To: <20230504151100.v4.1.I8cbb2f4fa740528fcfade4f5439b6cdcdd059251@changeid> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230504_194405_039317_BADBA45C X-CRM114-Status: GOOD ( 21.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri May 5, 2023 at 8:13 AM AEST, Douglas Anderson wrote: > The real watchdog_update_hrtimer_threshold() is defined in > watchdog_hardlockup_perf.c. That file is included if In kernel/watchdog_hld.c. > CONFIG_HARDLOCKUP_DETECTOR_PERF and the function is defined in that > file if CONFIG_HARDLOCKUP_CHECK_TIMESTAMP. > > The dummy version of the function in "nmi.h" didn't get that quite > right. While this doesn't appear to be a huge deal, it's nice to make > it consistent. It doesn't break builds because CHECK_TIMESTAMP is only defined by x86 so others don't get a double definition, and x86 uses perf lockup detector, so it gets the out of line version. So has no functional change but should be fixed. Reviewed-by: Nicholas Piggin > > Fixes: 7edaeb6841df ("kernel/watchdog: Prevent false positives with turbo modes") > Signed-off-by: Douglas Anderson > --- > > Changes in v4: > - ("Define dummy watchdog_update_hrtimer_threshold() ...") new for v4. > > include/linux/nmi.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/nmi.h b/include/linux/nmi.h > index 048c0b9aa623..771d77b62bc1 100644 > --- a/include/linux/nmi.h > +++ b/include/linux/nmi.h > @@ -197,7 +197,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh); > #endif > > #if defined(CONFIG_HARDLOCKUP_CHECK_TIMESTAMP) && \ > - defined(CONFIG_HARDLOCKUP_DETECTOR) > + defined(CONFIG_HARDLOCKUP_DETECTOR_PERF) > void watchdog_update_hrtimer_threshold(u64 period); > #else > static inline void watchdog_update_hrtimer_threshold(u64 period) { } > -- > 2.40.1.521.gf1e218fcd8-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel