LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move error count BPF map initialization into class Dependencies

Browse Source 
The preparation for testing BpfCoordinator#dump().
Used to wrap error count BPF map access to avoid SYS_SECCOMP on some
test device. Ex: cuttlefish.
https://android-build.googleplex.com/builds/tests/view?invocationId=I01200010101524265&testResultId=TR03228338750686157

Bug: 255466740
Test: atest BpfCoordinatorTest

Change-Id: Id4405b70bc6d500b35943b4f81b88e7515fff3b0
This commit is contained in:
Hungming Chen
2022-10-26 10:17:36 +08:00
parent de5fb7370b
commit 771bc597b6
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
View File

@@ -403,6 +403,18 @@ public class BpfCoordinator {
return null;
}
}
/** Get error BPF map. */
@Nullable public IBpfMap<S32, S32> getBpfErrorMap() {
if (!isAtLeastS()) return null;
try {
return new BpfMap<>(TETHER_ERROR_MAP_PATH,
BpfMap.BPF_F_RDONLY, S32.class, S32.class);
} catch (ErrnoException e) {
Log.e(TAG, "Cannot create error map: " + e);
return null;
}
}
}
@VisibleForTesting
@@ -1287,13 +1299,15 @@ public class BpfCoordinator {
}
private void dumpCounters(@NonNull IndentingPrintWriter pw) {
if (!mDeps.isAtLeastS()) {
pw.println("No counter support");
return;
}
try (IBpfMap<S32, S32> map = new BpfMap<>(TETHER_ERROR_MAP_PATH, BpfMap.BPF_F_RDONLY,
S32.class, S32.class)) {
try (IBpfMap<S32, S32> map = mDeps.getBpfErrorMap()) {
if (map == null) {
pw.println("No error counter support");
return;
}
if (map.isEmpty()) {
pw.println("<empty>");
return;
}
map.forEach((k, v) -> {
String counterName;
try {
@@ -1307,7 +1321,7 @@ public class BpfCoordinator {
if (v.val > 0) pw.println(String.format("%s: %d", counterName, v.val));
});
} catch (ErrnoException | IOException e) {
pw.println("Error dumping counter map: " + e);
pw.println("Error dumping error counter map: " + e);
}
}