dashboard/config/linux: re-organize CMDLINE parameters

Move x86-specific cmdline parameter to x86_64.yml.
Remove redundant cmdline parameters (defined by kernel configs).
Move vivid/nr_devs parameters to arch configs.
Disable bluetooth/wireless/hamradio in non-x86 configs,
non-x86 instances are slow, so the intention is to reduce test space.

9 files changed, 247 insertions, 204 deletions

diff --git a/dashboard/config/linux/bits/arm.yml b/dashboard/config/linux/bits/arm.yml
index 6a113ba65..145b0960c 100644
--- a/dashboard/config/linux/bits/arm.yml
+++ b/dashboard/config/linux/bits/arm.yml
@@ -8,7 +8,7 @@ shell:
 config:
  # We reduce number of vivid/netrom/rose/hcd devices to 2 because we use at most 2 procs
  # with emulation and creating these devices takes time during boot.
- - CMDLINE: [append, "root=/dev/vda console=ttyAMA0 vmalloc=512M watchdog_thresh=165 workqueue.watchdog_thresh=420 vivid.n_devs=4 vivid.multiplanar=1,2,1,2 netrom.nr_ndevs=2 rose.rose_ndevs=2 dummy_hcd.num=2"]
+ - CMDLINE: [append, "root=/dev/vda console=ttyAMA0 vmalloc=512M watchdog_thresh=165 workqueue.watchdog_thresh=420 dummy_hcd.num=2"]
  - CMDLINE_EXTEND
  # See the comment in x86_64.yml re these numbers.
  - RCU_CPU_STALL_TIMEOUT: 300
diff --git a/dashboard/config/linux/bits/arm64.yml b/dashboard/config/linux/bits/arm64.yml
index 1aa7e4b54..55d9f6cbc 100644
--- a/dashboard/config/linux/bits/arm64.yml
+++ b/dashboard/config/linux/bits/arm64.yml
@@ -9,7 +9,7 @@ shell:
 config:
  # We reduce number of vivid/netrom/rose/hcd devices to 2 because we use at most 2 procs
  # with emulation and creating these devices takes time during boot.
- - CMDLINE: [append, "root=/dev/vda console=ttyAMA0 watchdog_thresh=165 workqueue.watchdog_thresh=420 vivid.n_devs=4 vivid.multiplanar=1,2,1,2 netrom.nr_ndevs=2 rose.rose_ndevs=2 dummy_hcd.num=2"]
+ - CMDLINE: [append, "root=/dev/vda console=ttyAMA0 watchdog_thresh=165 workqueue.watchdog_thresh=420 dummy_hcd.num=2"]
  - CMDLINE_EXTEND
  # See the comment in x86_64.yml re these numbers.
  - RCU_CPU_STALL_TIMEOUT: 300
@@ -45,6 +45,7 @@ config:
  - FB_IBM_GXT4500: n
  - SMS_SIANO_RC: n
  - V4L_PLATFORM_DRIVERS: n
+ - MEDIA_SUPPORT: n
  - MEDIA_CEC_SUPPORT: n
  - MEDIA_PCI_SUPPORT: n
  - MEDIA_RADIO_SUPPORT: n
diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 0f71e6b82..58484340d 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -19,7 +19,7 @@ config:
  - DEBUG_KERNEL
 
  # panic=86400: prevents kernel from rebooting so that we don't get reboot output in all crash reports.
- - CMDLINE: "earlyprintk=serial oops=panic nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb kvm-intel.nested=1 nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 spec_store_bypass_disable=prctl numa=fake=2 nopcid dummy_hcd.num=8 binder.debug_mask=0 rcupdate.rcu_expedited=1"
+ - CMDLINE: "earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 binder.debug_mask=0 rcupdate.rcu_expedited=1"
 
  # This config can be used to enable any additional temporal debugging features in linux-next tree.
  - DEBUG_AID_FOR_SYZBOT: [linux-next]
diff --git a/dashboard/config/linux/bits/filesystems.yml b/dashboard/config/linux/bits/filesystems.yml
new file mode 100644
index 000000000..e3eae28b0
--- /dev/null
+++ b/dashboard/config/linux/bits/filesystems.yml
@@ -0,0 +1,188 @@
+# Copyright 2021 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.
+
+config:
+ - SYSV_FS
+ - ZONEFS_FS: [v5.6]
+ - ISO9660_FS
+ - JOLIET
+ - ZISOFS
+ - UDF_FS
+ - MSDOS_FS
+ - VFAT_FS
+ - EXFAT_FS
+ - NTFS_FS
+ - NTFS_RW
+ - HFS_FS
+ - HFSPLUS_FS
+ - BFS_FS
+ - MINIX_FS
+ - VXFS_FS
+ - OMFS_FS
+ - HPFS_FS
+ - NILFS2_FS
+ - ORANGEFS_FS
+ - EFS_FS
+
+ - JFFS2_FS
+ - JFFS2_FS_DEBUG: 0
+ - JFFS2_FS_WRITEBUFFER
+ - JFFS2_FS_WBUF_VERIFY: n
+ - JFFS2_SUMMARY
+ - JFFS2_FS_XATTR
+ - JFFS2_FS_POSIX_ACL
+ - JFFS2_FS_SECURITY
+ - JFFS2_COMPRESSION_OPTIONS
+ - JFFS2_ZLIB
+ - JFFS2_LZO
+ - JFFS2_RTIME
+ - JFFS2_RUBIN
+ - JFFS2_CMODE_PRIORITY
+
+ - UFS_FS
+ - UFS_FS_WRITE: n
+ - UFS_DEBUG: n
+
+ - JFS_FS
+ - JFS_POSIX_ACL
+ - JFS_SECURITY
+ - JFS_DEBUG
+
+ - XFS_FS
+ - XFS_QUOTA
+ - XFS_POSIX_ACL
+ - XFS_RT
+ - XFS_SUPPORT_V4: [v5.10]
+ - XFS_DEBUG
+ - XFS_ASSERT_FATAL
+
+ - GFS2_FS
+ - GFS2_FS_LOCKING_DLM
+
+ - OCFS2_FS
+ - OCFS2_FS_O2CB
+ - OCFS2_FS_USERSPACE_CLUSTER
+ - OCFS2_FS_STATS
+ - OCFS2_DEBUG_MASKLOG: n
+ - OCFS2_DEBUG_FS
+
+ - BTRFS_FS
+ - BTRFS_FS_POSIX_ACL
+ - BTRFS_ASSERT
+
+ - F2FS_FS
+ - F2FS_FS_SECURITY
+ - F2FS_CHECK_FS
+ - F2FS_FAULT_INJECTION
+ - F2FS_FS_COMPRESSION: [v5.6]
+ - F2FS_STAT_FS
+ - F2FS_FS_POSIX_ACL
+ - F2FS_FS_LZO: [v5.5]
+ - F2FS_FS_LZ4: [v5.5]
+ - F2FS_FS_ZSTD: [v5.5]
+ - F2FS_FS_LZORLE: [v5.5]
+ # TODO: change to v5.11 when merged.
+ - F2FS_FS_LZ4HC: [linux-next]
+
+ - OVERLAY_FS
+ - OVERLAY_FS_REDIRECT_DIR
+ - OVERLAY_FS_INDEX
+ - OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW
+
+ - UBIFS_FS
+ - UBIFS_FS_ADVANCED_COMPR
+ - UBIFS_ATIME_SUPPORT
+ - UBIFS_FS_LZO
+ - UBIFS_FS_ZLIB
+ - UBIFS_FS_ZSTD
+ - UBIFS_FS_SECURITY
+
+ - SQUASHFS
+ - SQUASHFS_FILE_DIRECT
+ - SQUASHFS_XATTR
+ - SQUASHFS_ZLIB
+ - SQUASHFS_LZ4
+ - SQUASHFS_LZO
+ - SQUASHFS_XZ
+ - SQUASHFS_ZSTD
+ - SQUASHFS_4K_DEVBLK_SIZE
+
+ - EROFS_FS
+ - EROFS_FS_ZIP
+ - EROFS_FS_XATTR
+ - EROFS_FS_POSIX_ACL
+ - EROFS_FS_SECURITY
+ - EROFS_FS_DEBUG: n
+ - EROFS_FS_CLUSTER_PAGE_LIMIT: 2
+
+ - NFS_FS
+ - NFS_V3_ACL
+ - NFS_V4
+ - NFS_V4_1
+ - NFS_V4_2
+ - ROOT_NFS
+ - NFS_FSCACHE
+ - NFS_DISABLE_UDP_SUPPORT: n
+ - NFS_V4_2_READ_PLUS: [v5.11]
+ - NFSD
+ - NFSD_V3_ACL
+ - NFSD_V4
+ - NFSD_BLOCKLAYOUT
+ - NFSD_SCSILAYOUT
+ - NFSD_FLEXFILELAYOUT
+ - NFSD_V4_2_INTER_SSC: [v5.7]
+ - NFSD_V4_SECURITY_LABEL
+
+ - CEPH_FS
+ - CEPH_FSCACHE
+ - CEPH_FS_POSIX_ACL
+
+ - CIFS
+ - CIFS_ALLOW_INSECURE_LEGACY
+ - CIFS_WEAK_PW_HASH
+ - CIFS_UPCALL
+ - CIFS_XATTR
+ - CIFS_POSIX
+ - CIFS_DFS_UPCALL
+ - CIFS_SMB_DIRECT
+ - CIFS_FSCACHE
+ - CIFS_DEBUG
+ - CIFS_SWN_UPCALL: [v5.11]
+
+ - AFS_FS
+ - AFS_FSCACHE
+
+ - 9P_FS
+ - 9P_FSCACHE
+ - 9P_FS_POSIX_ACL
+ - 9P_FS_SECURITY
+
+ - EXT3_FS
+ - EXT3_FS_POSIX_ACL
+ - EXT3_FS_SECURITY
+
+ - REISERFS_FS
+ - REISERFS_FS_XATTR
+ - REISERFS_FS_POSIX_ACL
+ - REISERFS_FS_SECURITY
+ - REISERFS_PROC_INFO
+
+ - ADFS_FS
+ - ADFS_FS_RW: n
+ - AFFS_FS
+
+ - BEFS_FS
+ - BEFS_DEBUG: n
+
+ - CRAMFS
+ - CRAMFS_BLOCKDEV
+ - CRAMFS_MTD
+
+ - QNX4FS_FS
+ - QNX6FS_FS
+ - QNX6FS_DEBUG: n
+
+ - ROMFS_FS
+ - ROMFS_BACKED_BY_BOTH
+ - ROMFS_ON_BLOCK
+ - ROMFS_ON_MTD
diff --git a/dashboard/config/linux/bits/media.yml b/dashboard/config/linux/bits/media.yml
new file mode 100644
index 000000000..ffad43e3e
--- /dev/null
+++ b/dashboard/config/linux/bits/media.yml
@@ -0,0 +1,21 @@
+# Copyright 2021 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.
+
+config:
+ - MEDIA_SUPPORT
+ - MEDIA_SUPPORT_FILTER: [v5.8]
+ - MEDIA_SUBDRV_AUTOSELECT: n
+ - MEDIA_CAMERA_SUPPORT
+ - MEDIA_TEST_SUPPORT: [v5.8]
+ - MEDIA_USB_SUPPORT
+ - MEDIA_PCI_SUPPORT: n
+ - USB_VIDEO_CLASS
+ - VIDEO_IPU3_CIO2: n
+ - DVB_TEST_DRIVERS: [v5.11]
+ - DVB_VIDTV: [v5.11]
+ - V4L_TEST_DRIVERS: [v5.8]
+ - VIDEO_VIMC: [v5.8]
+ - VIDEO_VIVID: [v5.8]
+ - VIDEO_VIVID_CEC: [v5.8]
+ - VIDEO_VIM2M: [v5.8]
+ - VIDEO_VICODEC: [v5.8]
diff --git a/dashboard/config/linux/bits/partitions.yml b/dashboard/config/linux/bits/partitions.yml
new file mode 100644
index 000000000..0a5b205db
--- /dev/null
+++ b/dashboard/config/linux/bits/partitions.yml
@@ -0,0 +1,28 @@
+# Copyright 2021 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.
+
+config:
+ - PARTITION_ADVANCED
+ - ACORN_PARTITION
+ - ACORN_PARTITION_CUMANA
+ - ACORN_PARTITION_EESOX
+ - ACORN_PARTITION_ICS
+ - ACORN_PARTITION_ADFS
+ - ACORN_PARTITION_POWERTEC
+ - ACORN_PARTITION_RISCIX
+ - AIX_PARTITION
+ - OSF_PARTITION
+ - AMIGA_PARTITION
+ - ATARI_PARTITION
+ - MAC_PARTITION
+ - BSD_DISKLABEL
+ - MINIX_SUBPARTITION
+ - SOLARIS_X86_PARTITION
+ - UNIXWARE_DISKLABEL
+ - LDM_PARTITION
+ - SGI_PARTITION
+ - ULTRIX_PARTITION
+ - SUN_PARTITION
+ - KARMA_PARTITION
+ - SYSV68_PARTITION
+ - CMDLINE_PARTITION
diff --git a/dashboard/config/linux/bits/riscv64.yml b/dashboard/config/linux/bits/riscv64.yml
index 14d520201..2a9b0404b 100644
--- a/dashboard/config/linux/bits/riscv64.yml
+++ b/dashboard/config/linux/bits/riscv64.yml
@@ -6,7 +6,7 @@ shell:
  - make kvm_guest.config
 
 config:
- - CMDLINE: [append, "watchdog_thresh=165 workqueue.watchdog_thresh=420"]
+ - CMDLINE: [append, "dummy_hcd.num=2 watchdog_thresh=165 workqueue.watchdog_thresh=420"]
  - CMDLINE_EXTEND
  # See the comment in x86_64.yml re these numbers.
  - RCU_CPU_STALL_TIMEOUT: 300
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 84e80fc6f..176fdc7c5 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -81,30 +81,6 @@ config:
  - BLK_CGROUP_IOCOST
  - BLK_INLINE_ENCRYPTION: [v5.8]
  - BLK_INLINE_ENCRYPTION_FALLBACK: [v5.8]
- - PARTITION_ADVANCED
- - ACORN_PARTITION
- - ACORN_PARTITION_CUMANA
- - ACORN_PARTITION_EESOX
- - ACORN_PARTITION_ICS
- - ACORN_PARTITION_ADFS
- - ACORN_PARTITION_POWERTEC
- - ACORN_PARTITION_RISCIX
- - AIX_PARTITION
- - OSF_PARTITION
- - AMIGA_PARTITION
- - ATARI_PARTITION
- - MAC_PARTITION
- - BSD_DISKLABEL
- - MINIX_SUBPARTITION
- - SOLARIS_X86_PARTITION
- - UNIXWARE_DISKLABEL
- - LDM_PARTITION
- - SGI_PARTITION
- - ULTRIX_PARTITION
- - SUN_PARTITION
- - KARMA_PARTITION
- - SYSV68_PARTITION
- - CMDLINE_PARTITION
  - IOSCHED_BFQ
  - BFQ_GROUP_IOSCHED
  - BFQ_CGROUP_DEBUG
@@ -969,21 +945,6 @@ config:
  - ITCO_WDT: n
  - ITCO_VENDOR_SUPPORT: n
  - LPC_ICH
- - MEDIA_SUPPORT
- - MEDIA_SUPPORT_FILTER: [v5.8]
- - MEDIA_SUBDRV_AUTOSELECT: n
- - MEDIA_CAMERA_SUPPORT
- - MEDIA_TEST_SUPPORT: [v5.8]
- - MEDIA_USB_SUPPORT
- - USB_VIDEO_CLASS
- - USB_GSPCA
- - VIDEO_IPU3_CIO2: n
- - V4L_TEST_DRIVERS: [v5.8]
- - VIDEO_VIMC: [v5.8]
- - VIDEO_VIVID: [v5.8]
- - VIDEO_VIVID_CEC: [v5.8]
- - VIDEO_VIM2M: [v5.8]
- - VIDEO_VICODEC: [v5.8]
  - AGP: [x86_64]
  - AGP_AMD64: [x86_64]
  - AGP_INTEL: [x86_64]
@@ -1175,49 +1136,6 @@ config:
  - ANDROID_BINDERFS: n
  - COUNTER
  - VALIDATE_FS_PARSER
- - EXT3_FS
- - EXT3_FS_POSIX_ACL
- - EXT3_FS_SECURITY
- - REISERFS_FS
- - REISERFS_FS_XATTR
- - REISERFS_FS_POSIX_ACL
- - REISERFS_FS_SECURITY
- - REISERFS_PROC_INFO
- - NILFS2_FS
- - ORANGEFS_FS
- - ADFS_FS
- - ADFS_FS_RW: n
- - AFFS_FS
- - BEFS_FS
- - BEFS_DEBUG: n
- - EFS_FS
- - JFFS2_FS
- - JFFS2_FS_DEBUG: 0
- - JFFS2_FS_WRITEBUFFER
- - JFFS2_FS_WBUF_VERIFY: n
- - JFFS2_SUMMARY
- - JFFS2_FS_XATTR
- - JFFS2_FS_POSIX_ACL
- - JFFS2_FS_SECURITY
- - JFFS2_COMPRESSION_OPTIONS
- - JFFS2_ZLIB
- - JFFS2_LZO
- - JFFS2_RTIME
- - JFFS2_RUBIN
- - JFFS2_CMODE_PRIORITY
- - CRAMFS
- - CRAMFS_BLOCKDEV
- - CRAMFS_MTD
- - VXFS_FS
- - OMFS_FS
- - HPFS_FS
- - QNX4FS_FS
- - QNX6FS_FS
- - QNX6FS_DEBUG: n
- - ROMFS_FS
- - ROMFS_BACKED_BY_BOTH
- - ROMFS_ON_BLOCK
- - ROMFS_ON_MTD
  - PSTORE
  - PSTORE_DEFLATE_COMPRESS
  - PSTORE_LZO_COMPRESS
@@ -1227,46 +1145,6 @@ config:
  - PSTORE_ZSTD_COMPRESS
  - PSTORE_COMPRESS
  - PSTORE_DEFLATE_COMPRESS_DEFAULT
- - SYSV_FS
- - UFS_FS
- - UFS_FS_WRITE: n
- - UFS_DEBUG: n
- - JFS_FS
- - JFS_POSIX_ACL
- - JFS_SECURITY
- - JFS_DEBUG
- - XFS_FS
- - XFS_QUOTA
- - XFS_POSIX_ACL
- - XFS_RT
- - XFS_SUPPORT_V4: [v5.10]
- - XFS_DEBUG
- - XFS_ASSERT_FATAL
- - GFS2_FS
- - GFS2_FS_LOCKING_DLM
- - OCFS2_FS
- - OCFS2_FS_O2CB
- - OCFS2_FS_USERSPACE_CLUSTER
- - OCFS2_FS_STATS
- - OCFS2_DEBUG_MASKLOG: n
- - OCFS2_DEBUG_FS
- - BTRFS_FS
- - BTRFS_FS_POSIX_ACL
- - BTRFS_ASSERT
- - F2FS_FS
- - F2FS_FS_SECURITY
- - F2FS_CHECK_FS
- - F2FS_FAULT_INJECTION
- - F2FS_FS_COMPRESSION: [v5.6]
- - F2FS_STAT_FS
- - F2FS_FS_POSIX_ACL
- - F2FS_FS_LZO: [v5.5]
- - F2FS_FS_LZ4: [v5.5]
- - F2FS_FS_ZSTD: [v5.5]
- - F2FS_FS_LZORLE: [v5.5]
- # TODO: change to v5.11 when merged.
- - F2FS_FS_LZ4HC: [linux-next]
- - ZONEFS_FS: [v5.6]
  - FS_DAX: [-arm]
  - FS_ENCRYPTION
  - FS_VERITY
@@ -1275,6 +1153,7 @@ config:
  - FANOTIFY_ACCESS_PERMISSIONS
  - WATCH_QUEUE: [v5.8]
  - KEY_NOTIFICATIONS: [v5.8]
+ - QUOTA
  - QUOTA_NETLINK_INTERFACE
  - PRINT_QUOTA_WARNING: n
  - QFMT_V2
@@ -1283,91 +1162,17 @@ config:
  - FUSE_DAX: [v5.10, x86_64]
  - CUSE
  - VIRTIO_FS
- - OVERLAY_FS
- - OVERLAY_FS_REDIRECT_DIR
- - OVERLAY_FS_INDEX
- - OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW
  - FSCACHE
  - CACHEFILES
- - ISO9660_FS
- - JOLIET
- - ZISOFS
- - UDF_FS
- - MSDOS_FS
- - VFAT_FS
- - EXFAT_FS
- - NTFS_FS
- - NTFS_RW
  - PROC_KCORE: [-arm]
+ - TMPFS
  - TMPFS_POSIX_ACL
+ - TMPFS_XATTR
  - HUGETLBFS: [-arm]
  - ECRYPT_FS
  - ECRYPT_FS_MESSAGING
- - HFS_FS
- - HFSPLUS_FS
- - BFS_FS
- - UBIFS_FS
- - UBIFS_FS_ADVANCED_COMPR
- - UBIFS_ATIME_SUPPORT
- - UBIFS_FS_LZO
- - UBIFS_FS_ZLIB
- - UBIFS_FS_ZSTD
- - UBIFS_FS_SECURITY
- - SQUASHFS
- - SQUASHFS_FILE_DIRECT
- - SQUASHFS_XATTR
- - SQUASHFS_ZLIB
- - SQUASHFS_LZ4
- - SQUASHFS_LZO
- - SQUASHFS_XZ
- - SQUASHFS_ZSTD
- - SQUASHFS_4K_DEVBLK_SIZE
- - MINIX_FS
- - EROFS_FS
- - EROFS_FS_ZIP
- - EROFS_FS_XATTR
- - EROFS_FS_POSIX_ACL
- - EROFS_FS_SECURITY
- - EROFS_FS_DEBUG: n
- - EROFS_FS_CLUSTER_PAGE_LIMIT: 2
- - NFS_FS
- - NFS_V3_ACL
- - NFS_V4
- - NFS_V4_1
- - NFS_V4_2
- - ROOT_NFS
- - NFS_FSCACHE
- - NFS_DISABLE_UDP_SUPPORT: n
- - NFS_V4_2_READ_PLUS: [v5.11]
- - NFSD
- - NFSD_V3_ACL
- - NFSD_V4
- - NFSD_BLOCKLAYOUT
- - NFSD_SCSILAYOUT
- - NFSD_FLEXFILELAYOUT
- - NFSD_V4_2_INTER_SSC: [v5.7]
- - NFSD_V4_SECURITY_LABEL
- - CEPH_FS
- - CEPH_FSCACHE
- - CEPH_FS_POSIX_ACL
- - CIFS
- - CIFS_ALLOW_INSECURE_LEGACY
- - CIFS_WEAK_PW_HASH
- - CIFS_UPCALL
- - CIFS_XATTR
- - CIFS_POSIX
- - CIFS_DFS_UPCALL
- - CIFS_SMB_DIRECT
- - CIFS_FSCACHE
- - CIFS_DEBUG
- - CIFS_SWN_UPCALL: [v5.11]
- - AFS_FS
- - AFS_FSCACHE
- - 9P_FS
- - 9P_FSCACHE
- - 9P_FS_POSIX_ACL
- - 9P_FS_SECURITY
  - NLS_DEFAULT: "utf8"
+ - NLS_UTF8
  - NLS_CODEPAGE_437
  - NLS_CODEPAGE_737
  - NLS_CODEPAGE_775
diff --git a/dashboard/config/linux/bits/x86_64.yml b/dashboard/config/linux/bits/x86_64.yml
index 5af7651db..a7d67565b 100644
--- a/dashboard/config/linux/bits/x86_64.yml
+++ b/dashboard/config/linux/bits/x86_64.yml
@@ -10,7 +10,7 @@ config:
  # root=/dev/sda is not necessary correct, but it's a common setting and user arguments are appended
  # to the builtin command line, so user can always override this.
  # vsyscall=native required to run x86_64 executables on android kernels (it disables VDSO by default).
- - CMDLINE: [append, "root=/dev/sda console=ttyS0 vsyscall=native watchdog_thresh=55 workqueue.watchdog_thresh=140"]
+ - CMDLINE: [append, "root=/dev/sda console=ttyS0 vsyscall=native numa=fake=2 kvm-intel.nested=1 spec_store_bypass_disable=prctl nopcid vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 dummy_hcd.num=8 watchdog_thresh=55 workqueue.watchdog_thresh=140"]
  - CMDLINE_BOOL
 
  # Deterministic hang/stall detection.