dashboard/config/linux: update upstream configs

Update mainline and linux-next revisions to the latest tags
and fix configs that broke.

NF_FLOW_TABLE_IPV4/6 were removed in:
commit c42ba4290b2147aa033d17f22151494515655d77
netfilter: flowtable: remove ipv4/ipv6 modules

CONFIG_DAX_DRIVER was removed in:
commit afd586f0d06ce3d81b7c474499630fec88833828
dax: remove CONFIG_DAX_DRIVER

BLK_DEV_CRYPTOLOOP was removed in:
commit 47e9624616c80c9879feda536c48c6a3a0ed9835
block: remove support for cryptoloop and the xor transfer

NFT_COUNTER was removed in:
commit 023223dfbfb34fcc9b7dd41e21fbf9a5d5237989
netfilter: nf_tables: make counter support built-in

ICST was renamed to CLK_ICST in:
commit 323fd5955f844d1b6acf1a1af488da460f657ff2
clk: versatile: Rename ICST to CLK_ICST

APPARMOR_INTROSPECT_POLICY was added as requirement for other configs
we enabled in:
commit abfb9c0725f274c75ca2a51684c2dd842a8dc254
apparmor: make export of raw binary profile to userspace optional

10 files changed, 27 insertions, 23 deletions

diff --git a/dashboard/config/linux/bits/apparmor.yml b/dashboard/config/linux/bits/apparmor.yml
index 1349a9947..7c8ecb55f 100644
--- a/dashboard/config/linux/bits/apparmor.yml
+++ b/dashboard/config/linux/bits/apparmor.yml
@@ -5,6 +5,8 @@ config:
  - SECURITY_SELINUX: n
  - SECURITY_SMACK: n
  - SECURITY_APPARMOR
+ # TODO: remove linux-next once it reaches mainline.
+ - SECURITY_APPARMOR_INTROSPECT_POLICY: [v5.17, linux-next]
  - SECURITY_APPARMOR_HASH
  - SECURITY_APPARMOR_HASH_DEFAULT
  - SECURITY_APPARMOR_DEBUG
diff --git a/dashboard/config/linux/bits/arm64.yml b/dashboard/config/linux/bits/arm64.yml
index a94d08a8f..08e950cc6 100644
--- a/dashboard/config/linux/bits/arm64.yml
+++ b/dashboard/config/linux/bits/arm64.yml
@@ -23,7 +23,8 @@ config:
  - ARCH_VEXPRESS
  - I2C_VERSATILE
  - CLK_SP810
- - ICST
+ - ICST: [-v5.16]
+ - CLK_ICST: [v5.16]
 
  # 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/base.yml b/dashboard/config/linux/bits/base.yml
index 95e4ef7ff..2b0931082 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -94,6 +94,9 @@ config:
  # Added in 919067cc845f ("net: add CONFIG_PCPU_DEV_REFCNT") and should appear in v5.13.
  - PCPU_DEV_REFCNT: [n, v5.13]
 
+ - NET_DEV_REFCNT_TRACKER: [v5.17]
+ - NET_NS_REFCNT_TRACKER: [v5.17]
+
  # This config does not add any debug checks (only debug output).
  - DEBUG_KOBJECT: n
 
@@ -109,9 +112,11 @@ config:
  # KCOV slows down execution too much with KASAN_HW_TAGS and in qemu emulation in general.
  # KCOV crashes on Arm:
  # https://lore.kernel.org/linux-arm-kernel/20210119130010.GA2338@C02TD0UTHF1T.local/T/#m78fdfcc41ae831f91c93ad5dabe63f7ccfb482f0
- - KCOV: [-arm64, -arm]
- - KCOV_INSTRUMENT_ALL: [-arm64, -arm]
- - KCOV_ENABLE_COMPARISONS: [-arm64, -arm]
+ # KCOV is not supported on s390 with our toolchain now, config depends on:
+ # (!ARCH_WANTS_NO_INSTR [=y] || STACK_VALIDATION [=n] || GCC_VERSION [=110200]>=120000 || CLANG_VERSION [=0]>=130000)
+ - KCOV: [-arm64, -arm, -s390]
+ - KCOV_INSTRUMENT_ALL: [-arm64, -arm, -s390]
+ - KCOV_ENABLE_COMPARISONS: [-arm64, -arm, -s390]
  - DEBUG_FS
 
  # Required for KCOV but also eliminates unnecessary non-determinism.
@@ -168,6 +173,9 @@ config:
  # Don't test/need this (may be enabled via HID_HYPERV_MOUSE in USB/HID configs).
  - HYPERV: n
 
+ # Don't test/need this.
+ - XEN: n
+
  # These are legacy gadget drivers that we don't reach/test and some of these break boot:
  # https://github.com/google/syzkaller/pull/1975#issuecomment-712807462
  - USB_G_NCM: n
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index d05d690fd..099c02be2 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -3,15 +3,6 @@
 
 # Auxiliary debug configs that detect non-critical bugs.
 
-# These configs are only in net-next at this point,
-# but we don't have a special config for net-next built on net-next.
-# TODO: once it reaches mainline change to:
-# - NET_DEV_REFCNT_TRACKER: [v5.17]
-# - NET_NS_REFCNT_TRACKER: [v5.17]
-verbatim: |
- CONFIG_NET_DEV_REFCNT_TRACKER=y
- CONFIG_NET_NS_REFCNT_TRACKER=y
-
 config:
  # Instances that use nonoise also ignore WARNINGs, so they don't want panic_on_warn.
  - CMDLINE: [append, "panic_on_warn=1"]
diff --git a/dashboard/config/linux/bits/kasan.yml b/dashboard/config/linux/bits/kasan.yml
index 3a6ea51c2..0de1c1f92 100644
--- a/dashboard/config/linux/bits/kasan.yml
+++ b/dashboard/config/linux/bits/kasan.yml
@@ -9,9 +9,9 @@ config:
  - KASAN_STACK: [clang, v5.11]
  - KASAN_VMALLOC: [v5.5, -arm, -arm64, -s390, -riscv]
  # This was historically enabled in the KASAN section without explanation.
- - SPARSEMEM_VMEMMAP: [-arm]
+ - SPARSEMEM_VMEMMAP: [-arm, -riscv]
  # This is required to enable SPARSEMEM_VMEMMAP.
- - SPARSEMEM_MANUAL: [-arm, -arm64, -s390]
+ - SPARSEMEM_MANUAL: [-arm, -arm64, -s390, -v5.17]
  # This allows to get alloc/free stacks for UAFs on freed pages.
  # This also needs page_owner=on in cmdline.
  - PAGE_OWNER
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index 4fcf55807..c17840d69 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-20211012
+ tag: next-20220127
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index a51a58fbd..676e06016 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: v5.15
+ tag: v5.17-rc1
diff --git a/dashboard/config/linux/bits/net-extra.yml b/dashboard/config/linux/bits/net-extra.yml
index 9a2fba63d..8fcaa5f32 100644
--- a/dashboard/config/linux/bits/net-extra.yml
+++ b/dashboard/config/linux/bits/net-extra.yml
@@ -23,7 +23,7 @@ config:
 
  - BATMAN_ADV
  - BATMAN_ADV_NC
- - BATMAN_ADV_SYSFS: [-v5.11, -linux-next]
+ - BATMAN_ADV_SYSFS: [-v5.11]
  - BATMAN_ADV_BATMAN_V
  - BATMAN_ADV_BLA
  - BATMAN_ADV_DAT
diff --git a/dashboard/config/linux/bits/net.yml b/dashboard/config/linux/bits/net.yml
index 0b810b54d..bbe99008d 100644
--- a/dashboard/config/linux/bits/net.yml
+++ b/dashboard/config/linux/bits/net.yml
@@ -128,7 +128,7 @@ config:
  - NFT_NUMGEN
  - NFT_CT
  - NFT_FLOW_OFFLOAD
- - NFT_COUNTER
+ - NFT_COUNTER: [-v5.17]
  - NFT_CONNLIMIT
  - NFT_LOG
  - NFT_LIMIT
@@ -217,7 +217,7 @@ config:
  - NFT_DUP_IPV4
  - NFT_FIB_IPV4
  - NF_TABLES_ARP
- - NF_FLOW_TABLE_IPV4
+ - NF_FLOW_TABLE_IPV4: [-v5.17]
  - NF_LOG_ARP
  - IP_NF_IPTABLES
  - IP_NF_MATCH_AH
@@ -242,7 +242,7 @@ config:
  - IP_NF_ARP_MANGLE
  - NFT_DUP_IPV6
  - NFT_FIB_IPV6
- - NF_FLOW_TABLE_IPV6
+ - NF_FLOW_TABLE_IPV6: [-v5.17]
  - IP6_NF_IPTABLES
  - IP6_NF_MATCH_AH
  - IP6_NF_MATCH_EUI64
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index e85594ce1..0b6c087ed 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -132,7 +132,8 @@ config:
  - NVDIMM_PFN: [x86_64]
  - NVDIMM_DAX: [x86_64]
  - OF_PMEM: [x86_64]
- - DAX_DRIVER: [x86_64]
+ - DAX: [x86_64]
+ - DEV_DAX: [x86_64]
  - BLK_DEV_NULL_BLK
  - BLK_DEV_NULL_BLK_FAULT_INJECTION
  - BLK_DEV_FD: [x86_64]
@@ -140,7 +141,7 @@ config:
  - BLK_DEV_LOOP
  # Loop device per test process.
  - BLK_DEV_LOOP_MIN_COUNT: 16
- - BLK_DEV_CRYPTOLOOP
+ - BLK_DEV_CRYPTOLOOP: [-v5.16]
  - BLK_DEV_NBD
  - BLK_DEV_RAM
  - ATA_OVER_ETH
@@ -540,4 +541,5 @@ config:
  - W1: n
  - DAMON: [v5.15]
  - DAMON_VADDR: [v5.15]
+ - DAMON_PADDR: [v5.16]
  - DAMON_DBGFS: [v5.15]