From 15d55f1f0a219ebd96c59a8f5e51477e8f9a3a64 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Thu, 29 Apr 2021 15:28:03 +0200 Subject: [PATCH] Revert "ANDROID: gki_defconfig: temporarily disable KFENCE in GKI" This reverts commit ef4ff626b3921e7a4cd371884507e231e9c6e6db. Picking "kfence: await for allocation using wait_event" resulted in KFENCE spinning no more in toggle_allocation_gate(), which reportedly fixed the power regression. Bug: 185280916 Test: power team confirmed there's no regression Signed-off-by: Alexander Potapenko Change-Id: I65d4206ff9199b06c879e506fd38129df50b393e --- 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 b3a6b97bec0d..9aa4e25c605e 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -643,7 +643,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_KFENCE_NUM_OBJECTS=63 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index e0617c26c2ad..a23e45d77f80 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -581,7 +581,7 @@ CONFIG_PAGE_PINNER=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_KFENCE_NUM_OBJECTS=63 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1