commit a5a89e7e66c60dd263707dc99c44d4ea77c4f2a8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 29 22:42:32 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 29 22:42:32 2024 +0000
tree 410008af34464d13068d0406d3ff975e832a6e89
parent 2370758f6a55e9aa4d0b9cad00780f1ea38c4eb6
parent 6201c11370bb7cbb19d2a3cd2d0eb9493db93c1d

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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3250310

Change-Id: I58236dd15e269feb8ebdb682057df46c294855e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;