This is a note to let you know that I've just added the patch titled
lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
lib-kconfig.debug-allow-btf-dwarf5-with-pahole-1.21.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 42d9b379e3e1790eafb87c799c9edfd0b37a37c7 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <nathan@xxxxxxxxxx>
Date: Tue, 1 Feb 2022 13:56:24 -0700
Subject: lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+
From: Nathan Chancellor <nathan@xxxxxxxxxx>
commit 42d9b379e3e1790eafb87c799c9edfd0b37a37c7 upstream.
Commit 98cd6f521f10 ("Kconfig: allow explicit opt in to DWARF v5")
prevented CONFIG_DEBUG_INFO_DWARF5 from being selected when
CONFIG_DEBUG_INFO_BTF is enabled because pahole had issues with clang's
DWARF5 info. This was resolved by [1], which is in pahole v1.21.
Allow DEBUG_INFO_DWARF5 to be selected with DEBUG_INFO_BTF when using
pahole v1.21 or newer.
[1]: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=7d8e829f636f47aba2e1b6eda57e74d8e31f733c
Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
Link: https://lore.kernel.org/bpf/20220201205624.652313-6-nathan@xxxxxxxxxx
Signed-off-by: Matthias Maennich <maennich@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
lib/Kconfig.debug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -302,7 +302,7 @@ config DEBUG_INFO_DWARF4
config DEBUG_INFO_DWARF5
bool "Generate DWARF Version 5 debuginfo"
depends on !CC_IS_CLANG || AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502 && AS_HAS_NON_CONST_LEB128)
- depends on !DEBUG_INFO_BTF
+ depends on !DEBUG_INFO_BTF || PAHOLE_VERSION >= 121
help
Generate DWARF v5 debug info. Requires binutils 2.35.2, gcc 5.0+ (gcc
5.0+ accepts the -gdwarf-5 flag but only had partial support for some
Patches currently in stable-queue which might be from nathan@xxxxxxxxxx are
queue-5.15/scripts-pahole-flags.sh-use-pahole-version.sh.patch
queue-5.15/lib-kconfig.debug-allow-btf-dwarf5-with-pahole-1.21.patch
queue-5.15/ext4-fix-function-prototype-mismatch-for-ext4_feat_ktype.patch
queue-5.15/kbuild-add-config_pahole_version.patch
queue-5.15/lib-kconfig.debug-use-config_pahole_version.patch
