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 EE1CEC77B75 for ; Mon, 22 May 2023 11:49:55 +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:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3XsYAAduEwuhGR3wVf6smXWyND4TzAggPwEZ8UUxovM=; b=yps1AD9IHiDupz 4z1817bkWCyLO0kLa27OPDAufBy748MdZ6pssuplsKQaDIybOs7rUAbmfjTTHpzNfV8tR9oA7arfI yhU6qoxMEM36gqR+3uP/8kDcEhmAq2M3B5GlbwnAgXJKUHEH5cibenTTeyZboBOyImUR024b3y2/E um/rXD+rHuN7hsO1lITRMk80KmfvZewfxKDLjrB+gTcHCS3n1SYBXCInW+B2pq8ZUa8ATOJi6CvrA tpHmWbQECTrTB/cGrIYI35pNc66BdRwCKtOQau+RZxTkVJfPxTtr1Ur2Z3BfL4L7FjMpaq9/x+qB9 s1CQ6F6K9w6VnNmxMj4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q142f-006JcM-2l; Mon, 22 May 2023 11:49:33 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q142c-006JbT-1i for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2023 11:49:32 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7583661EBF; Mon, 22 May 2023 11:49:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AADAC4339B; Mon, 22 May 2023 11:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684756168; bh=09RSAK353TjlZgFkK3E0PRiLI2ExOq5xZFRF9Hx0UP4=; h=From:To:Cc:Subject:Date:From; b=c0KqqmNuYsyt4bX1BLvfXqWPZCcBjtdh5HqKH68YbaY3HI4wEBOj7i0vTaevkB2Zf 1MUuJOSzE95fw9E4IITgFHNfrUIV9jQ5R8tHCZak380ujmsa4BkNrnItvev24qZu8o yzQnEOpXEGXdTEuzWCFKqW0IyzoyXLmYGbsSUke1f5qghWfmPEtciIxciOfV+9476M zwW/0syTWrRo7saMFxsm5FELZdvqbMKqwFOgBxIRFDz3ED5oGE/T807hXFO/8fYzGT kb+nyc89Ci19CXWtC/qQdnG9/ERmvnEEAJBVLxfcHl1PTEXAoJvhVktaGsEmzFy4AU BK7+3DASuOMmQ== From: Arnd Bergmann To: Andrew Morton , Douglas Anderson Cc: Arnd Bergmann , Catalin Marinas , Will Deacon , Mark Rutland , Pingfan Liu , Sumit Garg , Lecopzer Chen , Petr Mladek , Anshuman Khandual , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: watchdog_hld: provide arm_pmu_irq_is_nmi stub Date: Mon, 22 May 2023 13:48:19 +0200 Message-Id: <20230522114922.1052421-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_044930_647889_A65D664C X-CRM114-Status: GOOD ( 20.36 ) 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 From: Arnd Bergmann The newly added arch_perf_nmi_is_available() function fails to build when CONFIG_ARM_PMU is disabled: arch/arm64/kernel/watchdog_hld.c: In function 'arch_perf_nmi_is_available': arch/arm64/kernel/watchdog_hld.c:35:16: error: implicit declaration of function 'arm_pmu_irq_is_nmi' [-Werror=implicit-function-declaration] 35 | return arm_pmu_irq_is_nmi(); As it turns out, there is only one caller for that function anyway, in the same file as the __weak definition, and this can only be called if CONFIG_ARM_PMU is also enabled. I tried a number of variants, but everything ended up with more complexity from having both the __weak function and one or more added #ifdef. Keeping it in watchdog_perf.c is a small layering violation but otherwise the most robust. Fixes: 7e61b33831bc ("arm64: enable perf events based hard lockup detector") Signed-off-by: Arnd Bergmann --- --- arch/arm64/kernel/watchdog_hld.c | 10 ---------- include/linux/nmi.h | 1 - include/linux/perf/arm_pmu.h | 7 ++++--- kernel/watchdog_perf.c | 11 ++++++++++- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/arch/arm64/kernel/watchdog_hld.c b/arch/arm64/kernel/watchdog_hld.c index dcd25322127c..3d948e5c1c1e 100644 --- a/arch/arm64/kernel/watchdog_hld.c +++ b/arch/arm64/kernel/watchdog_hld.c @@ -24,13 +24,3 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh) return (u64)max_cpu_freq * watchdog_thresh; } - -bool __init arch_perf_nmi_is_available(void) -{ - /* - * hardlockup_detector_perf_init() will success even if Pseudo-NMI turns off, - * however, the pmu interrupts will act like a normal interrupt instead of - * NMI and the hardlockup detector would be broken. - */ - return arm_pmu_irq_is_nmi(); -} diff --git a/include/linux/nmi.h b/include/linux/nmi.h index d23902a2fd49..1fabf8c35d27 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -212,7 +212,6 @@ static inline bool trigger_single_cpu_backtrace(int cpu) #ifdef CONFIG_HARDLOCKUP_DETECTOR_PERF u64 hw_nmi_get_sample_period(int watchdog_thresh); -bool arch_perf_nmi_is_available(void); #endif #if defined(CONFIG_HARDLOCKUP_CHECK_TIMESTAMP) && \ diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index 5b00f5cb4cf9..cbdd3533d843 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -12,10 +12,11 @@ #include #include #include -#include #ifdef CONFIG_ARM_PMU +#include + /* * The ARMv7 CPU PMU supports up to 32 event counters. */ @@ -171,8 +172,6 @@ void kvm_host_pmu_init(struct arm_pmu *pmu); #define kvm_host_pmu_init(x) do { } while(0) #endif -bool arm_pmu_irq_is_nmi(void); - /* Internal functions only for core arm_pmu code */ struct arm_pmu *armpmu_alloc(void); void armpmu_free(struct arm_pmu *pmu); @@ -184,6 +183,8 @@ void armpmu_free_irq(int irq, int cpu); #endif /* CONFIG_ARM_PMU */ +bool arm_pmu_irq_is_nmi(void); + #define ARMV8_SPE_PDEV_NAME "arm,spe-v1" #endif /* __ARM_PMU_H__ */ diff --git a/kernel/watchdog_perf.c b/kernel/watchdog_perf.c index 8ea00c4a24b2..ee7d3dcfdda2 100644 --- a/kernel/watchdog_perf.c +++ b/kernel/watchdog_perf.c @@ -19,6 +19,7 @@ #include #include +#include static DEFINE_PER_CPU(struct perf_event *, watchdog_ev); static DEFINE_PER_CPU(struct perf_event *, dead_event); @@ -234,8 +235,16 @@ void __init hardlockup_detector_perf_restart(void) } } -bool __weak __init arch_perf_nmi_is_available(void) +static bool __init arch_perf_nmi_is_available(void) { + /* + * hardlockup_detector_perf_init() will success even if Pseudo-NMI turns off, + * however, the pmu interrupts will act like a normal interrupt instead of + * NMI and the hardlockup detector would be broken. + */ + if (IS_ENABLED(CONFIG_ARM_PMU)) + return arm_pmu_irq_is_nmi(); + return true; } -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel