commit 6201c11370bb7cbb19d2a3cd2d0eb9493db93c1d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 29 22:37:34 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 29 22:37:34 2024 +0000
tree 8360271c283dae1f784263612c0b2d468d498d80
parent 2a8bf659735b03ba292d3281a6a43515b1fe611a
parent 8597e3ac16fd73764c9f0cbb5669fee8e7f3bea7

Merge "NetBpfLoad: reliably log message on map creation failure" into main

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;