Unverified Commit c1283078 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5653 arm64: Enable hardware NMI for perf events NMI 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjie Ruan <ruanjinjie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4HX7Y2IF456PMGOKXTJ24SW72CPFGAXV/ 
 
https://gitee.com/openeuler/kernel/issues/I9CQGL 
 
Link:https://gitee.com/openeuler/kernel/pulls/5653

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 4d290fbb 5cc820c1

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

}