From 6be0f1f57faa36df4b215edbe2fcfdbbb6de9f6d Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 15 Feb 2023 09:47:28 +0100 Subject: dashboard/config/linux: enable LRU_GEN on some instances As requested here: https://lore.kernel.org/linux-mm/20230215015231.3646-1-hdanton@sina.com/ --- dashboard/config/linux/bits/subsystems.yml | 8 ++++++++ dashboard/config/linux/upstream-apparmor-kasan.config | 4 +++- dashboard/config/linux/upstream-arm-full.config | 4 +++- dashboard/config/linux/upstream-arm-kasan.config | 4 +++- dashboard/config/linux/upstream-arm64-kasan.config | 4 +++- dashboard/config/linux/upstream-kmsan.config | 4 +++- dashboard/config/linux/upstream-leak.config | 4 +++- dashboard/config/linux/upstream-riscv64-kasan.config | 4 +++- dashboard/config/linux/upstream-s390-kasan.config | 4 +++- dashboard/config/linux/upstream-selinux-kasan.config | 4 +++- 10 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml index 288d73310..b083b3f88 100644 --- a/dashboard/config/linux/bits/subsystems.yml +++ b/dashboard/config/linux/bits/subsystems.yml @@ -578,6 +578,14 @@ config: - DAMON_DBGFS: [v5.15] - DAMON_RECLAIM: [v5.17] + # 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/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config index cb4e657dc..154ced52f 100644 --- a/dashboard/config/linux/upstream-apparmor-kasan.config +++ b/dashboard/config/linux/upstream-apparmor-kasan.config @@ -1088,7 +1088,9 @@ CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y # CONFIG_PTE_MARKER_UFFD_WP 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 # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-arm-full.config b/dashboard/config/linux/upstream-arm-full.config index e4737d447..c02d63e75 100644 --- a/dashboard/config/linux/upstream-arm-full.config +++ b/dashboard/config/linux/upstream-arm-full.config @@ -938,7 +938,9 @@ CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=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 # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-arm-kasan.config b/dashboard/config/linux/upstream-arm-kasan.config index 97529576c..f7e5c4462 100644 --- a/dashboard/config/linux/upstream-arm-kasan.config +++ b/dashboard/config/linux/upstream-arm-kasan.config @@ -914,7 +914,9 @@ CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=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 # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-arm64-kasan.config b/dashboard/config/linux/upstream-arm64-kasan.config index 2c032ea76..b2857a9b8 100644 --- a/dashboard/config/linux/upstream-arm64-kasan.config +++ b/dashboard/config/linux/upstream-arm64-kasan.config @@ -1031,7 +1031,9 @@ CONFIG_SECRETMEM=y CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y -# CONFIG_LRU_GEN is not set +CONFIG_LRU_GEN=y +CONFIG_LRU_GEN_ENABLED=y +# CONFIG_LRU_GEN_STATS is not set # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config index fc0f80abf..9b13bbbb6 100644 --- a/dashboard/config/linux/upstream-kmsan.config +++ b/dashboard/config/linux/upstream-kmsan.config @@ -1056,7 +1056,9 @@ CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y # CONFIG_PTE_MARKER_UFFD_WP 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 # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config index 660b3073f..ce4f9902f 100644 --- a/dashboard/config/linux/upstream-leak.config +++ b/dashboard/config/linux/upstream-leak.config @@ -1073,7 +1073,9 @@ CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y # CONFIG_PTE_MARKER_UFFD_WP 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 # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-riscv64-kasan.config b/dashboard/config/linux/upstream-riscv64-kasan.config index ce8dba00b..528473256 100644 --- a/dashboard/config/linux/upstream-riscv64-kasan.config +++ b/dashboard/config/linux/upstream-riscv64-kasan.config @@ -682,7 +682,9 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=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 # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-s390-kasan.config b/dashboard/config/linux/upstream-s390-kasan.config index 2873a1eea..a7ca1747b 100644 --- a/dashboard/config/linux/upstream-s390-kasan.config +++ b/dashboard/config/linux/upstream-s390-kasan.config @@ -738,7 +738,9 @@ CONFIG_PERCPU_STATS=y CONFIG_ARCH_HAS_PTE_SPECIAL=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 # # Data Access Monitoring diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config index a23254074..b0cd64762 100644 --- a/dashboard/config/linux/upstream-selinux-kasan.config +++ b/dashboard/config/linux/upstream-selinux-kasan.config @@ -1081,7 +1081,9 @@ CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y # CONFIG_PTE_MARKER_UFFD_WP 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 # # Data Access Monitoring -- cgit mrf-deployment