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 <connoro@google.com> Change-Id: I8efaab5f1a5c6ad6e9e6ccf1e78088d81a880480
ammarfaizi2 · Jan 27, 2023 · b5a5282 · b5a5282
1 parent f574098
commit b5a5282
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
@@ -666,6 +666,8 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_CALLER=y
 CONFIG_DYNAMIC_DEBUG_CORE=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
@@ -619,6 +619,8 @@ CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG_CORE=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