aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2024-07-10 09:29:19 +0200
committerAlexander Potapenko <glider@google.com>2024-07-10 08:59:16 +0000
commit9e136b95503a540d35e7bace3e89b77f13a672b1 (patch)
tree171240129d28ac49909bb616b8ccecf7aec180a8 /dashboard/config/linux
parentbc144f9a58782daa2399d417b56aad80e82a219e (diff)
dashboard/config: enable LRU_GEN for most instances
It's not the default for most kernels, so it makes sense to test it more. E.g. for KCSAN, KMSAN we have only 1 instance, makes sense to test LRU_GEN.
Diffstat (limited to 'dashboard/config/linux')
-rw-r--r--dashboard/config/linux/bits/base.yml8
-rw-r--r--dashboard/config/linux/bits/subsystems.yml8
-rw-r--r--dashboard/config/linux/stable-6.1-arm64-kasan-base.config4
-rw-r--r--dashboard/config/linux/stable-6.1-kasan-base.config4
-rw-r--r--dashboard/config/linux/upstream-apparmor-kasan-base.config5
-rw-r--r--dashboard/config/linux/upstream-arm-full-base.config4
-rw-r--r--dashboard/config/linux/upstream-arm-kasan-base.config4
-rw-r--r--dashboard/config/linux/upstream-arm64-kasan-base.config5
-rw-r--r--dashboard/config/linux/upstream-arm64-kasan_sw-kcov-base.config5
-rw-r--r--dashboard/config/linux/upstream-kasan-badwrites-base.config5
-rw-r--r--dashboard/config/linux/upstream-kcsan-base.config5
-rw-r--r--dashboard/config/linux/upstream-kcsan.config5
-rw-r--r--dashboard/config/linux/upstream-kmsan-base.config5
-rw-r--r--dashboard/config/linux/upstream-leak-base.config5
-rw-r--r--dashboard/config/linux/upstream-riscv64-kasan-base.config4
-rw-r--r--dashboard/config/linux/upstream-s390-kasan-base.config4
-rw-r--r--dashboard/config/linux/upstream-selinux-kasan-base.config5
-rw-r--r--dashboard/config/linux/upstream-unmaintained-base.config5
-rw-r--r--dashboard/config/linux/upstream-unmaintained.config5
-rw-r--r--dashboard/config/linux/upstream-usb-base.config5
-rw-r--r--dashboard/config/linux/upstream-usb.config5
21 files changed, 78 insertions, 27 deletions
diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 26e25e77f..5bf9030d3 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -171,6 +171,14 @@ config:
- CONFIGFS_FS
- SECURITYFS
+ # Multi-gen LRU is the new better LRU implementation
+ # that is supposed to be the default in future,
+ # so we want to enable it in most tested kernels.
+ # It has no relation to smack, but we use the smack tag
+ # just to get some kernels tested w/o multi-gen LRU as well.
+ - LRU_GEN: [v6.1, -nodefconfig, -smack]
+ - LRU_GEN_ENABLED: [v6.1, -nodefconfig, -smack]
+
# More debugging info is always good.
- NMI_CHECK_CPU: [x86_64, v6.3]
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index e14bb7b2e..b5cee2d42 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -590,14 +590,6 @@ config:
- DAMON_RECLAIM: [v5.17]
- ZSWAP_DEFAULT_ON: [v5.7]
- # Multi-gen LRU is the new better LRU implementation
- # that is supposed to be the default in future,
- # so we want to enable it in most tested kernels.
- # It has no relation to smack, but we use the smack tag
- # just to get some kernels tested w/o multi-gen LRU as well.
- - LRU_GEN: [v6.1, -smack]
- - LRU_GEN_ENABLED: [v6.1, -smack]
-
# For testing of core dumping functionality itself.
- COREDUMP
- ELF_CORE
diff --git a/dashboard/config/linux/stable-6.1-arm64-kasan-base.config b/dashboard/config/linux/stable-6.1-arm64-kasan-base.config
index f75878fc6..7f799400e 100644
--- a/dashboard/config/linux/stable-6.1-arm64-kasan-base.config
+++ b/dashboard/config/linux/stable-6.1-arm64-kasan-base.config
@@ -997,7 +997,9 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
CONFIG_LOCK_MM_AND_FIND_VMA=y
#
diff --git a/dashboard/config/linux/stable-6.1-kasan-base.config b/dashboard/config/linux/stable-6.1-kasan-base.config
index d71610906..7687ebf0a 100644
--- a/dashboard/config/linux/stable-6.1-kasan-base.config
+++ b/dashboard/config/linux/stable-6.1-kasan-base.config
@@ -939,7 +939,9 @@ CONFIG_KMAP_LOCAL=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
CONFIG_LOCK_MM_AND_FIND_VMA=y
#
diff --git a/dashboard/config/linux/upstream-apparmor-kasan-base.config b/dashboard/config/linux/upstream-apparmor-kasan-base.config
index 61a14592c..6ef773f14 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan-base.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan-base.config
@@ -1010,7 +1010,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-arm-full-base.config b/dashboard/config/linux/upstream-arm-full-base.config
index 8f6fac628..c34dc30ae 100644
--- a/dashboard/config/linux/upstream-arm-full-base.config
+++ b/dashboard/config/linux/upstream-arm-full-base.config
@@ -823,7 +823,9 @@ CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
CONFIG_MEMFD_CREATE=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-arm-kasan-base.config b/dashboard/config/linux/upstream-arm-kasan-base.config
index d979f30fb..7f3183712 100644
--- a/dashboard/config/linux/upstream-arm-kasan-base.config
+++ b/dashboard/config/linux/upstream-arm-kasan-base.config
@@ -823,7 +823,9 @@ CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
CONFIG_MEMFD_CREATE=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-arm64-kasan-base.config b/dashboard/config/linux/upstream-arm64-kasan-base.config
index 10947f81c..58cd92b49 100644
--- a/dashboard/config/linux/upstream-arm64-kasan-base.config
+++ b/dashboard/config/linux/upstream-arm64-kasan-base.config
@@ -1045,7 +1045,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-arm64-kasan_sw-kcov-base.config b/dashboard/config/linux/upstream-arm64-kasan_sw-kcov-base.config
index e01103b34..4e95358b5 100644
--- a/dashboard/config/linux/upstream-arm64-kasan_sw-kcov-base.config
+++ b/dashboard/config/linux/upstream-arm64-kasan_sw-kcov-base.config
@@ -1044,7 +1044,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-kasan-badwrites-base.config b/dashboard/config/linux/upstream-kasan-badwrites-base.config
index 6b1b19703..7701f5e32 100644
--- a/dashboard/config/linux/upstream-kasan-badwrites-base.config
+++ b/dashboard/config/linux/upstream-kasan-badwrites-base.config
@@ -1013,7 +1013,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-kcsan-base.config b/dashboard/config/linux/upstream-kcsan-base.config
index 023b3d8dd..da47a0f17 100644
--- a/dashboard/config/linux/upstream-kcsan-base.config
+++ b/dashboard/config/linux/upstream-kcsan-base.config
@@ -991,7 +991,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config
index f7b9abc39..6a3c0d6b1 100644
--- a/dashboard/config/linux/upstream-kcsan.config
+++ b/dashboard/config/linux/upstream-kcsan.config
@@ -1003,7 +1003,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-kmsan-base.config b/dashboard/config/linux/upstream-kmsan-base.config
index 6f39598b0..d6f560643 100644
--- a/dashboard/config/linux/upstream-kmsan-base.config
+++ b/dashboard/config/linux/upstream-kmsan-base.config
@@ -1001,7 +1001,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-leak-base.config b/dashboard/config/linux/upstream-leak-base.config
index 6bf017510..900b2d52b 100644
--- a/dashboard/config/linux/upstream-leak-base.config
+++ b/dashboard/config/linux/upstream-leak-base.config
@@ -1006,7 +1006,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-riscv64-kasan-base.config b/dashboard/config/linux/upstream-riscv64-kasan-base.config
index 237423d84..ff6c0c49e 100644
--- a/dashboard/config/linux/upstream-riscv64-kasan-base.config
+++ b/dashboard/config/linux/upstream-riscv64-kasan-base.config
@@ -805,7 +805,9 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-s390-kasan-base.config b/dashboard/config/linux/upstream-s390-kasan-base.config
index 024611af7..9d8beb98c 100644
--- a/dashboard/config/linux/upstream-s390-kasan-base.config
+++ b/dashboard/config/linux/upstream-s390-kasan-base.config
@@ -782,7 +782,9 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
CONFIG_ANON_VMA_NAME=y
CONFIG_USERFAULTFD=y
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_EXECMEM=y
diff --git a/dashboard/config/linux/upstream-selinux-kasan-base.config b/dashboard/config/linux/upstream-selinux-kasan-base.config
index 0ddec0739..cf75157dc 100644
--- a/dashboard/config/linux/upstream-selinux-kasan-base.config
+++ b/dashboard/config/linux/upstream-selinux-kasan-base.config
@@ -1013,7 +1013,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-unmaintained-base.config b/dashboard/config/linux/upstream-unmaintained-base.config
index c69256cb8..29d1f0858 100644
--- a/dashboard/config/linux/upstream-unmaintained-base.config
+++ b/dashboard/config/linux/upstream-unmaintained-base.config
@@ -996,7 +996,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-unmaintained.config b/dashboard/config/linux/upstream-unmaintained.config
index 26a5edf6d..953a7a32d 100644
--- a/dashboard/config/linux/upstream-unmaintained.config
+++ b/dashboard/config/linux/upstream-unmaintained.config
@@ -999,7 +999,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-usb-base.config b/dashboard/config/linux/upstream-usb-base.config
index 49de780d2..4967f49a9 100644
--- a/dashboard/config/linux/upstream-usb-base.config
+++ b/dashboard/config/linux/upstream-usb-base.config
@@ -1011,7 +1011,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
diff --git a/dashboard/config/linux/upstream-usb.config b/dashboard/config/linux/upstream-usb.config
index 57dde5dfb..7ea9881b5 100644
--- a/dashboard/config/linux/upstream-usb.config
+++ b/dashboard/config/linux/upstream-usb.config
@@ -1021,7 +1021,10 @@ CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
# CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y