From caa359ddd2e28812df24e1d670cd9de615fcf72a Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 11 Mar 2021 19:29:37 +0100 Subject: dashboard/config: enable DEBUG_TIMEKEEPING and FW_LOADER DEBUG_TIMEKEEPING enables some debug checks. FW_LOADER_USER_HELPER was enabled on arm/android but not on x86_64. --- dashboard/config/linux/bits/debug.yml | 1 + dashboard/config/linux/bits/subsystems.yml | 5 ++++- dashboard/config/linux/chromeos-5.4-base.config | 2 +- dashboard/config/linux/chromeos-5.4.config | 2 +- dashboard/config/linux/stable-5.4-kasan-base.config | 2 +- dashboard/config/linux/stable-5.4-kasan.config | 8 +++++--- dashboard/config/linux/upstream-apparmor-kasan-base.config | 2 +- dashboard/config/linux/upstream-apparmor-kasan.config | 10 ++++++---- dashboard/config/linux/upstream-arm-kasan-base.config | 2 +- dashboard/config/linux/upstream-arm-kasan.config | 10 ++++++---- dashboard/config/linux/upstream-arm64-kasan-base.config | 2 +- dashboard/config/linux/upstream-arm64-kasan.config | 6 +++--- dashboard/config/linux/upstream-arm64-mte.config | 4 ++-- dashboard/config/linux/upstream-kcsan.config | 8 +++++--- dashboard/config/linux/upstream-kmsan.config | 8 +++++--- dashboard/config/linux/upstream-leak.config | 8 +++++--- dashboard/config/linux/upstream-riscv64-kasan.config | 6 ++++-- dashboard/config/linux/upstream-s390-kasan.config | 6 ++++-- dashboard/config/linux/upstream-selinux-kasan-base.config | 2 +- dashboard/config/linux/upstream-selinux-kasan.config | 10 ++++++---- dashboard/config/linux/upstream-smack-kasan-base.config | 2 +- dashboard/config/linux/upstream-smack-kasan.config | 10 ++++++---- dashboard/config/linux/upstream-usb-base.config | 2 +- dashboard/config/linux/upstream-usb.config | 2 +- 24 files changed, 72 insertions(+), 48 deletions(-) (limited to 'dashboard') diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml index fec331847..a5521b626 100644 --- a/dashboard/config/linux/bits/debug.yml +++ b/dashboard/config/linux/bits/debug.yml @@ -37,6 +37,7 @@ config: - DEBUG_MEMORY_INIT - DEBUG_NOTIFIERS - DEBUG_CREDENTIALS + - DEBUG_TIMEKEEPING - DEBUG_OBJECTS - DEBUG_OBJECTS_ENABLE_DEFAULT: 1 - DEBUG_OBJECTS_FREE diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml index 176fdc7c5..2d6692023 100644 --- a/dashboard/config/linux/bits/subsystems.yml +++ b/dashboard/config/linux/bits/subsystems.yml @@ -651,7 +651,10 @@ config: - PCIEAER - HOTPLUG_PCI - PCI_ENDPOINT - - FW_CACHE: n + - FW_LOADER_USER_HELPER + - FW_LOADER_USER_HELPER_FALLBACK + - FW_LOADER_COMPRESS + - FW_CACHE: [v5.10, -riscv, -s390] - CONNECTOR - MTD - MTD_BLOCK diff --git a/dashboard/config/linux/chromeos-5.4-base.config b/dashboard/config/linux/chromeos-5.4-base.config index b5c13ddac..b26c19d1b 100644 --- a/dashboard/config/linux/chromeos-5.4-base.config +++ b/dashboard/config/linux/chromeos-5.4-base.config @@ -6693,7 +6693,7 @@ CONFIG_PANIC_TIMEOUT=86400 CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/chromeos-5.4.config b/dashboard/config/linux/chromeos-5.4.config index 642e2225f..473d38922 100644 --- a/dashboard/config/linux/chromeos-5.4.config +++ b/dashboard/config/linux/chromeos-5.4.config @@ -6740,7 +6740,7 @@ CONFIG_PANIC_TIMEOUT=86400 CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/stable-5.4-kasan-base.config b/dashboard/config/linux/stable-5.4-kasan-base.config index 66d5df366..4d5b8bfb8 100644 --- a/dashboard/config/linux/stable-5.4-kasan-base.config +++ b/dashboard/config/linux/stable-5.4-kasan-base.config @@ -4851,7 +4851,7 @@ CONFIG_PANIC_TIMEOUT=86400 CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y # # Lock Debugging (spinlocks, mutexes, etc...) diff --git a/dashboard/config/linux/stable-5.4-kasan.config b/dashboard/config/linux/stable-5.4-kasan.config index ae6c433eb..caa16def9 100644 --- a/dashboard/config/linux/stable-5.4-kasan.config +++ b/dashboard/config/linux/stable-5.4-kasan.config @@ -2039,9 +2039,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y @@ -7985,7 +7987,7 @@ CONFIG_PANIC_TIMEOUT=86400 CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/upstream-apparmor-kasan-base.config b/dashboard/config/linux/upstream-apparmor-kasan-base.config index 5773e3566..d56bdfb95 100644 --- a/dashboard/config/linux/upstream-apparmor-kasan-base.config +++ b/dashboard/config/linux/upstream-apparmor-kasan-base.config @@ -5017,7 +5017,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y # # Lock Debugging (spinlocks, mutexes, etc...) diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config index b3bc1217c..47d7d0bf1 100644 --- a/dashboard/config/linux/upstream-apparmor-kasan.config +++ b/dashboard/config/linux/upstream-apparmor-kasan.config @@ -2126,10 +2126,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y @@ -8422,7 +8424,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/upstream-arm-kasan-base.config b/dashboard/config/linux/upstream-arm-kasan-base.config index d0d516443..4c97cd5cf 100644 --- a/dashboard/config/linux/upstream-arm-kasan-base.config +++ b/dashboard/config/linux/upstream-arm-kasan-base.config @@ -4210,7 +4210,7 @@ CONFIG_WQ_WATCHDOG=y # CONFIG_SCHEDSTATS is not set # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y # # Lock Debugging (spinlocks, mutexes, etc...) diff --git a/dashboard/config/linux/upstream-arm-kasan.config b/dashboard/config/linux/upstream-arm-kasan.config index 443437555..6ea9e89de 100644 --- a/dashboard/config/linux/upstream-arm-kasan.config +++ b/dashboard/config/linux/upstream-arm-kasan.config @@ -1977,10 +1977,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y @@ -8052,7 +8054,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/upstream-arm64-kasan-base.config b/dashboard/config/linux/upstream-arm64-kasan-base.config index 3a1d99c79..6513dbeb0 100644 --- a/dashboard/config/linux/upstream-arm64-kasan-base.config +++ b/dashboard/config/linux/upstream-arm64-kasan-base.config @@ -6138,7 +6138,7 @@ CONFIG_SCHED_INFO=y # CONFIG_SCHEDSTATS is not set # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/upstream-arm64-kasan.config b/dashboard/config/linux/upstream-arm64-kasan.config index d2f5726e0..88a6f6482 100644 --- a/dashboard/config/linux/upstream-arm64-kasan.config +++ b/dashboard/config/linux/upstream-arm64-kasan.config @@ -2072,8 +2072,8 @@ CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y @@ -7041,7 +7041,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/upstream-arm64-mte.config b/dashboard/config/linux/upstream-arm64-mte.config index e6bcbd1c7..4d8c08a77 100644 --- a/dashboard/config/linux/upstream-arm64-mte.config +++ b/dashboard/config/linux/upstream-arm64-mte.config @@ -2069,8 +2069,8 @@ CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config index e61a5c137..27c446459 100644 --- a/dashboard/config/linux/upstream-kcsan.config +++ b/dashboard/config/linux/upstream-kcsan.config @@ -2124,10 +2124,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config index f7df65687..0161b0c99 100644 --- a/dashboard/config/linux/upstream-kmsan.config +++ b/dashboard/config/linux/upstream-kmsan.config @@ -2096,10 +2096,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config index 8d609156f..999dfa09b 100644 --- a/dashboard/config/linux/upstream-leak.config +++ b/dashboard/config/linux/upstream-leak.config @@ -2123,10 +2123,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y diff --git a/dashboard/config/linux/upstream-riscv64-kasan.config b/dashboard/config/linux/upstream-riscv64-kasan.config index ab31562f3..0e3e9d16d 100644 --- a/dashboard/config/linux/upstream-riscv64-kasan.config +++ b/dashboard/config/linux/upstream-riscv64-kasan.config @@ -1634,9 +1634,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y diff --git a/dashboard/config/linux/upstream-s390-kasan.config b/dashboard/config/linux/upstream-s390-kasan.config index 9f86e4b67..9013f7462 100644 --- a/dashboard/config/linux/upstream-s390-kasan.config +++ b/dashboard/config/linux/upstream-s390-kasan.config @@ -1673,9 +1673,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y # end of Firmware loader CONFIG_ALLOW_DEV_COREDUMP=y diff --git a/dashboard/config/linux/upstream-selinux-kasan-base.config b/dashboard/config/linux/upstream-selinux-kasan-base.config index f1c2112e7..5add032ad 100644 --- a/dashboard/config/linux/upstream-selinux-kasan-base.config +++ b/dashboard/config/linux/upstream-selinux-kasan-base.config @@ -5016,7 +5016,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y # # Lock Debugging (spinlocks, mutexes, etc...) diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config index 0f60f1884..9474f4ddb 100644 --- a/dashboard/config/linux/upstream-selinux-kasan.config +++ b/dashboard/config/linux/upstream-selinux-kasan.config @@ -2120,10 +2120,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y @@ -8418,7 +8420,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/upstream-smack-kasan-base.config b/dashboard/config/linux/upstream-smack-kasan-base.config index 9b720b696..b2591b6f4 100644 --- a/dashboard/config/linux/upstream-smack-kasan-base.config +++ b/dashboard/config/linux/upstream-smack-kasan-base.config @@ -5025,7 +5025,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y # # Lock Debugging (spinlocks, mutexes, etc...) diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config index 3c8bc869c..72bbcb76c 100644 --- a/dashboard/config/linux/upstream-smack-kasan.config +++ b/dashboard/config/linux/upstream-smack-kasan.config @@ -2127,10 +2127,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set -# CONFIG_FW_CACHE is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y # end of Firmware loader CONFIG_WANT_DEV_COREDUMP=y @@ -8430,7 +8432,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_PREEMPT=y # diff --git a/dashboard/config/linux/upstream-usb-base.config b/dashboard/config/linux/upstream-usb-base.config index 60c7a450e..6bc7b22fe 100644 --- a/dashboard/config/linux/upstream-usb-base.config +++ b/dashboard/config/linux/upstream-usb-base.config @@ -5063,7 +5063,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y # # Lock Debugging (spinlocks, mutexes, etc...) diff --git a/dashboard/config/linux/upstream-usb.config b/dashboard/config/linux/upstream-usb.config index a516c20a9..bfeaa042a 100644 --- a/dashboard/config/linux/upstream-usb.config +++ b/dashboard/config/linux/upstream-usb.config @@ -7526,7 +7526,7 @@ CONFIG_SCHED_INFO=y CONFIG_SCHEDSTATS=y # end of Scheduler Debugging -# CONFIG_DEBUG_TIMEKEEPING is not set +CONFIG_DEBUG_TIMEKEEPING=y # # Lock Debugging (spinlocks, mutexes, etc...) -- cgit mrf-deployment