From 712088dff3dbb30f8f8b85e3d9547bf41bf1e1f3 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Tue, 18 Mar 2025 14:52:02 +0900 Subject: [PATCH] Enable libbpf logging in bpf loader Bug: 403381101 Test: boot Change-Id: I039ad8990bb722bfd6eb9f6c4d927b699475b7f6 --- bpf/loader/NetBpfLoad.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index b9ef76675b..f8691fd06b 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1414,6 +1414,29 @@ static bool isWear() { return wear; } +static int libbpfPrint(enum libbpf_print_level lvl, const char *const formatStr, + va_list argList) { + int32_t prio; + switch (lvl) { + case LIBBPF_WARN: + prio = ANDROID_LOG_WARN; + break; + case LIBBPF_INFO: + prio = ANDROID_LOG_INFO; + break; + case LIBBPF_DEBUG: + prio = ANDROID_LOG_DEBUG; + break; + } + char *s = strdup(formatStr ?: "(no format string)"); + int len = strlen(s); + if (len && s[len - 1] == '\n') + s[len - 1] = 0; + LOG_PRI_VA(prio, LOG_TAG, s, argList); + free(s); + return 0; +} + static int doLoad(char** argv, char * const envp[]) { if (!isAtLeastS) { ALOGE("Impossible - not reachable on Android