From 127d1fafc7d808f8bfcbb50170aa1f00b0209dad Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Mon, 13 Jun 2022 16:15:57 +0200 Subject: dashboard/config/linux: enforce DWARF4 for KMSAN Newer toolchaings generate DWARF5 by default, which might be problematic for binutils on syzbot. Use DWARF4 instead. --- dashboard/config/linux/bits/kmsan.yml | 6 ++++++ dashboard/config/linux/upstream-kmsan-base.config | 4 ++-- dashboard/config/linux/upstream-kmsan.config | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'dashboard') diff --git a/dashboard/config/linux/bits/kmsan.yml b/dashboard/config/linux/bits/kmsan.yml index 38bc33a6d..16256f1d7 100644 --- a/dashboard/config/linux/bits/kmsan.yml +++ b/dashboard/config/linux/bits/kmsan.yml @@ -28,6 +28,12 @@ config: # KMSAN doesn't support ORC unwinder (https://github.com/google/kmsan/issues/48). - UNWINDER_FRAME_POINTER + # Newer Clang versions generate DWARF5 by default, but old binutils choke on that. + # This results in syzbot being unable to symbolize reports. + # Stick to DWARF4 for now. + - DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT: [n, weak] + - DEBUG_INFO_DWARF4 + - HYPERVISOR_GUEST: n - PARAVIRT: n - PARAVIRT_SPINLOCKS: [n, weak] diff --git a/dashboard/config/linux/upstream-kmsan-base.config b/dashboard/config/linux/upstream-kmsan-base.config index c285dd5e4..b563dbf35 100644 --- a/dashboard/config/linux/upstream-kmsan-base.config +++ b/dashboard/config/linux/upstream-kmsan-base.config @@ -4903,8 +4903,8 @@ CONFIG_DEBUG_MISC=y # CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_INFO_NONE is not set -CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y -# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_DWARF5 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config index d80ceeaa9..a762397c2 100644 --- a/dashboard/config/linux/upstream-kmsan.config +++ b/dashboard/config/linux/upstream-kmsan.config @@ -8351,8 +8351,8 @@ CONFIG_DEBUG_MISC=y # CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_INFO_NONE is not set -CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y -# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_DWARF5 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -- cgit mrf-deployment