From 78ad0039bfcbc3e7beed393e76c6661e92ade837 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 28 Jun 2024 00:25:50 +0000 Subject: [PATCH] Do not run mapLockTest on 4.9 kernels bpfLock() does nothing on 4.9 as it relies on bpfGetFdMapId which is not available until 4.14. Change-Id: Ib737db61a5d8fb39bcbbe1bb5937afb0c63bd1d1 Test: TH Bug: 349034378 --- netd/BpfHandler.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp index 4779b47833..96825455b3 100644 --- a/netd/BpfHandler.cpp +++ b/netd/BpfHandler.cpp @@ -260,7 +260,10 @@ static void mapLockTest(void) { } 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));