| commit | 30f3beb0f6dc6ac4fb0538d04e2929b230b67dbb | [log] [tgz] |
|---|---|---|
| author | Patrick Rohr <prohr@google.com> | Fri Jun 28 00:25:50 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Jul 09 02:34:13 2024 +0000 |
| tree | 955a1ef6823c6e750f94ff4bf578e2488c27ade7 | |
| parent | 0de93b4c1e0c2202e25454176fc9ed0253f74b91 [diff] [blame] |
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. Test: TH Bug: 349034378 (cherry picked from https://android-review.googlesource.com/q/commit:78ad0039bfcbc3e7beed393e76c6661e92ade837) Merged-In: Ib737db61a5d8fb39bcbbe1bb5937afb0c63bd1d1 Change-Id: Ib737db61a5d8fb39bcbbe1bb5937afb0c63bd1d1
diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp index 5d64ae7..0f84656 100644 --- a/netd/BpfHandler.cpp +++ b/netd/BpfHandler.cpp
@@ -266,7 +266,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));