From 9314348adf7605682d49192fa6487aac93f5782b Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Thu, 26 Sep 2024 10:40:20 +0200 Subject: [PATCH] dashboard: disable CONFIG_KCOV_SELFTEST The kernel is not able to pass the test at the moment. See: https://lore.kernel.org/all/66eb52dc.050a0220.92ef1.0006.GAE@google.com/T/ --- dashboard/config/linux/bits/base.yml | 5 ++++- dashboard/config/linux/upstream-apparmor-kasan.config | 2 +- dashboard/config/linux/upstream-arm64-kasan_sw-kcov.config | 2 +- dashboard/config/linux/upstream-kasan-badwrites.config | 2 +- dashboard/config/linux/upstream-kmsan-next.config | 2 +- dashboard/config/linux/upstream-selinux-kasan.config | 2 +- dashboard/config/linux/upstream-smack-kasan.config | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml index 6fcfcebe266c..49289817c181 100644 --- a/dashboard/config/linux/bits/base.yml +++ b/dashboard/config/linux/bits/base.yml @@ -131,7 +131,10 @@ config: - KCOV_INSTRUMENT_ALL: [-arm, -s390, -nokcov] # Doesn't boot with KCOV_ENABLE_COMPARISONS on Cuttlefish. - KCOV_ENABLE_COMPARISONS: [-arm, -s390, -nokcov, -cuttlefish] - - KCOV_SELFTEST: [linux-next, -baseline, -arm, -s390, -nokcov] + # As of Sep 2024, the test does not pass (at least) on gcc-built kernels. + # https://lore.kernel.org/all/66eb52dc.050a0220.92ef1.0006.GAE@google.com/T/ + # TODO: re-enable the option once the problem is addressed. + - KCOV_SELFTEST: n - DEBUG_FS # Required for KCOV but also eliminates unnecessary non-determinism. diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config index 5291efd94dd5..350763fce600 100644 --- a/dashboard/config/linux/upstream-apparmor-kasan.config +++ b/dashboard/config/linux/upstream-apparmor-kasan.config @@ -9881,7 +9881,7 @@ CONFIG_KCOV=y CONFIG_KCOV_ENABLE_COMPARISONS=y CONFIG_KCOV_INSTRUMENT_ALL=y CONFIG_KCOV_IRQ_AREA_SIZE=0x40000 -CONFIG_KCOV_SELFTEST=y +# CONFIG_KCOV_SELFTEST is not set CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_LKDTM is not set diff --git a/dashboard/config/linux/upstream-arm64-kasan_sw-kcov.config b/dashboard/config/linux/upstream-arm64-kasan_sw-kcov.config index 8ac804b23f42..1fe8929027cf 100644 --- a/dashboard/config/linux/upstream-arm64-kasan_sw-kcov.config +++ b/dashboard/config/linux/upstream-arm64-kasan_sw-kcov.config @@ -7543,7 +7543,7 @@ CONFIG_KCOV=y CONFIG_KCOV_ENABLE_COMPARISONS=y CONFIG_KCOV_INSTRUMENT_ALL=y CONFIG_KCOV_IRQ_AREA_SIZE=0x40000 -CONFIG_KCOV_SELFTEST=y +# CONFIG_KCOV_SELFTEST is not set CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_LKDTM is not set diff --git a/dashboard/config/linux/upstream-kasan-badwrites.config b/dashboard/config/linux/upstream-kasan-badwrites.config index 00d31e5fb9ba..28ee4e568b18 100644 --- a/dashboard/config/linux/upstream-kasan-badwrites.config +++ b/dashboard/config/linux/upstream-kasan-badwrites.config @@ -9883,7 +9883,7 @@ CONFIG_KCOV=y CONFIG_KCOV_ENABLE_COMPARISONS=y CONFIG_KCOV_INSTRUMENT_ALL=y CONFIG_KCOV_IRQ_AREA_SIZE=0x40000 -CONFIG_KCOV_SELFTEST=y +# CONFIG_KCOV_SELFTEST is not set CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_LKDTM is not set diff --git a/dashboard/config/linux/upstream-kmsan-next.config b/dashboard/config/linux/upstream-kmsan-next.config index e215b4e3d141..009f2c2f7621 100644 --- a/dashboard/config/linux/upstream-kmsan-next.config +++ b/dashboard/config/linux/upstream-kmsan-next.config @@ -9570,7 +9570,7 @@ CONFIG_KCOV=y CONFIG_KCOV_ENABLE_COMPARISONS=y CONFIG_KCOV_INSTRUMENT_ALL=y CONFIG_KCOV_IRQ_AREA_SIZE=0x40000 -CONFIG_KCOV_SELFTEST=y +# CONFIG_KCOV_SELFTEST is not set CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_LKDTM is not set diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config index d0111e2dc9e1..7d4289c777b6 100644 --- a/dashboard/config/linux/upstream-selinux-kasan.config +++ b/dashboard/config/linux/upstream-selinux-kasan.config @@ -9882,7 +9882,7 @@ CONFIG_KCOV=y CONFIG_KCOV_ENABLE_COMPARISONS=y CONFIG_KCOV_INSTRUMENT_ALL=y CONFIG_KCOV_IRQ_AREA_SIZE=0x40000 -CONFIG_KCOV_SELFTEST=y +# CONFIG_KCOV_SELFTEST is not set CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_LKDTM is not set diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config index 4cf6a462fab3..6b48c074fe17 100644 --- a/dashboard/config/linux/upstream-smack-kasan.config +++ b/dashboard/config/linux/upstream-smack-kasan.config @@ -9874,7 +9874,7 @@ CONFIG_KCOV=y CONFIG_KCOV_ENABLE_COMPARISONS=y CONFIG_KCOV_INSTRUMENT_ALL=y CONFIG_KCOV_IRQ_AREA_SIZE=0x40000 -CONFIG_KCOV_SELFTEST=y +# CONFIG_KCOV_SELFTEST is not set CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_LKDTM is not set