From a76935865bc4c3d7e1b5760ee3c1cef62cc4c5bc Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Wed, 5 Feb 2025 17:40:08 +0900 Subject: [PATCH] Add libbpf version to bpf loader initial log Test: build & boot Bug: 394492034 Change-Id: Ic81b8c64074929d06736a8f55482cca53ca4b175 --- bpf/loader/NetBpfLoad.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 9486e75d40..9dc3ec15f2 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "NetBpfLoad" #include +#include #include #include #include @@ -1429,10 +1430,12 @@ static int doLoad(char** argv, char * const envp[]) { if (isAtLeastV) ++bpfloader_ver; // [46] BPFLOADER_MAINLINE_V_VERSION if (isAtLeast25Q2) ++bpfloader_ver; // [47] BPFLOADER_MAINLINE_25Q2_VERSION - ALOGI("NetBpfLoad v0.%u (%s) api:%d/%d kver:%07x (%s) uid:%d rc:%d%d", + ALOGI("NetBpfLoad v0.%u (%s) api:%d/%d kver:%07x (%s) libbpf: v%u.%u " + "uid:%d rc:%d%d", bpfloader_ver, argv[0], android_get_device_api_level(), api_level, - kernelVersion(), describeArch(), getuid(), - has_platform_bpfloader_rc, has_platform_netbpfload_rc); + kernelVersion(), describeArch(), libbpf_major_version(), + libbpf_minor_version(), getuid(), has_platform_bpfloader_rc, + has_platform_netbpfload_rc); if (!has_platform_bpfloader_rc && !has_platform_netbpfload_rc) { ALOGE("Unable to find platform's bpfloader & netbpfload init scripts.");