commit 6947df6b19c0d67f79472e689f85c382f0130d84
author Maciej Żenczykowski <maze@google.com> Thu Aug 29 21:18:35 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 29 21:18:35 2024 +0000
tree 3410cea30b878f04d8ce67381ed3dfa4522b216d
parent 4290adef1c3bb0879e917bbcfc5351b7b1f1ced3
parent bfc0b6187c9e384a08ec30cde7e2de91cd635dad

NetBpfLoad: better log message on program load failure am: bfc0b6187c

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

Change-Id: I4ec8e134a625a6f6470814f0d7110bf0f3f4ee5a
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 55e41d3..93dffb6 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1018,10 +1018,11 @@
                 ALOGW("BPF_PROG_LOAD - END log_buf contents.");
 
                 if (cs[i].prog_def->optional) {
-                    ALOGW("failed program is marked optional - continuing...");
+                    ALOGW("failed program %s is marked optional - continuing...",
+                          cs[i].name.c_str());
                     continue;
                 }
-                ALOGE("non-optional program failed to load.");
+                ALOGE("non-optional program %s failed to load.", cs[i].name.c_str());
             }
         }