From 508c8f785700adc0cf58a4ce2ee1572ccd257b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Wed, 28 Aug 2024 15:07:33 -0700 Subject: [PATCH] NetBpfLoad: do not log bpfGetFdMapId() failures on 4.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is entirely expected due to lack of implementation in <4.14. Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: Ifebe6843dc77b1b9a506c61239dcebe7262d0869 --- bpf/loader/NetBpfLoad.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 59712b1e11..07be8c6871 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -839,7 +839,8 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector& 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); }