From a7f3a36529f1b48527e15cbd38ddfec952561936 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Thu, 18 Mar 2021 13:22:11 +0100 Subject: [PATCH] ANDROID: GKI: enable KFENCE by setting the sample interval to 500ms This change effectively enables KFENCE in GKI kernels with a sample interval of 500ms. It is still possible to disable KFENCE at boot time using kfence.sample_interval=0. Bug: 176228452 Test: kernel builds, device boots normally Test: TreeHugger Signed-off-by: Alexander Potapenko Change-Id: I69cb0fc8fdebba36c9166b275ad245240314d811 --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 997fb23db548..02199e267fa3 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -626,7 +626,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KASAN=y CONFIG_KASAN_HW_TAGS=y CONFIG_KFENCE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 CONFIG_WQ_WATCHDOG=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 1e7481abcca1..7586acb562aa 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -569,7 +569,7 @@ CONFIG_PAGE_OWNER=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KFENCE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 CONFIG_WQ_WATCHDOG=y