From ba24ffcde7219e5374bb0b093368a58009c85d1d Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 11 Dec 2020 08:59:12 +0100 Subject: dashboard/config/linux: fix ChromeOS full/baseline configs ESD_FS/INCREMENTAL_FS were supposed to be enabled in full config only, but they were enabled only in baseline config. Split chromeos.yml to chromeos.yml and chromeos-subsystems.yml to avoid this mistake in future and the need to write [-baseline]. Also enabled UBS_CONFIG_FS as it seems to be enabled on real devices. Do the same for Android. --- dashboard/config/linux/bits/android-5.4.yml | 6 ---- dashboard/config/linux/bits/android-subsystems.yml | 31 +++++++++++++++++++ dashboard/config/linux/bits/android.yml | 9 ++++++ .../config/linux/bits/chromeos-subsystems.yml | 36 ++++++++++++++++++++++ dashboard/config/linux/bits/chromeos.yml | 9 ++---- 5 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 dashboard/config/linux/bits/android-subsystems.yml create mode 100644 dashboard/config/linux/bits/android.yml create mode 100644 dashboard/config/linux/bits/chromeos-subsystems.yml (limited to 'dashboard/config/linux/bits') diff --git a/dashboard/config/linux/bits/android-5.4.yml b/dashboard/config/linux/bits/android-5.4.yml index 550cba5c7..a976bb5c8 100644 --- a/dashboard/config/linux/bits/android-5.4.yml +++ b/dashboard/config/linux/bits/android-5.4.yml @@ -10,9 +10,3 @@ kernel: shell: - make gki_defconfig - -config: - # gki_defconfig defaults to KERNEL_LZ4, but we don't have lz4 installed, - # and the package lz4 is not available on the syzbot distros. - - KERNEL_GZIP - - INCREMENTAL_FS: [baseline] diff --git a/dashboard/config/linux/bits/android-subsystems.yml b/dashboard/config/linux/bits/android-subsystems.yml new file mode 100644 index 000000000..c716cb80a --- /dev/null +++ b/dashboard/config/linux/bits/android-subsystems.yml @@ -0,0 +1,31 @@ +# Copyright 2020 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. + +# Enabled on full (non-basefile) Android kernels. +# These configs are not enabled by gki_defconfig, but have lots of backports, +# or completely ChromeOS-specific, or enabled on real devices. + +config: + - INCREMENTAL_FS + - USB_CONFIGFS: [override] + - USB_CONFIGFS_UEVENT + - USB_CONFIGFS_SERIAL + - USB_CONFIGFS_ACM + - USB_CONFIGFS_OBEX + - USB_CONFIGFS_NCM + - USB_CONFIGFS_ECM + - USB_CONFIGFS_ECM_SUBSET + - USB_CONFIGFS_RNDIS + - USB_CONFIGFS_EEM + - USB_CONFIGFS_MASS_STORAGE + - USB_CONFIGFS_F_LB_SS + - USB_CONFIGFS_F_FS + - USB_CONFIGFS_F_ACC + - USB_CONFIGFS_F_AUDIO_SRC + - USB_CONFIGFS_F_UAC1 + - USB_CONFIGFS_F_UAC1_LEGACY + - USB_CONFIGFS_F_UAC2 + - USB_CONFIGFS_F_MIDI + - USB_CONFIGFS_F_HID + - USB_CONFIGFS_F_UVC + - USB_CONFIGFS_F_PRINTER diff --git a/dashboard/config/linux/bits/android.yml b/dashboard/config/linux/bits/android.yml new file mode 100644 index 000000000..f93d782ed --- /dev/null +++ b/dashboard/config/linux/bits/android.yml @@ -0,0 +1,9 @@ +# Copyright 2020 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. + +# Enabled on all Android kernels. + +config: + # gki_defconfig defaults to KERNEL_LZ4, but we don't have lz4 installed, + # and the package lz4 is not available on the syzbot distros. + - KERNEL_GZIP diff --git a/dashboard/config/linux/bits/chromeos-subsystems.yml b/dashboard/config/linux/bits/chromeos-subsystems.yml new file mode 100644 index 000000000..7d83b7bcc --- /dev/null +++ b/dashboard/config/linux/bits/chromeos-subsystems.yml @@ -0,0 +1,36 @@ +# Copyright 2020 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. + +# Enabled on full (non-basefile) ChromeOS kernels. +# These configs are not enabled by prepareconfig, but have lots of backports, +# or completely ChromeOS-specific, or enabled on real devices. + +config: + - PKGLIST + - PKGLIST_USE_CONFIGFS + - ESD_FS + - INCREMENTAL_FS + - VIRTIO_FS + - VIRTIO_WL + - USB_CONFIGFS: [override] + - USB_CONFIGFS_UEVENT + - USB_CONFIGFS_SERIAL + - USB_CONFIGFS_ACM + - USB_CONFIGFS_OBEX + - USB_CONFIGFS_NCM + - USB_CONFIGFS_ECM + - USB_CONFIGFS_ECM_SUBSET + - USB_CONFIGFS_RNDIS + - USB_CONFIGFS_EEM + - USB_CONFIGFS_MASS_STORAGE + - USB_CONFIGFS_F_LB_SS + - USB_CONFIGFS_F_FS + - USB_CONFIGFS_F_ACC + - USB_CONFIGFS_F_AUDIO_SRC + - USB_CONFIGFS_F_UAC1 + - USB_CONFIGFS_F_UAC1_LEGACY + - USB_CONFIGFS_F_UAC2 + - USB_CONFIGFS_F_MIDI + - USB_CONFIGFS_F_HID + - USB_CONFIGFS_F_UVC + - USB_CONFIGFS_F_PRINTER diff --git a/dashboard/config/linux/bits/chromeos.yml b/dashboard/config/linux/bits/chromeos.yml index db5603ab8..08058a145 100644 --- a/dashboard/config/linux/bits/chromeos.yml +++ b/dashboard/config/linux/bits/chromeos.yml @@ -1,15 +1,10 @@ # Copyright 2020 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. +# Enabled on all ChromeOS kernels. + config: # Otherwise kernel does not permit tmpfs mounts that we do during executor setup. - SECURITY_CHROMIUMOS_NO_UNPRIVILEGED_UNSAFE_MOUNTS: n # These were used historically, their origins are lost. - CMDLINE: [append, "noresume noswap dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=1 i915.modeset=1 cros_efi"] - # These are not enabled in prepareconfig, but have lots of backports or completely ChromeOS-specific. - - PKGLIST: [baseline] - - PKGLIST_USE_CONFIGFS: [baseline] - - ESD_FS: [baseline] - - INCREMENTAL_FS: [baseline] - - VIRTIO_FS: [baseline] - - VIRTIO_WL: [baseline] -- cgit mrf-deployment