aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/bits
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-12-27 13:08:00 +0100
committerDmitry Vyukov <dvyukov@google.com>2020-12-27 13:51:08 +0100
commit2242f77fdc5a6c50bd8fa1021d2abc8b83e09e8d (patch)
treeb1e67707a70d02557e3b1bd72e6c488af6ff24ed /dashboard/config/linux/bits
parent868e895af6671a803b7458454066dcbd3992a68a (diff)
dashboard/config/linux: enable some new configs
Enable new things in v5.11 that we can reach.
Diffstat (limited to 'dashboard/config/linux/bits')
-rw-r--r--dashboard/config/linux/bits/arm64.yml1
-rw-r--r--dashboard/config/linux/bits/debug.yml4
-rw-r--r--dashboard/config/linux/bits/subsystems.yml14
3 files changed, 16 insertions, 3 deletions
diff --git a/dashboard/config/linux/bits/arm64.yml b/dashboard/config/linux/bits/arm64.yml
index 0db8e9667..412da07e5 100644
--- a/dashboard/config/linux/bits/arm64.yml
+++ b/dashboard/config/linux/bits/arm64.yml
@@ -8,6 +8,7 @@ shell:
config:
- CMDLINE: [append, "root=/dev/vda console=ttyAMA0"]
+ - CMDLINE_EXTEND
# These are enabled by defconfig, but we don't test them (presumably).
# Disable them to speed up kernel boot (slow in emulation).
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index 0acd53efa..5899ba2d1 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -23,6 +23,8 @@ config:
- DEBUG_VM_VMACACHE
- DEBUG_VM_PGFLAGS
- DEBUG_VM_PGTABLE: [v5.8]
+ # v5.11
+ - DEBUG_KMAP_LOCAL_FORCE_MAP: [linux-next]
- DEBUG_VIRTUAL: [-s390]
- LOCKUP_DETECTOR: [-s390]
- SOFTLOCKUP_DETECTOR: [-s390]
@@ -54,5 +56,7 @@ config:
- PTDUMP_DEBUGFS: [v5.8]
- HARDLOCKUP_DETECTOR: [x86_64]
- BOOTPARAM_HARDLOCKUP_PANIC: [x86_64]
+ # TODO: replace this with v5.11 once it reaches linux-next.
+ - RING_BUFFER_VALIDATE_TIME_DELTAS: [x86_64, upstream]
# The check runs episodically, so won't be attributed to a test. And can happen on any memory corruption.
- X86_CHECK_BIOS_CORRUPTION: n
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 925117a3c..dd1385428 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -65,6 +65,7 @@ config:
- KVM: [-riscv]
- KVM_INTEL: [x86_64]
- KVM_AMD: [x86_64]
+ - X86_SGX: [x86_64, linux-next]
- JUMP_LABEL
- MODULES
- MODULE_UNLOAD
@@ -260,6 +261,7 @@ config:
- NFT_QUEUE
- NFT_QUOTA
- NFT_REJECT
+ - NFT_REJECT_NETDEV: [linux-next]
- NFT_COMPAT
- NFT_HASH
- NFT_FIB_INET
@@ -479,6 +481,8 @@ config:
- BRIDGE_VLAN_FILTERING
- BRIDGE_IGMP_SNOOPING
- BRIDGE_MRP: [v5.8]
+ # v5.11
+ - BRIDGE_CFM: [linux-next]
- NET_DSA: [-s390]
- VLAN_8021Q
- VLAN_8021Q_GVRP
@@ -620,12 +624,12 @@ config:
- CGROUP_NET_PRIO
- BPF_JIT
- BPF_STREAM_PARSER
- # riscv/s390 build of BPF_PRELOAD fails with missing libelf and zlib.
+ # Cross-builds of BPF_PRELOAD fails with missing libelf and zlib.
# I am not sure why it needs non-host versions of these libs,
# and it's probably possible to install them somehow, but I did not figure out how,
# so for now this is disabled.
- - BPF_PRELOAD: [v5.10, -riscv, -s390]
- - BPF_PRELOAD_UMD: [v5.10, -riscv, -s390]
+ - BPF_PRELOAD: [v5.10, x86_64]
+ - BPF_PRELOAD_UMD: [v5.10, x86_64]
- CAN
- CAN_J1939
- CAN_VCAN
@@ -1320,6 +1324,8 @@ config:
- ROOT_NFS
- NFS_FSCACHE
- NFS_DISABLE_UDP_SUPPORT: n
+ # v5.11
+ - NFS_V4_2_READ_PLUS: [linux-next]
- NFSD
- NFSD_V3_ACL
- NFSD_V4
@@ -1341,6 +1347,8 @@ config:
- CIFS_SMB_DIRECT
- CIFS_FSCACHE
- CIFS_DEBUG
+ # TODO: replace this with v5.11 once it reaches linux-next.
+ - CIFS_SWN_UPCALL: [upstream]
- AFS_FS
- AFS_FSCACHE
- 9P_FS