commit 8597e3ac16fd73764c9f0cbb5669fee8e7f3bea7
author Maciej Żenczykowski <maze@google.com> Wed Aug 28 15:42:01 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Thu Aug 29 21:18:22 2024 +0000
tree 85874743f4de953c642577ef50926b813c0b282c
parent 9f8b17ee5b7b73f46f54809edd3880eb2cf1d540

NetBpfLoad: reliably log message on map creation failure

(ALOGD can get entirely stripped out of the logs)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I513d10acb9f1cc330b9cd5a4245f3af7e790a4d6

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 2267fab..c058433 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -788,7 +788,11 @@
                 strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));
             fd.reset(bpf(BPF_MAP_CREATE, req));
             saved_errno = errno;
-            ALOGD("bpf_create_map name %s, ret: %d", mapNames[i].c_str(), fd.get());
+            if (fd.ok()) {
+              ALOGD("bpf_create_map[%s] -> %d", mapNames[i].c_str(), fd.get());
+            } else {
+              ALOGE("bpf_create_map[%s] -> %d errno:%d", mapNames[i].c_str(), fd.get(), saved_errno);
+            }
         }
 
         if (!fd.ok()) return -saved_errno;