dashboard/config/linux: enable some new configs

Enable new things in v5.11 that we can reach.

17 files changed, 60 insertions, 35 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
diff --git a/dashboard/config/linux/upstream-apparmor-kasan-base.config b/dashboard/config/linux/upstream-apparmor-kasan-base.config
index b50b2261a..0ef681c02 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan-base.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan-base.config
@@ -877,6 +877,7 @@ CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_KMAP_LOCAL=y
 CONFIG_SECRETMEM=y
 # end of Memory Management options
 
@@ -4943,8 +4944,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_KMAP_LOCAL=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
-# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config
index 31d0b9fd6..ada5640b7 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan.config
@@ -447,7 +447,7 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 # CONFIG_X86_INTEL_TSX_MODE_OFF is not set
 CONFIG_X86_INTEL_TSX_MODE_ON=y
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-# CONFIG_X86_SGX is not set
+CONFIG_X86_SGX=y
 # CONFIG_EFI is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
@@ -1001,6 +1001,7 @@ CONFIG_PERCPU_STATS=y
 CONFIG_READ_ONLY_THP_FOR_FS=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_KMAP_LOCAL=y
 CONFIG_SECRETMEM=y
 # end of Memory Management options
 
@@ -1235,7 +1236,7 @@ CONFIG_NF_DUP_NETDEV=y
 CONFIG_NFT_DUP_NETDEV=y
 CONFIG_NFT_FWD_NETDEV=y
 CONFIG_NFT_FIB_NETDEV=y
-# CONFIG_NFT_REJECT_NETDEV is not set
+CONFIG_NFT_REJECT_NETDEV=y
 CONFIG_NF_FLOW_TABLE_INET=y
 CONFIG_NF_FLOW_TABLE=y
 CONFIG_NETFILTER_XTABLES=y
@@ -1556,7 +1557,7 @@ CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BRIDGE_MRP=y
-# CONFIG_BRIDGE_CFM is not set
+CONFIG_BRIDGE_CFM=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
 # CONFIG_NET_DSA_TAG_AR9331 is not set
@@ -7673,7 +7674,7 @@ CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
-# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -8382,8 +8383,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_KMAP_LOCAL=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
-# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
diff --git a/dashboard/config/linux/upstream-arm64-kasan-base.config b/dashboard/config/linux/upstream-arm64-kasan-base.config
index 9db200389..af8f37ee5 100644
--- a/dashboard/config/linux/upstream-arm64-kasan-base.config
+++ b/dashboard/config/linux/upstream-arm64-kasan-base.config
@@ -174,6 +174,7 @@ CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_INITRAMFS_FORCE is not set
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
@@ -482,8 +483,8 @@ CONFIG_STACKPROTECTOR_PER_TASK=y
 #
 # CONFIG_ARM64_ACPI_PARKING_PROTOCOL is not set
 CONFIG_CMDLINE="earlyprintk=serial oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb watchdog_thresh=55 workqueue.watchdog_thresh=140 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 root=/dev/vda console=ttyAMA0"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+CONFIG_CMDLINE_EXTEND=y
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
diff --git a/dashboard/config/linux/upstream-arm64-kasan.config b/dashboard/config/linux/upstream-arm64-kasan.config
index 1b8e1b724..51171e93b 100644
--- a/dashboard/config/linux/upstream-arm64-kasan.config
+++ b/dashboard/config/linux/upstream-arm64-kasan.config
@@ -178,6 +178,7 @@ CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_INITRAMFS_FORCE is not set
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
@@ -224,9 +225,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
 CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_USERMODE_DRIVER=y
-CONFIG_BPF_PRELOAD=y
-CONFIG_BPF_PRELOAD_UMD=y
+# CONFIG_BPF_PRELOAD is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -490,8 +489,8 @@ CONFIG_STACKPROTECTOR_PER_TASK=y
 #
 # CONFIG_ARM64_ACPI_PARKING_PROTOCOL is not set
 CONFIG_CMDLINE="earlyprintk=serial oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb watchdog_thresh=55 workqueue.watchdog_thresh=140 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 root=/dev/vda console=ttyAMA0"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+CONFIG_CMDLINE_EXTEND=y
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
@@ -6971,7 +6970,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SWN_UPCALL is not set
+CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_SMB_DIRECT=y
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_ROOT is not set
diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config
index 578f383d4..f0db4756b 100644
--- a/dashboard/config/linux/upstream-kcsan.config
+++ b/dashboard/config/linux/upstream-kcsan.config
@@ -7703,7 +7703,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SWN_UPCALL is not set
+CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_SMB_DIRECT=y
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_ROOT is not set
diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config
index 914c99567..f20dba61c 100644
--- a/dashboard/config/linux/upstream-leak.config
+++ b/dashboard/config/linux/upstream-leak.config
@@ -7702,7 +7702,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SWN_UPCALL is not set
+CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_SMB_DIRECT=y
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_ROOT is not set
diff --git a/dashboard/config/linux/upstream-riscv64-kasan.config b/dashboard/config/linux/upstream-riscv64-kasan.config
index 4f25f1f2d..cde274198 100644
--- a/dashboard/config/linux/upstream-riscv64-kasan.config
+++ b/dashboard/config/linux/upstream-riscv64-kasan.config
@@ -6857,7 +6857,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SWN_UPCALL is not set
+CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_SMB_DIRECT=y
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_ROOT is not set
diff --git a/dashboard/config/linux/upstream-s390-kasan.config b/dashboard/config/linux/upstream-s390-kasan.config
index bd18cf68d..97e712050 100644
--- a/dashboard/config/linux/upstream-s390-kasan.config
+++ b/dashboard/config/linux/upstream-s390-kasan.config
@@ -6582,7 +6582,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SWN_UPCALL is not set
+CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_SMB_DIRECT=y
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_ROOT is not set
diff --git a/dashboard/config/linux/upstream-selinux-kasan-base.config b/dashboard/config/linux/upstream-selinux-kasan-base.config
index e8adb8d91..95e90300b 100644
--- a/dashboard/config/linux/upstream-selinux-kasan-base.config
+++ b/dashboard/config/linux/upstream-selinux-kasan-base.config
@@ -873,6 +873,7 @@ CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_KMAP_LOCAL=y
 CONFIG_SECRETMEM=y
 # end of Memory Management options
 
@@ -4941,8 +4942,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_KMAP_LOCAL=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
-# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config
index ecb4251e1..59f90c102 100644
--- a/dashboard/config/linux/upstream-selinux-kasan.config
+++ b/dashboard/config/linux/upstream-selinux-kasan.config
@@ -444,7 +444,7 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 # CONFIG_X86_INTEL_TSX_MODE_OFF is not set
 CONFIG_X86_INTEL_TSX_MODE_ON=y
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-# CONFIG_X86_SGX is not set
+CONFIG_X86_SGX=y
 # CONFIG_EFI is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
@@ -997,6 +997,7 @@ CONFIG_PERCPU_STATS=y
 CONFIG_READ_ONLY_THP_FOR_FS=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_KMAP_LOCAL=y
 CONFIG_SECRETMEM=y
 # end of Memory Management options
 
@@ -1231,7 +1232,7 @@ CONFIG_NF_DUP_NETDEV=y
 CONFIG_NFT_DUP_NETDEV=y
 CONFIG_NFT_FWD_NETDEV=y
 CONFIG_NFT_FIB_NETDEV=y
-# CONFIG_NFT_REJECT_NETDEV is not set
+CONFIG_NFT_REJECT_NETDEV=y
 CONFIG_NF_FLOW_TABLE_INET=y
 CONFIG_NF_FLOW_TABLE=y
 CONFIG_NETFILTER_XTABLES=y
@@ -1552,7 +1553,7 @@ CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BRIDGE_MRP=y
-# CONFIG_BRIDGE_CFM is not set
+CONFIG_BRIDGE_CFM=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
 # CONFIG_NET_DSA_TAG_AR9331 is not set
@@ -7669,7 +7670,7 @@ CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
-# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -8380,8 +8381,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_KMAP_LOCAL=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
-# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
diff --git a/dashboard/config/linux/upstream-smack-kasan-base.config b/dashboard/config/linux/upstream-smack-kasan-base.config
index d0b3ff1f3..308af9891 100644
--- a/dashboard/config/linux/upstream-smack-kasan-base.config
+++ b/dashboard/config/linux/upstream-smack-kasan-base.config
@@ -877,6 +877,7 @@ CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_KMAP_LOCAL=y
 CONFIG_SECRETMEM=y
 # end of Memory Management options
 
@@ -4942,8 +4943,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_KMAP_LOCAL=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
-# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config
index ad3bb0ce3..696065d50 100644
--- a/dashboard/config/linux/upstream-smack-kasan.config
+++ b/dashboard/config/linux/upstream-smack-kasan.config
@@ -447,7 +447,7 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 # CONFIG_X86_INTEL_TSX_MODE_OFF is not set
 CONFIG_X86_INTEL_TSX_MODE_ON=y
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-# CONFIG_X86_SGX is not set
+CONFIG_X86_SGX=y
 # CONFIG_EFI is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
@@ -1001,6 +1001,7 @@ CONFIG_PERCPU_STATS=y
 CONFIG_READ_ONLY_THP_FOR_FS=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_KMAP_LOCAL=y
 CONFIG_SECRETMEM=y
 # end of Memory Management options
 
@@ -1235,7 +1236,7 @@ CONFIG_NF_DUP_NETDEV=y
 CONFIG_NFT_DUP_NETDEV=y
 CONFIG_NFT_FWD_NETDEV=y
 CONFIG_NFT_FIB_NETDEV=y
-# CONFIG_NFT_REJECT_NETDEV is not set
+CONFIG_NFT_REJECT_NETDEV=y
 CONFIG_NF_FLOW_TABLE_INET=y
 CONFIG_NF_FLOW_TABLE=y
 CONFIG_NETFILTER_XTABLES=y
@@ -1556,7 +1557,7 @@ CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BRIDGE_MRP=y
-# CONFIG_BRIDGE_CFM is not set
+CONFIG_BRIDGE_CFM=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
 # CONFIG_NET_DSA_TAG_AR9331 is not set
@@ -7673,7 +7674,7 @@ CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
-# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -8381,8 +8382,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_KMAP_LOCAL=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
-# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
diff --git a/dashboard/config/linux/upstream-usb-base.config b/dashboard/config/linux/upstream-usb-base.config
index 8cf1855da..2b5090745 100644
--- a/dashboard/config/linux/upstream-usb-base.config
+++ b/dashboard/config/linux/upstream-usb-base.config
@@ -5138,7 +5138,7 @@ CONFIG_TRACE_EVENT_INJECT=y
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_SAMPLES is not set
diff --git a/dashboard/config/linux/upstream-usb.config b/dashboard/config/linux/upstream-usb.config
index 2655f2532..f42180913 100644
--- a/dashboard/config/linux/upstream-usb.config
+++ b/dashboard/config/linux/upstream-usb.config
@@ -7599,7 +7599,7 @@ CONFIG_TRACE_EVENT_INJECT=y
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_SAMPLES is not set