diff options
| author | Liz Prucka <lizprucka@google.com> | 2023-05-24 09:58:30 -0500 |
|---|---|---|
| committer | Taras Madan <tarasmadan@google.com> | 2023-06-29 14:44:54 +0000 |
| commit | d76708ad1c17c0d3a118ff00b736e4b3c1539bee (patch) | |
| tree | 109bac6cab458f539835ada83e6fd54ce2a67a73 /dashboard/config/linux/bits | |
| parent | 01fe857264dc35af4faf4ab53c8c849afdf91968 (diff) | |
dashboard/config, tools/syz-kconf: add Cuttlefish support
Allow modules in config if `modules` are specified in main.yml.
Added Cuttlefish instances for android13-5.10, android13-5.15, and
android14-5.15 branches.
Diffstat (limited to 'dashboard/config/linux/bits')
| -rw-r--r-- | dashboard/config/linux/bits/android14-5.15.yml | 13 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/base.yml | 6 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/kasan.yml | 2 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/x86_64.yml | 5 |
4 files changed, 21 insertions, 5 deletions
diff --git a/dashboard/config/linux/bits/android14-5.15.yml b/dashboard/config/linux/bits/android14-5.15.yml new file mode 100644 index 000000000..a3a87ecd7 --- /dev/null +++ b/dashboard/config/linux/bits/android14-5.15.yml @@ -0,0 +1,13 @@ +# Copyright 2023 syzkaller project authors. All rights reserved. +# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +# See https://source.android.com/setup/build/building-kernels +# for details on how to checkout and build Android kernel. + +# Following branch: android14-5.15 +kernel: + repo: https://android.googlesource.com/kernel/common + tag: b31675307ef2 + +shell: + - make gki_defconfig diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml index 0de70670f..048e9f461 100644 --- a/dashboard/config/linux/bits/base.yml +++ b/dashboard/config/linux/bits/base.yml @@ -51,7 +51,8 @@ config: # Speeds up randomness initialization. - HW_RANDOM - - HW_RANDOM_VIRTIO + # Included as a module in Cuttlefish. + - HW_RANDOM_VIRTIO: [-cuttlefish] - HW_RANDOM_INTEL: n - HW_RANDOM_AMD: n - HW_RANDOM_VIA: n @@ -126,7 +127,8 @@ config: # (!ARCH_WANTS_NO_INSTR [=y] || STACK_VALIDATION [=n] || GCC_VERSION [=110200]>=120000 || CLANG_VERSION [=0]>=130000) - KCOV: [-arm, -s390, -nokcov] - KCOV_INSTRUMENT_ALL: [-arm, -s390, -nokcov] - - KCOV_ENABLE_COMPARISONS: [-arm, -s390, -nokcov] + # Doesn't boot with KCOV_ENABLE_COMPARISONS on Cuttlefish. + - KCOV_ENABLE_COMPARISONS: [-arm, -s390, -nokcov, -cuttlefish] - DEBUG_FS # Required for KCOV but also eliminates unnecessary non-determinism. diff --git a/dashboard/config/linux/bits/kasan.yml b/dashboard/config/linux/bits/kasan.yml index f548ea110..3d81107f1 100644 --- a/dashboard/config/linux/bits/kasan.yml +++ b/dashboard/config/linux/bits/kasan.yml @@ -5,7 +5,7 @@ config: - KASAN - KASAN_GENERIC: [v4.16] # TODO: KASAN_INLINE is now broken for riscv+gcc. Revert -riscv once it is fixed. - - KASAN_INLINE: [-arm, -riscv] + - KASAN_INLINE: [-arm, -riscv, -cuttlefish] - KASAN_STACK_ENABLE: [clang, v4.16, -v5.11] - KASAN_STACK: [clang, v5.11] - KASAN_VMALLOC: [v5.5, -arm, -arm64, -s390] diff --git a/dashboard/config/linux/bits/x86_64.yml b/dashboard/config/linux/bits/x86_64.yml index 225ef76c5..cd5645d6c 100644 --- a/dashboard/config/linux/bits/x86_64.yml +++ b/dashboard/config/linux/bits/x86_64.yml @@ -3,7 +3,7 @@ shell: - make x86_64_defconfig: [-nodefconfig] - - make kvm_guest.config + - make kvm_guest.config: [-cuttlefish] config: # root=/dev/sda is not necessary correct, but it's a common setting and user arguments are appended @@ -44,7 +44,8 @@ config: # TODO: should we switch to virtio instead? - ETHERNET - NET_VENDOR_INTEL - - E1000 + # Module in cuttlefish. + - E1000: [-cuttlefish] - X86_ACPI_CPUFREQ - CPU_IDLE_GOV_HALTPOLL: [v4.16] |