diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2022-05-27 09:14:23 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2022-05-27 09:47:55 +0200 |
| commit | 116e7a7b1ef308fdbd067a06362c8bec9397e217 (patch) | |
| tree | a9af0f70625e6c0c4faf357b2ec328ccb298aec1 /dashboard | |
| parent | 3037caa999f22cdb40f1fa5c6b1b13e5d6af9781 (diff) | |
dashboard/config: enable KASAN_VMALLOC for riscv
Atish Patra found that enabling KASAN_VMALLOC fixes the boot:
https://lore.kernel.org/all/CAOnJCUKBWx+wEKaq8WOPC1j7jgn38iWcrTh4gO+FzfF-mhPkQg@mail.gmail.com/
Enable it.
Diffstat (limited to 'dashboard')
| -rw-r--r-- | dashboard/config/linux/bits/kasan.yml | 2 | ||||
| -rw-r--r-- | dashboard/config/linux/upstream-riscv64-kasan-base.config | 3 | ||||
| -rw-r--r-- | dashboard/config/linux/upstream-riscv64-kasan.config | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/dashboard/config/linux/bits/kasan.yml b/dashboard/config/linux/bits/kasan.yml index c073e489a..f548ea110 100644 --- a/dashboard/config/linux/bits/kasan.yml +++ b/dashboard/config/linux/bits/kasan.yml @@ -8,7 +8,7 @@ config: - KASAN_INLINE: [-arm, -riscv] - KASAN_STACK_ENABLE: [clang, v4.16, -v5.11] - KASAN_STACK: [clang, v5.11] - - KASAN_VMALLOC: [v5.5, -arm, -arm64, -s390, -riscv] + - KASAN_VMALLOC: [v5.5, -arm, -arm64, -s390] # This was historically enabled in the KASAN section without explanation. - SPARSEMEM_VMEMMAP: [-arm, -riscv] # This is required to enable SPARSEMEM_VMEMMAP. diff --git a/dashboard/config/linux/upstream-riscv64-kasan-base.config b/dashboard/config/linux/upstream-riscv64-kasan-base.config index 6132c683a..0d640cbc0 100644 --- a/dashboard/config/linux/upstream-riscv64-kasan-base.config +++ b/dashboard/config/linux/upstream-riscv64-kasan-base.config @@ -431,6 +431,7 @@ CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y # CONFIG_COMPAT_32BIT_TIME is not set CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -3831,7 +3832,7 @@ CONFIG_KASAN_GENERIC=y CONFIG_KASAN_OUTLINE=y # CONFIG_KASAN_INLINE is not set CONFIG_KASAN_STACK=y -# CONFIG_KASAN_VMALLOC is not set +CONFIG_KASAN_VMALLOC=y # CONFIG_KASAN_MODULE_TEST is not set CONFIG_HAVE_ARCH_KFENCE=y CONFIG_KFENCE=y diff --git a/dashboard/config/linux/upstream-riscv64-kasan.config b/dashboard/config/linux/upstream-riscv64-kasan.config index 0f97b616c..7d46ff07e 100644 --- a/dashboard/config/linux/upstream-riscv64-kasan.config +++ b/dashboard/config/linux/upstream-riscv64-kasan.config @@ -450,6 +450,7 @@ CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y # CONFIG_COMPAT_32BIT_TIME is not set CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -6470,7 +6471,7 @@ CONFIG_KASAN_GENERIC=y CONFIG_KASAN_OUTLINE=y # CONFIG_KASAN_INLINE is not set CONFIG_KASAN_STACK=y -# CONFIG_KASAN_VMALLOC is not set +CONFIG_KASAN_VMALLOC=y # CONFIG_KASAN_MODULE_TEST is not set CONFIG_HAVE_ARCH_KFENCE=y CONFIG_KFENCE=y |