From 78b7fb432ac1cde9a9575c2576f4a57e2ef6d26a Mon Sep 17 00:00:00 2001 From: John Stultz Date: Wed, 13 Sep 2023 19:23:33 +0000 Subject: [PATCH] ANDROID: gki_defconfig: Enable CONFIG_PROVE_LOCKING for android-mainline This patch enables CONFIG_PROVE_LOCKING in android-mainline in order to raise awareness in early device development of lockdep warnings. Lockdep is a very useful debug tool to find locking problems, before they are actually hit. However it can only find one issue at a time (it disables itself after it trips a warning). Thus if folks ignore lockdep warnings in one area of code, it makes the tool unusable to find real locking problems in other areas of code. Additionally, having it enabled in android-mainline can ensure we catch and report upstream lockdep regressions quickly without doubling our config testing matrix. So while this should be disabled for android-LTS branches, lets turn it on for android-mainline. Bug: 300341704 Change-Id: I6466774ca8dd7d2bbbb100e77255a83db5472fec Signed-off-by: John Stultz --- arch/arm64/configs/gki_defconfig | 3 ++- arch/riscv/configs/gki_defconfig | 3 ++- arch/x86/configs/gki_defconfig | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index a7b0baaf776c..961121f33ee3 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -38,7 +38,6 @@ CONFIG_NAMESPACES=y CONFIG_BOOT_CONFIG=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set -CONFIG_KALLSYMS_ALL=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y CONFIG_PROFILING=y @@ -444,6 +443,7 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_DRM=y +# CONFIG_DRM_DEBUG_MODESET_LOCK is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y @@ -699,6 +699,7 @@ CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y +CONFIG_PROVE_LOCKING=y CONFIG_HIST_TRIGGERS=y CONFIG_PID_IN_CONTEXTIDR=y CONFIG_KUNIT=y diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig index a56889b8a411..92fa0335b03d 100644 --- a/arch/riscv/configs/gki_defconfig +++ b/arch/riscv/configs/gki_defconfig @@ -37,7 +37,6 @@ CONFIG_NAMESPACES=y CONFIG_BOOT_CONFIG=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set -CONFIG_KALLSYMS_ALL=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y CONFIG_PROFILING=y @@ -400,6 +399,7 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_DRM=y +# CONFIG_DRM_DEBUG_MODESET_LOCK is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y @@ -641,6 +641,7 @@ CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y +CONFIG_PROVE_LOCKING=y CONFIG_SYNTH_EVENTS=y CONFIG_KUNIT=y CONFIG_KUNIT_DEBUGFS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 7ac1ac627ce8..e3fe018459c0 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -43,7 +43,6 @@ CONFIG_BOOT_CONFIG=y # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set # CONFIG_PCSPKR_PLATFORM is not set -CONFIG_KALLSYMS_ALL=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y CONFIG_PROFILING=y @@ -413,6 +412,7 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_DRM=y +# CONFIG_DRM_DEBUG_MODESET_LOCK is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y @@ -649,6 +649,7 @@ CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y +CONFIG_PROVE_LOCKING=y CONFIG_HIST_TRIGGERS=y CONFIG_UNWINDER_FRAME_POINTER=y CONFIG_KUNIT=y