aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-03-05 15:54:06 +0100
committerDmitry Vyukov <dvyukov@google.com>2021-03-05 16:24:58 +0100
commit0948aac2d65d8ece531beed0519ef6d33c62f0a6 (patch)
tree8be0ac018d6798f4f308f1b837aee96d203098d5
parent479b33390f79b6495165d0bc04ff6923bde2c9c9 (diff)
dashboard/config/linux: enable KFENCE for arm64
-rw-r--r--dashboard/config/linux/main.yml2
-rw-r--r--dashboard/config/linux/upstream-arm64-mte-base.config6
-rw-r--r--dashboard/config/linux/upstream-arm64-mte.config6
3 files changed, 11 insertions, 3 deletions
diff --git a/dashboard/config/linux/main.yml b/dashboard/config/linux/main.yml
index 8e09082fb..9aaf62d48 100644
--- a/dashboard/config/linux/main.yml
+++ b/dashboard/config/linux/main.yml
@@ -10,7 +10,7 @@ instances:
- upstream-leak: [upstream, x86_64, gcc, lsm, apparmor, slab, nonoise, kmemleak]
- upstream-usb: [upstream, x86_64, gcc, lsm, apparmor, onlyusb, kasan]
- upstream-arm64-kasan: [upstream, arm64, gcc, lsm, selinux, kasan]
- - upstream-arm64-mte: [upstream, arm64, gcc, lsm, smack, nonoise, mte]
+ - upstream-arm64-mte: [upstream, arm64, gcc, lsm, smack, nonoise, kfence, mte]
# TODO: enable kasan when it works, currently Go binaries hang on KASAN kernel:
# https://lore.kernel.org/linux-arm-kernel/CACT4Y+YdJoNTqnBSELcEbcbVsKBtJfYUc7_GSXbUQfAJN3JyRg@mail.gmail.com/
- upstream-arm-kasan: [upstream, arm, gcc, lsm, selinux]
diff --git a/dashboard/config/linux/upstream-arm64-mte-base.config b/dashboard/config/linux/upstream-arm64-mte-base.config
index 6a9662a8f..3f43305ce 100644
--- a/dashboard/config/linux/upstream-arm64-mte-base.config
+++ b/dashboard/config/linux/upstream-arm64-mte-base.config
@@ -6625,7 +6625,11 @@ CONFIG_KASAN=y
CONFIG_KASAN_HW_TAGS=y
CONFIG_KASAN_STACK=1
CONFIG_HAVE_ARCH_KFENCE=y
-# CONFIG_KFENCE is not set
+CONFIG_KFENCE=y
+CONFIG_KFENCE_STATIC_KEYS=y
+CONFIG_KFENCE_SAMPLE_INTERVAL=100
+CONFIG_KFENCE_NUM_OBJECTS=255
+CONFIG_KFENCE_STRESS_TEST_FAULTS=0
# end of Memory Debugging
# CONFIG_DEBUG_SHIRQ is not set
diff --git a/dashboard/config/linux/upstream-arm64-mte.config b/dashboard/config/linux/upstream-arm64-mte.config
index 54977cc1c..9c8331e06 100644
--- a/dashboard/config/linux/upstream-arm64-mte.config
+++ b/dashboard/config/linux/upstream-arm64-mte.config
@@ -7659,7 +7659,11 @@ CONFIG_KASAN=y
CONFIG_KASAN_HW_TAGS=y
CONFIG_KASAN_STACK=1
CONFIG_HAVE_ARCH_KFENCE=y
-# CONFIG_KFENCE is not set
+CONFIG_KFENCE=y
+CONFIG_KFENCE_STATIC_KEYS=y
+CONFIG_KFENCE_SAMPLE_INTERVAL=100
+CONFIG_KFENCE_NUM_OBJECTS=255
+CONFIG_KFENCE_STRESS_TEST_FAULTS=0
# end of Memory Debugging
# CONFIG_DEBUG_SHIRQ is not set