dashboard/config: switch KMSAN configs to upstream tree

Since we are using the upstream tree to build KMSAN on syzbot,
switch the kernel configs to also reference that tree.

4 files changed, 11 insertions, 19 deletions

diff --git a/dashboard/config/linux/bits/kmsan.yml b/dashboard/config/linux/bits/kmsan.yml
index e3bbfdbb9..466512db5 100644
--- a/dashboard/config/linux/bits/kmsan.yml
+++ b/dashboard/config/linux/bits/kmsan.yml
@@ -3,10 +3,6 @@
 
 compiler: /usr/bin/clang
 
-kernel:
- repo: https://github.com/google/kmsan.git
- tag: kmsan-v6.4-rc1
-
 config:
  - KMSAN
  - KMSAN_CHECK_PARAM_RETVAL
diff --git a/dashboard/config/linux/main.yml b/dashboard/config/linux/main.yml
index 2d2ec7cfb..0d49388ba 100644
--- a/dashboard/config/linux/main.yml
+++ b/dashboard/config/linux/main.yml
@@ -6,7 +6,7 @@ instances:
  - upstream-selinux-kasan:	[linux-next, x86_64, timeouts_native, gcc, lsm, selinux, slab, kasan, kfence]
  - upstream-smack-kasan:	[linux-next, x86_64, timeouts_native, clang, bpfjit, lsm, smack, kasan, kfence]
  - upstream-kasan-badwrites:	[linux-next, x86_64, timeouts_native, gcc, bpfjit, lsm, apparmor, kasan, kasan_panic_on_write, kfence]
- - upstream-kmsan:		[x86_64, timeouts_native, clang, lsm, apparmor, nonoise, kmsan]
+ - upstream-kmsan:		[upstream, timeouts_native, x86_64, clang, lsm, apparmor, nonoise, kmsan]
  - upstream-kcsan:		[upstream, timeouts_native, x86_64, clang, onlynet, nonoise, kcsan]
  - upstream-leak:		[upstream, timeouts_native, x86_64, gcc, bpfjit, lsm, apparmor, nonoise, kmemleak]
  - upstream-usb:		[upstream, timeouts_native, x86_64, gcc, lsm, apparmor, onlyusb, kasan]
diff --git a/dashboard/config/linux/upstream-kmsan-base.config b/dashboard/config/linux/upstream-kmsan-base.config
index ad465dfd9..756d53ac1 100644
--- a/dashboard/config/linux/upstream-kmsan-base.config
+++ b/dashboard/config/linux/upstream-kmsan-base.config
@@ -1,5 +1,5 @@
 # Automatically generated by syz-kconf; DO NOT EDIT.
-# Kernel: https://github.com/google/kmsan.git kmsan-v6.4-rc1
+# Kernel: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git v6.4
 
 #
 # Automatically generated file; DO NOT EDIT.
@@ -313,6 +313,7 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 # Processor type and features
 #
 CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
@@ -410,6 +411,7 @@ CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_X86_DIRECT_GBPAGES=y
 # CONFIG_X86_CPA_STATISTICS is not set
+# CONFIG_AMD_MEM_ENCRYPT is not set
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
@@ -449,6 +451,8 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x200000
 # CONFIG_ADDRESS_MASKING is not set
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_LEGACY_VSYSCALL_XONLY=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
@@ -638,11 +642,6 @@ CONFIG_AS_GFNI=y
 CONFIG_CRASH_CORE=y
 CONFIG_KEXEC_CORE=y
 CONFIG_HOTPLUG_SMT=y
-CONFIG_HOTPLUG_CORE_SYNC=y
-CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
-CONFIG_HOTPLUG_CORE_SYNC_FULL=y
-CONFIG_HOTPLUG_SPLIT_STARTUP=y
-CONFIG_HOTPLUG_PARALLEL=y
 CONFIG_GENERIC_ENTRY=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
@@ -667,7 +666,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_WANTS_NO_INSTR=y
diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config
index 132ce900f..37b52e039 100644
--- a/dashboard/config/linux/upstream-kmsan.config
+++ b/dashboard/config/linux/upstream-kmsan.config
@@ -1,5 +1,5 @@
 # Automatically generated by syz-kconf; DO NOT EDIT.
-# Kernel: https://github.com/google/kmsan.git kmsan-v6.4-rc1
+# Kernel: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git v6.4
 
 #
 # Automatically generated file; DO NOT EDIT.
@@ -324,6 +324,7 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 # Processor type and features
 #
 CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
@@ -422,6 +423,7 @@ CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_X86_DIRECT_GBPAGES=y
 # CONFIG_X86_CPA_STATISTICS is not set
+# CONFIG_AMD_MEM_ENCRYPT is not set
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
@@ -462,6 +464,8 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x200000
 # CONFIG_ADDRESS_MASKING is not set
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_LEGACY_VSYSCALL_XONLY=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
@@ -683,11 +687,6 @@ CONFIG_AS_GFNI=y
 CONFIG_CRASH_CORE=y
 CONFIG_KEXEC_CORE=y
 CONFIG_HOTPLUG_SMT=y
-CONFIG_HOTPLUG_CORE_SYNC=y
-CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
-CONFIG_HOTPLUG_CORE_SYNC_FULL=y
-CONFIG_HOTPLUG_SPLIT_STARTUP=y
-CONFIG_HOTPLUG_PARALLEL=y
 CONFIG_GENERIC_ENTRY=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
@@ -713,7 +712,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_WANTS_NO_INSTR=y