From 1b468f8eea44b48ff117154a893bd58bdf7abeb8 Mon Sep 17 00:00:00 2001 From: Vinayak Menon Date: Mon, 30 Nov 2020 10:19:36 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Enable CONFIG_PAGE_OWNER This helps enable the page owner feature at runtime via kernel param, and helps in memory accouting and leak debugging. Enabling just this config does not incur any significant overhead. Explicit CONFIG_DEBUG_FS=y is removed because CONFIG_PAGE_OWNER enables it implicitly. Bug: 171354330 Change-Id: I45416805c8e651af442f51ffe9aa46b21e7d3f13 Signed-off-by: Vinayak Menon Signed-off-by: Suren Baghdasaryan --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 6c33676e55c4..ab4196d4a458 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -601,7 +601,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y +CONFIG_PAGE_OWNER=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KASAN=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 8c11a0f2b122..a0f65a2afaba 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -50,6 +50,8 @@ CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y CONFIG_NR_CPUS=32 CONFIG_EFI=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="stack_depot_disable=on" CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set @@ -543,7 +545,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y +CONFIG_PAGE_OWNER=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KFENCE=y