From 6434bd9e968f00c8893bcda5e42d10d0e64e3ee0 Mon Sep 17 00:00:00 2001 From: Connor O'Brien Date: Mon, 28 Feb 2022 13:02:17 -0800 Subject: [PATCH] ANDROID: GKI: defconfig: enable BTF debug info Build BTF type info into the kernel to enable use of BPF-based tools such as BCC's libbpf-tools. By default, modules whose split BTF is inconsistent with vmlinux BTF will fail to load, which can prevent loading compatible but separately built modules. Instead, enable MODULE_ALLOW_BTF_MISMATCH to ignore such modules' BTF rather than refusing to load the module. Bug: 203823368 Bug: 218515241 Test: build Signed-off-by: Connor O'Brien Change-Id: I8efaab5f1a5c6ad6e9e6ccf1e78088d81a880480 --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4ca7be3ded47..7428d2696cb9 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -655,6 +655,8 @@ CONFIG_PRINTK_CALLER=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF4=y +CONFIG_DEBUG_INFO_BTF=y +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index c29ed53b1a88..05c3e8b59b65 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -594,6 +594,8 @@ CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF4=y +CONFIG_DEBUG_INFO_BTF=y +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y