Commit 5cc820c1 authored by Jinjie Ruan's avatar Jinjie Ruan
Browse files

arm64: Enable hardware NMI for perf events NMI 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CQGL



--------------------------------

Like pseudo NMI, also select HAVE_PERF_EVENTS_NMI for hardware NMI, and
update the comment for arch_perf_nmi_is_available().

Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
parent cd428475

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ config ARM64 
	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI

	select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI || ARM64_NMI

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_PREEMPT_DYNAMIC_KEY

arch/arm64/kernel/watchdog_hld.c

+4 −3
Original line number Diff line number Diff line
@@ -28,9 +28,10 @@ u64 hw_nmi_get_sample_period(int 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.

	 * hardlockup_detector_perf_init() will success even if Pseudo-NMI or

	 * Hardware 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();

}