commit f2315d018bb5e8c9eda385b1fbd91d49fadc34e7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 28 06:34:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 28 06:34:27 2024 +0000
tree 1bc856d7dcc5c8bd2a0d13b1f677ad3d02a1849f
parent 9f3b991a7a353e831a85a93b5d78527d1ab0d748
parent 78ad0039bfcbc3e7beed393e76c6661e92ade837

Merge "Do not run mapLockTest on 4.9 kernels" into main

netd/BpfHandler.cpp

diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
index 4779b47..9682545 100644
--- a/netd/BpfHandler.cpp
+++ b/netd/BpfHandler.cpp
@@ -260,7 +260,10 @@
 }
 
 Status BpfHandler::initMaps() {
-    mapLockTest();
+    // bpfLock() requires bpfGetFdMapId which is only available on 4.14+ kernels.
+    if (bpf::isAtLeastKernelVersion(4, 14, 0)) {
+        mapLockTest();
+    }
 
     RETURN_IF_NOT_OK(mStatsMapA.init(STATS_MAP_A_PATH));
     RETURN_IF_NOT_OK(mStatsMapB.init(STATS_MAP_B_PATH));