commit 508c8f785700adc0cf58a4ce2ee1572ccd257b7c
author Maciej Żenczykowski <maze@google.com> Wed Aug 28 15:07:33 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Thu Aug 29 12:19:56 2024 -0700
tree 94ff3d64c98f25c6b6114468823e712f05a3169f
parent 00969a2835abe973c6370351a54424b166812405

NetBpfLoad: do not log bpfGetFdMapId() failures on 4.9

This is entirely expected due to lack of implementation in <4.14.

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

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 59712b1..07be8c6 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -839,7 +839,8 @@
 
         int mapId = bpfGetFdMapId(fd);
         if (mapId == -1) {
-            ALOGE("bpfGetFdMapId failed, ret: %d [%d]", mapId, errno);
+            if (isAtLeastKernelVersion(4, 14, 0))
+                ALOGE("bpfGetFdMapId failed, ret: %d [%d]", mapId, errno);
         } else {
             ALOGI("map %s id %d", mapPinLoc.c_str(), mapId);
         }