From b765b04aeea9a558fdff8dd038b70d0313c95bd6 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Wed, 29 Jan 2025 13:24:15 +0100 Subject: dashboard/config/linux: update to v6.13 and latest next Remove the deprecated options. Replace old "linux-next" conditions with the version numbers. --- dashboard/config/linux/bits/bluetooth.yml | 2 +- dashboard/config/linux/bits/crypto.yml | 17 +++++++++++------ dashboard/config/linux/bits/debug.yml | 2 +- dashboard/config/linux/bits/filesystems.yml | 10 +++++----- dashboard/config/linux/bits/kasan.yml | 2 +- dashboard/config/linux/bits/linux-next.yml | 2 +- dashboard/config/linux/bits/linux-upstream.yml | 2 +- dashboard/config/linux/bits/subsystems.yml | 20 ++++++++++++-------- 8 files changed, 33 insertions(+), 24 deletions(-) (limited to 'dashboard/config/linux/bits') diff --git a/dashboard/config/linux/bits/bluetooth.yml b/dashboard/config/linux/bits/bluetooth.yml index 7a741d879..0cdf293c3 100644 --- a/dashboard/config/linux/bits/bluetooth.yml +++ b/dashboard/config/linux/bits/bluetooth.yml @@ -9,7 +9,7 @@ config: - BT_BNEP - BT_BNEP_MC_FILTER - BT_BNEP_PROTO_FILTER - - BT_CMTP + - BT_CMTP: [-v6.12] - BT_HIDP - BT_LE - BT_HS: [-v6.9] diff --git a/dashboard/config/linux/bits/crypto.yml b/dashboard/config/linux/bits/crypto.yml index ee7440e50..ecf5103da 100644 --- a/dashboard/config/linux/bits/crypto.yml +++ b/dashboard/config/linux/bits/crypto.yml @@ -14,10 +14,12 @@ config: - CRYPTO_OFB: [-v5.8] - CRYPTO_CTS - CRYPTO_XTS - - CRYPTO_KEYWRAP + # Removed in "crypto: keywrap - remove unused keywrap algorithm". + - CRYPTO_KEYWRAP: [-linux-next] - CRYPTO_ADIANTUM - CRYPTO_XCBC - - CRYPTO_VMAC + # Removed in "crypto: vmac - remove unused VMAC algorithm". + - CRYPTO_VMAC: [-linux-next] - CRYPTO_BLAKE2S: [v5.6, -v5.15] - CRYPTO_BLAKE2S_X86: [v6.1, x86_64, -kmsan] - CRYPTO_BLAKE2S_ARM: [v6.1, arm] @@ -83,9 +85,11 @@ config: - CRYPTO_AEGIS128_AESNI_SSE2: [x86_64, -kmsan] - CRYPTO_NHPOLY1305_SSE2: [x86_64, -kmsan] - CRYPTO_NHPOLY1305_AVX2: [x86_64, -kmsan] - - CRYPTO_CRC32C_INTEL: [x86_64, -kmsan] - - CRYPTO_CRC32_PCLMUL: [x86_64, -kmsan] - - CRYPTO_CRCT10DIF_PCLMUL: [x86_64, -kmsan] + # These two were removed in "x86/crc32: expose CRC32 functions through lib". + - CRYPTO_CRC32C_INTEL: [x86_64, -kmsan, -linux-next] + - CRYPTO_CRC32_PCLMUL: [x86_64, -kmsan, -linux-next] + # Removed in "x86/crc-t10dif: expose CRC-T10DIF function through lib". + - CRYPTO_CRCT10DIF_PCLMUL: [x86_64, -kmsan, -linux-next] - CRYPTO_SHA1_SSSE3: [x86_64, -kmsan] - CRYPTO_SHA256_SSSE3: [x86_64, -kmsan] - CRYPTO_SHA512_SSSE3: [x86_64, -kmsan] @@ -127,7 +131,8 @@ config: - CRYPTO_SM4_ARM64_CE_BLK: [arm64, v6.1] - CRYPTO_SM4_ARM64_NEON_BLK: [arm64, v6.1] - CRYPTO_GHASH_ARM64_CE: [arm64] - - CRYPTO_CRCT10DIF_ARM64_CE: [arm64] + # Removed in "arm64/crc-t10dif: expose CRC-T10DIF function through lib". + - CRYPTO_CRCT10DIF_ARM64_CE: [arm64, -linux-next] - CRYPTO_AES_ARM64: [arm64] - CRYPTO_AES_ARM64_CE: [arm64] - CRYPTO_AES_ARM64_CE_CCM: [arm64] diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml index 9ebca7a95..03e0ba045 100644 --- a/dashboard/config/linux/bits/debug.yml +++ b/dashboard/config/linux/bits/debug.yml @@ -27,7 +27,7 @@ config: - DEBUG_MEMORY_INIT - DEBUG_NOTIFIERS - DEBUG_CREDENTIALS: [-v6.8, -chromeos-6.6] - - DEBUG_TIMEKEEPING + - DEBUG_TIMEKEEPING: [-v6.12] - DEBUG_OBJECTS - DEBUG_OBJECTS_ENABLE_DEFAULT: 1 - DEBUG_OBJECTS_FREE diff --git a/dashboard/config/linux/bits/filesystems.yml b/dashboard/config/linux/bits/filesystems.yml index 945023210..24525bd6f 100644 --- a/dashboard/config/linux/bits/filesystems.yml +++ b/dashboard/config/linux/bits/filesystems.yml @@ -169,11 +169,11 @@ config: - EXT3_FS_POSIX_ACL - EXT3_FS_SECURITY - - REISERFS_FS - - REISERFS_FS_XATTR - - REISERFS_FS_POSIX_ACL - - REISERFS_FS_SECURITY - - REISERFS_PROC_INFO + - REISERFS_FS: [-v6.12] + - REISERFS_FS_XATTR: [-v6.12] + - REISERFS_FS_POSIX_ACL: [-v6.12] + - REISERFS_FS_SECURITY: [-v6.12] + - REISERFS_PROC_INFO: [-v6.12] - ADFS_FS - ADFS_FS_RW: n diff --git a/dashboard/config/linux/bits/kasan.yml b/dashboard/config/linux/bits/kasan.yml index 34fb3e726..a3177b0c0 100644 --- a/dashboard/config/linux/bits/kasan.yml +++ b/dashboard/config/linux/bits/kasan.yml @@ -17,7 +17,7 @@ config: # This also needs page_owner=on in cmdline. - PAGE_OWNER # Allow to catch more use after free cases. - - SLUB_RCU_DEBUG: [linux-next] + - SLUB_RCU_DEBUG: [v6.12] - UBSAN: [v5.8] - UBSAN_SANITIZE_ALL: [v5.8, -arm, -riscv, -v6.9] diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml index 910f021dc..c1c0ea16f 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-20240828 + tag: next-20250128 diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml index 9ddf94908..19876c182 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.11-rc5 + tag: v6.13 diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml index afcc30640..26d12f56a 100644 --- a/dashboard/config/linux/bits/subsystems.yml +++ b/dashboard/config/linux/bits/subsystems.yml @@ -26,7 +26,8 @@ config: - NUMA_EMU: [x86_64] - NUMA_BALANCING: [-arm] - NUMA_BALANCING_DEFAULT_ENABLED: [-arm] - - ADDRESS_MASKING: [x86_64, v6.4] + # Starting from v6.13, depends on !CPU_MITIGATIONS. + - ADDRESS_MASKING: [x86_64, v6.4, -v6.12] - X86_USER_SHADOW_STACK: [x86_64, v6.6] # KMSAN disables HYPERVISOR_GUEST which is required to enable this. - X86_X2APIC: [x86_64, -kmsan] @@ -70,8 +71,8 @@ config: - KVM_AMD: [x86_64] - KVM_XEN: [x86_64, v5.12] - KVM_PROVE_MMU: [x86_64, v6.6] - - KVM_SW_PROTECTED_VM: [x86_64, linux-next] - - KVM_HYPERV: [x86_64, linux-next] + - KVM_SW_PROTECTED_VM: [x86_64, v6.8] + - KVM_HYPERV: [x86_64, v6.8] # KMSAN disables HYPERVISOR_GUEST which is required to enable X86_X2APIC # which is required to enable this. - X86_SGX: [x86_64, v5.11, -kmsan] @@ -97,7 +98,9 @@ config: - BINFMT_MISC - BINFMT_SCRIPT - MEMORY_HOTPLUG: [-arm, -riscv] - - MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm, -riscv] + # Replaced in "mm: add build-time option for hotplug memory default online type". + - MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm, -riscv, -linux-next] + - MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO: [-arm, -riscv, linux-next] - MEMORY_HOTREMOVE: [-arm, -riscv] - ANON_VMA_NAME: [v5.17] - KSM @@ -286,7 +289,7 @@ config: # DRM_DP_AUX_CHARDEV. Only works with architectures that have CONFIG_PM. - DRM_PANEL_EDP: [v5.16, -s390] - DRM_DP_AUX_CHARDEV: [x86_64, -v6.10] - - DRM_DISPLAY_DP_AUX_BUS: [linux-next] + - DRM_DISPLAY_DP_AUX_BUS: [v6.10, -s390] - DRM_DISPLAY_DP_HELPER: [v5.19, -s390] - DRM_DEBUG_MM - DRM_I915: [x86_64] @@ -443,7 +446,8 @@ config: - VDPA_SIM: [v6.0, -riscv] - VDPA_SIM_NET: [v6.0, -riscv] - VDPA_SIM_BLOCK: [v6.0, -riscv] - - VDPA_USER: [v6.0] + # Starting from v6.12, VDPA_USER depends on ARCH_HAS_DMA_OPS, which we don't have. + - VDPA_USER: [v6.0, -v6.12] - VP_VDPA: [v5.13] - VHOST_NET - VHOST_VSOCK @@ -461,11 +465,11 @@ config: - INTEL_IOMMU: [x86_64] # IOMMUFD must be enabled in order to keep VFIO_CONTAINER disabled. - IOMMUFD: [v6.2] - - IOMMUFD_TEST: [linux-next] + - IOMMUFD_TEST: [v6.2] # 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 # depend on RUNTIME_TESTING_MENU since it only adds debug checks. - - RUNTIME_TESTING_MENU: [linux-next] + - RUNTIME_TESTING_MENU: [v6.9] - ANDROID_BINDER_IPC # Create binder device per test process for isolation. # Earlier we defined here 32 devices and syzkaller allocated one per test process. -- cgit mrf-deployment