dashboard/config/linux: update configs

Update the configs to the latest Linux versions: v6.2-rc5 and
next-20230124.

Enable CONFIG_NMI_CHECK_CPU and rcupdate.rcu_cpu_stall_cputime.

7 files changed, 16 insertions, 6 deletions

diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index b3edeb9f0..e9bd940e2 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -28,7 +28,7 @@ config:
  # Huge page overcommit is disabled by default, allowing some overcommit
  # with vm.nr_overcommit_hugepages is intended to give more coverage.
  # secretmem_enable enables memfd_secret syscall.
- - 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 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 secretmem.enable=1 sysctl.max_rcu_stall_to_panic=1 msr.allow_writes=off coredump_filter=0xffff"
+ - 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 rcupdate.rcu_cpu_stall_cputime=1 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 secretmem.enable=1 sysctl.max_rcu_stall_to_panic=1 msr.allow_writes=off coredump_filter=0xffff"
 
  # We don't need lots, but some configs set it to 2 which is too low.
  - NR_CPUS: 8
@@ -127,7 +127,8 @@ config:
  - DEBUG_FS
 
  # Required for KCOV but also eliminates unnecessary non-determinism.
- - RELOCATABLE: n
+ # For s390, it's always enabled after the `s390: always build relocatable kernel` commit.
+ - RELOCATABLE: [n, -s390]
  - RANDOMIZE_BASE: n
 
  # Print thread and CPU ids.
@@ -162,6 +163,9 @@ config:
  - CONFIGFS_FS
  - SECURITYFS
 
+ # More debugging info is always good.
+ - NMI_CHECK_CPU: [linux-next]
+
  # If syzkaller gets to /dev/{mem,kmem,ioport}, it will destroy the machine.
  # It managed to do so with some mount's, chdir's and bogus file names.
  # These are not needed for fuzzing, so completely disabling them is
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index 17b9ad2e2..695c481bd 100644
--- a/dashboard/config/linux/bits/linux-next.yml
+++ b/dashboard/config/linux/bits/linux-next.yml
@@ -3,4 +3,4 @@
 
 kernel:
  repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git
- tag: next-20221111
+ tag: next-20230124
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index 28b9d3712..19526a86c 100644
--- a/dashboard/config/linux/bits/linux-upstream.yml
+++ b/dashboard/config/linux/bits/linux-upstream.yml
@@ -3,4 +3,4 @@
 
 kernel:
  repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
- tag: v6.1-rc4
+ tag: v6.2-rc5
diff --git a/dashboard/config/linux/bits/net.yml b/dashboard/config/linux/bits/net.yml
index 4d5e9fa83..3f87259e8 100644
--- a/dashboard/config/linux/bits/net.yml
+++ b/dashboard/config/linux/bits/net.yml
@@ -232,7 +232,8 @@ config:
  - IP_NF_TARGET_NETMAP
  - IP_NF_TARGET_REDIRECT
  - IP_NF_MANGLE
- - IP_NF_TARGET_CLUSTERIP
+ # IP_NF_TARGET_CLUSTERIP is removed as of next-20230124.
+ - IP_NF_TARGET_CLUSTERIP: [-linux-next]
  - IP_NF_TARGET_ECN
  - IP_NF_TARGET_TTL
  - IP_NF_RAW
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 528b5698f..288d73310 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -448,7 +448,8 @@ config:
  - CHROME_PLATFORMS: n
  - AMD_IOMMU: n
  - INTEL_IOMMU: [x86_64]
- - IOMMUFD: [linux-next]
+ # IOMMUFD must be enabled in order to keep VFIO_CONTAINER disabled.
+ - IOMMUFD: [v6.2]
  - IOMMUFD_TEST: [linux-next]
  # Generally we should not enable this since we don't run any boot unit tests.
  # The only reason to enable it is IOMMUFD_TEST, which really shouldn't
diff --git a/dashboard/config/linux/bits/timeouts_emu.yml b/dashboard/config/linux/bits/timeouts_emu.yml
index 025c25002..b72d369a6 100644
--- a/dashboard/config/linux/bits/timeouts_emu.yml
+++ b/dashboard/config/linux/bits/timeouts_emu.yml
@@ -9,4 +9,6 @@ config:
  - RCU_CPU_STALL_TIMEOUT: 300
  - DEFAULT_HUNG_TASK_TIMEOUT: [420, -nonoise, -kmsan, -kcsan, -kmemleak]
  # 21000 is the max value for the config, so we don't multiply it.
+ # TODO: `rcu: Allow up to five minutes expedited RCU CPU stall-warning timeouts` lets us set more than 21k,
+ # but we first need to change the config generation tool to support multiple possible parameter values.
  - RCU_EXP_CPU_STALL_TIMEOUT: [21000, v5.19]
diff --git a/dashboard/config/linux/bits/timeouts_native.yml b/dashboard/config/linux/bits/timeouts_native.yml
index efe6b3984..46baa03b4 100644
--- a/dashboard/config/linux/bits/timeouts_native.yml
+++ b/dashboard/config/linux/bits/timeouts_native.yml
@@ -32,4 +32,6 @@ config:
  - DEFAULT_HUNG_TASK_TIMEOUT: [140, -nonoise, -kmsan, -kcsan, -kmemleak]
  # By default it is set to a too small value, which causes tons of
  # `rcu_preempt detected expedited stalls on CPUs/tasks`.
+ # TODO: `rcu: Allow up to five minutes expedited RCU CPU stall-warning timeouts` lets us set more than 21k,
+ # but we first need to change the config generation tool to support multiple possible parameter values.
  - RCU_EXP_CPU_STALL_TIMEOUT: [21000, v5.19]