joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Use Java code path for bpf map operations in BpfNetMaps

Browse source 
Experiment to verify bpf map operations refactoring showed no
change of map size metrics and no system health regressions.
So this CL update BpfNetMaps to always use new code path with kill
switch.

Test: m
Bug: 217624062
Change-Id: Ic17470ac5c075884871ea2df2c13c054f5ac2929
This commit is contained in:
Motomu Utsumi 2023-08-14 11:09:02 +09:00
commit 7628ea30b0
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
service/src/com/android/server/BpfNetMaps.java
View file

@ -43,7 +43,6 @@ import android.net.INetd;
import android.os.Build;
import android.os.RemoteException;
import android.os.ServiceSpecificException;
import android.provider.DeviceConfig;
import android.system.ErrnoException;
import android.system.Os;
import android.util.ArraySet;
@ -95,8 +94,8 @@ public class BpfNetMaps {
private static boolean sInitialized = false;
private static Boolean sEnableJavaBpfMap = null;
private static final String BPF_NET_MAPS_ENABLE_JAVA_BPF_MAP =
"bpf_net_maps_enable_java_bpf_map";
private static final String BPF_NET_MAPS_FORCE_DISABLE_JAVA_BPF_MAP =
"bpf_net_maps_force_disable_java_bpf_map";
// Lock for sConfigurationMap entry for UID_RULES_CONFIGURATION_KEY.
// This entry is not accessed by others.
@ -283,9 +282,8 @@ public class BpfNetMaps {
if (sInitialized) return;
if (sEnableJavaBpfMap == null) {
sEnableJavaBpfMap = SdkLevel.isAtLeastU() ||
DeviceConfigUtils.isFeatureEnabled(context,
DeviceConfig.NAMESPACE_TETHERING, BPF_NET_MAPS_ENABLE_JAVA_BPF_MAP,
DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultValue */);
DeviceConfigUtils.isTetheringFeatureNotChickenedOut(
BPF_NET_MAPS_FORCE_DISABLE_JAVA_BPF_MAP);
}
Log.d(TAG, "BpfNetMaps is initialized with sEnableJavaBpfMap=" + sEnableJavaBpfMap);