From 7e2b734bac96c22086fedd1b18135da06d5e4054 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Fri, 16 Apr 2021 13:30:23 +0200
Subject: dashboard/config/linux: support for v4.15 kernels

Add constraints for configs not present in v4.15.
I tentatively marked all of them as v4.16.
If we support something in between v4.15 and v5.4
in future we may need to refine them.
---
 dashboard/config/linux/bits/base.yml   | 13 ++++++++-----
 dashboard/config/linux/bits/debug.yml  |  9 +++++----
 dashboard/config/linux/bits/kasan.yml  |  4 ++--
 dashboard/config/linux/bits/x86_64.yml |  7 +++----
 4 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'dashboard/config/linux/bits')

diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 4d164d8bb..2198eff87 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -50,7 +50,7 @@ config:
  - HW_RANDOM_AMD: n
  - HW_RANDOM_VIA: n
  - RANDOM_TRUST_CPU: [-arm, -riscv]
- - RANDOM_TRUST_BOOTLOADER
+ - RANDOM_TRUST_BOOTLOADER: [v4.16]
 
  # For detection of supported syscalls
  - KALLSYMS
@@ -80,13 +80,14 @@ config:
  - HARDENED_USERCOPY_FALLBACK
  - BUG_ON_DATA_CORRUPTION
  - DEBUG_LIST
+ - DEBUG_STACKOVERFLOW: [-v5.0]
 
  # CONFIG_DEBUG_PI_LIST was renamed to CONFIG_DEBUG_PLIST in 8e18faeac3e4.
  - DEBUG_PLIST: [v5.2]
  - DEBUG_PI_LIST: [-v5.2]
 
  # CONFIG_REFCOUNT_FULL was removed in fb041bb7c0a9.
- - REFCOUNT_FULL: [-v5.5]
+ - REFCOUNT_FULL: [v4.16, -v5.5]
  # Added in 919067cc845f ("net: add CONFIG_PCPU_DEV_REFCNT") and should appear in v5.13.
  - PCPU_DEV_REFCNT: [n, linux-next]
 
@@ -97,7 +98,7 @@ config:
  - DEBUG_INFO_BTF
 
  # This should make behavior more deterministic.
- - INIT_ON_ALLOC_DEFAULT_ON
+ - INIT_ON_ALLOC_DEFAULT_ON: [v4.16]
 
  # KCOV slows down execution too much with KASAN_HW_TAGS and in qemu emulation in general.
  # KCOV crashes on Arm:
@@ -133,8 +134,8 @@ config:
  - UEVENT_HELPER_PATH: "/sbin/hotplug"
 
  # QEMU disk is usually on the generic PCI bus.
- - PCI_HOST_GENERIC
- - OF
+ - PCI_HOST_GENERIC: [v4.16]
+ - OF: [v4.16]
 
  # Options enabled to boot Debian Stretch.
  - CONFIGFS_FS
@@ -150,6 +151,8 @@ config:
 
  # Disable magic SysRq completely, as it can be reached over USB and through tty.
  - MAGIC_SYSRQ: n
+ # We don't need it and it enables MAGIC_SYSRQ and KPROBES.
+ - KGDB: n
 
  - RUNTIME_TESTING_MENU: n
 
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index b83eec837..012922e70 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -21,7 +21,7 @@ config:
  - DEBUG_SPINLOCK
  - DEBUG_MUTEXES
  - DEBUG_WW_MUTEX_SLOWPATH
- - DEBUG_RWSEMS
+ - DEBUG_RWSEMS: [v4.16]
  - DEBUG_IRQFLAGS: [v5.12]
 
  - DEBUG_VM
@@ -50,9 +50,10 @@ config:
  - DEBUG_OBJECTS_TIMERS
  - DEBUG_OBJECTS_WORK
  - DEBUG_OBJECTS_SELFTEST: n
- - SND_DEBUG: [-riscv, -s390]
- - SND_PCM_XRUN_DEBUG: [-riscv, -s390]
- - SND_CTL_VALIDATION: [v5.6, -riscv, -s390]
+ # Some base configs may not enable sound at all.
+ - SND_DEBUG: [-riscv, -s390, optional]
+ - SND_PCM_XRUN_DEBUG: [-riscv, -s390, optional]
+ - SND_CTL_VALIDATION: [v5.6, -riscv, -s390, optional]
  - DYNAMIC_DEBUG
  - DEBUG_PER_CPU_MAPS
  - DEBUG_SG
diff --git a/dashboard/config/linux/bits/kasan.yml b/dashboard/config/linux/bits/kasan.yml
index 91557d722..8bc491f05 100644
--- a/dashboard/config/linux/bits/kasan.yml
+++ b/dashboard/config/linux/bits/kasan.yml
@@ -3,9 +3,9 @@
 
 config:
  - KASAN
- - KASAN_GENERIC
+ - KASAN_GENERIC: [v4.16]
  - KASAN_INLINE: [-arm]
- - KASAN_STACK_ENABLE: [clang, -v5.11]
+ - KASAN_STACK_ENABLE: [clang, v4.16, -v5.11]
  - KASAN_STACK: [clang, v5.11]
  - KASAN_VMALLOC: [v5.5, -arm, -arm64, -s390, -riscv]
  # This was historically enabled in the KASAN section without explanation.
diff --git a/dashboard/config/linux/bits/x86_64.yml b/dashboard/config/linux/bits/x86_64.yml
index 22263e34d..399f97e27 100644
--- a/dashboard/config/linux/bits/x86_64.yml
+++ b/dashboard/config/linux/bits/x86_64.yml
@@ -2,8 +2,7 @@
 # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 shell:
- # android-5.4.yml has own defconfig.
- - make x86_64_defconfig: [-android, -chromeos]
+ - make x86_64_defconfig: [-nodefconfig]
  - make kvm_guest.config
 
 config:
@@ -73,8 +72,8 @@ config:
  - E1000
 
  - X86_ACPI_CPUFREQ
- - CPU_IDLE_GOV_HALTPOLL
- - X86_INTEL_TSX_MODE_ON
+ - CPU_IDLE_GOV_HALTPOLL: [v4.16]
+ - X86_INTEL_TSX_MODE_ON: [v4.16]
  - INTEL_IDLE
  - LEGACY_VSYSCALL_EMULATE
  - EFI: n
-- 
cgit mrf-deployment