From 373b66cd2ba1fd05c72d0bbe16141fb287fe2eb3 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Mon, 29 Jan 2024 20:09:24 +0100
Subject: dashboard/configs: update linux configs

Regenerate the configs using the latest Linux revisions.
---
 dashboard/config/linux/bits/android-5.4.yml    |  2 +-
 dashboard/config/linux/bits/arm64_emu.yml      |  3 +++
 dashboard/config/linux/bits/base.yml           |  2 +-
 dashboard/config/linux/bits/bluetooth.yml      |  4 ++--
 dashboard/config/linux/bits/crypto.yml         |  4 ++--
 dashboard/config/linux/bits/debug.yml          |  2 +-
 dashboard/config/linux/bits/filesystems.yml    | 13 ++++++++-----
 dashboard/config/linux/bits/linux-next.yml     |  2 +-
 dashboard/config/linux/bits/linux-upstream.yml |  2 +-
 dashboard/config/linux/bits/net.yml            |  6 +++---
 dashboard/config/linux/bits/s390.yml           |  1 +
 dashboard/config/linux/bits/slab.yml           |  7 -------
 dashboard/config/linux/bits/stable-5.10.yml    |  2 +-
 dashboard/config/linux/bits/stable-6.1.yml     |  2 +-
 dashboard/config/linux/bits/subsystems.yml     | 15 ++++++++-------
 dashboard/config/linux/bits/wireless.yml       |  2 +-
 16 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 dashboard/config/linux/bits/slab.yml

(limited to 'dashboard/config/linux/bits')

diff --git a/dashboard/config/linux/bits/android-5.4.yml b/dashboard/config/linux/bits/android-5.4.yml
index 67494f65a..120e195b9 100644
--- a/dashboard/config/linux/bits/android-5.4.yml
+++ b/dashboard/config/linux/bits/android-5.4.yml
@@ -7,7 +7,7 @@
 # Following branch: android12-5.4-lts
 kernel:
  repo: https://android.googlesource.com/kernel/common
- tag: a685e2b8849a9
+ tag: 9d0640602d7e666873e78b3d1877b8eadf529027
 
 shell:
  - make gki_defconfig
diff --git a/dashboard/config/linux/bits/arm64_emu.yml b/dashboard/config/linux/bits/arm64_emu.yml
index 8aa555e9a..b74f4732d 100644
--- a/dashboard/config/linux/bits/arm64_emu.yml
+++ b/dashboard/config/linux/bits/arm64_emu.yml
@@ -902,6 +902,9 @@ config:
 
  # Disable whole menu "PHY Subsystem"
  - GENERIC_PHY: n
+ - GENERIC_PHY_MIPI_DPHY: n
+ - PHY_CADENCE_DPHY_RX: n
+ - PHY_FSL_IMX8M_PCIE: n
  - PHY_CAN_TRANSCEIVER: [n, v6.3]
  - PHY_LPC18XX_USB_OTG: n
  - PHY_PISTACHIO_USB: n
diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 048e9f461..6b4495919 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -171,7 +171,7 @@ config:
  - SECURITYFS
 
  # More debugging info is always good.
- - NMI_CHECK_CPU: [linux-next]
+ - NMI_CHECK_CPU: [x86_64, v6.3]
 
  # 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.
diff --git a/dashboard/config/linux/bits/bluetooth.yml b/dashboard/config/linux/bits/bluetooth.yml
index bdb2bd9a2..a925b4530 100644
--- a/dashboard/config/linux/bits/bluetooth.yml
+++ b/dashboard/config/linux/bits/bluetooth.yml
@@ -27,5 +27,5 @@ config:
  - BT_HCIUART_MRVL
  - BT_HCIBFUSB
  - BT_HCIVHCI
- - BT_LE_L2CAP_ECRED: [linux-next]
- - BT_HCIBTUSB_POLL_SYNC: [linux-next]
+ - BT_LE_L2CAP_ECRED: [v6.2]
+ - BT_HCIBTUSB_POLL_SYNC: [v6.2]
diff --git a/dashboard/config/linux/bits/crypto.yml b/dashboard/config/linux/bits/crypto.yml
index 045610fcb..36df269ef 100644
--- a/dashboard/config/linux/bits/crypto.yml
+++ b/dashboard/config/linux/bits/crypto.yml
@@ -9,9 +9,9 @@ config:
  - CRYPTO_CURVE25519: [v5.6]
  - CRYPTO_CHACHA20POLY1305
  - CRYPTO_AEGIS128
- - CRYPTO_CFB
+ - CRYPTO_CFB: [-v5.8]
  - CRYPTO_LRW
- - CRYPTO_OFB
+ - CRYPTO_OFB: [-v5.8]
  - CRYPTO_CTS
  - CRYPTO_XTS
  - CRYPTO_KEYWRAP
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index 6152704af..b7359a6f6 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -26,7 +26,7 @@ config:
  - DEBUG_DEVRES
  - DEBUG_MEMORY_INIT
  - DEBUG_NOTIFIERS
- - DEBUG_CREDENTIALS
+ - DEBUG_CREDENTIALS: [-v6.8]
  - DEBUG_TIMEKEEPING
  - DEBUG_OBJECTS
  - DEBUG_OBJECTS_ENABLE_DEFAULT: 1
diff --git a/dashboard/config/linux/bits/filesystems.yml b/dashboard/config/linux/bits/filesystems.yml
index 4da6604c6..1e3d5bd4b 100644
--- a/dashboard/config/linux/bits/filesystems.yml
+++ b/dashboard/config/linux/bits/filesystems.yml
@@ -11,8 +11,8 @@ config:
  - MSDOS_FS
  - VFAT_FS
  - EXFAT_FS
- - NTFS_FS
- - NTFS_RW
+ - NTFS_FS: [-linux-next]
+ - NTFS_RW: [-linux-next]
  - NTFS3_FS: [v5.15]
  - NTFS3_64BIT_CLUSTER: n
  - NTFS3_LZX_XPRESS: [v5.15]
@@ -195,6 +195,9 @@ config:
  - ROMFS_ON_BLOCK
  - ROMFS_ON_MTD
 
- - BCACHEFS_FS: [linux-next]
- - BCACHEFS_QUOTA: [linux-next]
- - BCACHEFS_DEBUG: [linux-next]
+ - BCACHEFS_FS: [v6.7]
+ - BCACHEFS_QUOTA: [v6.7]
+ - BCACHEFS_DEBUG: [v6.7]
+
+ - FSCACHE
+ - CACHEFILES
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index b33107826..05f83da42 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-20231108
+ tag: next-20240129
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index a709b2536..2c71aa403 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.6-rc6
+ tag: v6.8-rc2
diff --git a/dashboard/config/linux/bits/net.yml b/dashboard/config/linux/bits/net.yml
index f57948ae6..1f46c9d79 100644
--- a/dashboard/config/linux/bits/net.yml
+++ b/dashboard/config/linux/bits/net.yml
@@ -318,14 +318,14 @@ config:
  - NET_SCH_ETS: [v5.5]
  - NET_SCH_DEFAULT
  - NET_CLS_BASIC
- - NET_CLS_TCINDEX: [-v6.3, -stable-5.10]
+ - NET_CLS_TCINDEX: [-v6.3, -stable-5.10, -stable-6.1]
  - NET_CLS_ROUTE4
  - NET_CLS_FW
  - NET_CLS_U32
  - CLS_U32_PERF
  - CLS_U32_MARK
- - NET_CLS_RSVP: [-v6.3]
- - NET_CLS_RSVP6: [-v6.3]
+ - NET_CLS_RSVP: [-v6.3, -stable-5.10, -stable-6.1]
+ - NET_CLS_RSVP6: [-v6.3, -stable-5.10, -stable-6.1]
  - NET_CLS_FLOW
  - NET_CLS_CGROUP
  - NET_CLS_BPF
diff --git a/dashboard/config/linux/bits/s390.yml b/dashboard/config/linux/bits/s390.yml
index a1f62842f..5b65c9fbd 100644
--- a/dashboard/config/linux/bits/s390.yml
+++ b/dashboard/config/linux/bits/s390.yml
@@ -10,3 +10,4 @@ config:
  - CMDLINE: [n, override]
  # See the comment in x86_64.yml re these numbers.
  - RCU_CPU_STALL_TIMEOUT: 300
+ - COMPAT
diff --git a/dashboard/config/linux/bits/slab.yml b/dashboard/config/linux/bits/slab.yml
deleted file mode 100644
index 621f14471..000000000
--- a/dashboard/config/linux/bits/slab.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2020 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:
- - SLAB
- # SLAB allocator is being deprecated (currently in -next).
- - SLAB_DEPRECATED: [v6.4]
diff --git a/dashboard/config/linux/bits/stable-5.10.yml b/dashboard/config/linux/bits/stable-5.10.yml
index acab57458..f16d32666 100644
--- a/dashboard/config/linux/bits/stable-5.10.yml
+++ b/dashboard/config/linux/bits/stable-5.10.yml
@@ -3,4 +3,4 @@
 
 kernel:
  repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
- tag: v5.10.186
+ tag: v5.10.209
diff --git a/dashboard/config/linux/bits/stable-6.1.yml b/dashboard/config/linux/bits/stable-6.1.yml
index fe86d611d..c515ef724 100644
--- a/dashboard/config/linux/bits/stable-6.1.yml
+++ b/dashboard/config/linux/bits/stable-6.1.yml
@@ -3,4 +3,4 @@
 
 kernel:
  repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
- tag: v6.1.15
+ tag: v6.1.75
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 58c17013d..5a62fc9ea 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -26,8 +26,8 @@ config:
  - NUMA_EMU: [x86_64]
  - NUMA_BALANCING: [-arm]
  - NUMA_BALANCING_DEFAULT_ENABLED: [-arm]
- - ADDRESS_MASKING: [x86_64, linux-next]
- - X86_USER_SHADOW_STACK: [x86_64, linux-next]
+ - ADDRESS_MASKING: [x86_64, v6.4]
+ - X86_USER_SHADOW_STACK: [x86_64, v6.6]
  # KMSAN disables HYPERVISOR_GUEST which is required to enable this.
  - X86_X2APIC: [x86_64, -kmsan]
  - CGROUPS
@@ -70,7 +70,9 @@ config:
  - KVM_AMD: [x86_64]
  - KVM_XEN: [x86_64, v5.12]
  - KVM_PROVE_MMU: [x86_64, v6.6]
-   # KMSAN disables HYPERVISOR_GUEST which is required to enable X86_X2APIC
+ - KVM_SW_PROTECTED_VM: [linux-next]
+ - KVM_HYPERV: [x86_64, linux-next]
+ # KMSAN disables HYPERVISOR_GUEST which is required to enable X86_X2APIC
  # which is required to enable this.
  - X86_SGX: [x86_64, v5.11, -kmsan]
  - X86_SGX_KVM: [x86_64, v6.0, -kmsan]
@@ -105,6 +107,7 @@ config:
  - CMA
  - MEM_SOFT_DIRTY: [x86_64]
  - ZSWAP
+ - ZSWAP_SHRINKER_DEFAULT_ON: [v6.8]
  - ZSMALLOC
  - IDLE_PAGE_TRACKING: [-v5.15]
  - ZONE_DEVICE: [-arm, -riscv, -s390]
@@ -193,8 +196,8 @@ config:
  - ATA_BMDMA
  - ATA_GENERIC
  - MD
- - MD_LINEAR
- - MD_MULTIPATH
+ - MD_LINEAR: [-v6.8]
+ - MD_MULTIPATH: [-v6.8]
  - BCACHE
  - BLK_DEV_DM
  - DM_CRYPT
@@ -496,8 +499,6 @@ config:
  - FUSE_DAX: [v5.10, x86_64]
  - CUSE
  - VIRTIO_FS
- - FSCACHE
- - CACHEFILES
  - PROC_KCORE: [-arm]
  - TMPFS
  - TMPFS_POSIX_ACL
diff --git a/dashboard/config/linux/bits/wireless.yml b/dashboard/config/linux/bits/wireless.yml
index 9276fb89a..68cb40e4f 100644
--- a/dashboard/config/linux/bits/wireless.yml
+++ b/dashboard/config/linux/bits/wireless.yml
@@ -4,7 +4,7 @@
 config:
  - WIRELESS_WDS: [-v5.10]
  - MAC80211_HWSIM
- - USB_NET_RNDIS_WLAN
+ - USB_NET_RNDIS_WLAN: [-v6.8]
  - VIRT_WIFI
  - CFG80211
  - CFG80211_DEBUGFS
-- 
cgit mrf-deployment