From fac35f5c42f25b63bcbbcd027f8266ed14019461 Mon Sep 17 00:00:00 2001 From: Wei Li Date: Tue, 23 Feb 2021 20:16:38 +0800 Subject: [PATCH] openeuler_defconfig: Enable NMI watchdog hulk inclusion category: feature bugzilla: 49592 CVE: NA ------------------------------------------------- Enable the config of sdei_watchdog and pmu_watchdog. Signed-off-by: Wei Li Reviewed-by: Hanjun Guo Signed-off-by: Zheng Zengkai --- arch/arm64/configs/openeuler_defconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 89d83600c409..95c22cac92ab 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -733,6 +733,10 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HAVE_NMI_WATCHDOG=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y @@ -6932,6 +6936,18 @@ CONFIG_LOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_HARDLOCKUP_DETECTOR_PERF=y + +# +# ARM64 NMI watchdog configuration +# +CONFIG_SDEI_WATCHDOG=y +CONFIG_PMU_WATCHDOG=y +# end of ARM64 NMI watchdog configuration + +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -- GitLab