From 08c53911c56072b6927298318f0930c9ddf3ded8 Mon Sep 17 00:00:00 2001 From: David Keitel Date: Tue, 21 Oct 2014 13:51:14 -0700 Subject: [PATCH] defconfig: 8994: enable CONFIG_DEBUG_SLUB_PANIC_ON Add the DEBUG_SLUB_PANIC_ON option to KCONFIG preventing the existing defconfig option from being overwritten by make config. This will induce a panic if slab debug catches corruptions within the padding of a given object. The intention here is to induce collection of data immediately after the corruption is detected with the goal to catch the possible source of the corruption. Change-Id: Ide0102d0761022c643a761989360ae5c853870a8 Signed-off-by: David Keitel --- arch/arm64/configs/msm8994_defconfig | 2 +- mm/Kconfig.debug | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/msm8994_defconfig b/arch/arm64/configs/msm8994_defconfig index 3bee7e0eb33d..6686fc44659b 100644 --- a/arch/arm64/configs/msm8994_defconfig +++ b/arch/arm64/configs/msm8994_defconfig @@ -539,7 +539,6 @@ CONFIG_DEBUG_OBJECTS_WORK=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=y CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y CONFIG_SLUB_DEBUG_ON=y -CONFIG_SLUB_DEBUG_PANIC_ON=y CONFIG_DEBUG_KMEMLEAK=y CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=4000 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y @@ -554,6 +553,7 @@ CONFIG_FAULT_INJECTION=y CONFIG_FAIL_PAGE_ALLOC=y CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y +CONFIG_SLUB_DEBUG_PANIC_ON=y CONFIG_MSM_RTB=y CONFIG_MSM_RTB_SEPARATE_CPUS=y CONFIG_IPC_LOGGING=y diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug index 4b2443254de2..37d4513b4c63 100644 --- a/mm/Kconfig.debug +++ b/mm/Kconfig.debug @@ -17,6 +17,16 @@ config DEBUG_PAGEALLOC that would result in incorrect warnings of memory corruption after a resume because free pages are not saved to the suspend image. +config SLUB_DEBUG_PANIC_ON + bool "Enable to Panic on SLUB corruption detection" + depends on SLUB_DEBUG + help + SLUB has a resiliency feature enabled which restores bytes in + order for production environments to continue to operate. IN + debug options this may not be desirable as it prevents from + investigating the root cause which may be rooted within cache + or memory. + config WANT_PAGE_DEBUG_FLAGS bool