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

ClatCoordinator - use SingleWriterBpfMap

Browse source 
These two maps aren't (and should never be) accessed from anywhere else.

Test: TreeHugger, atest FrameworksNetTests
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I93b8b94dcad8f2bc4d022314372fb97109ed8f2f
This commit is contained in:
Maciej Żenczykowski 2024-06-15 02:46:17 -07:00
commit 59a2b902de
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
service/src/com/android/server/connectivity/ClatCoordinator.java
View file

@ -45,6 +45,7 @@ import com.android.net.module.util.BpfDump;
import com.android.net.module.util.BpfMap;
import com.android.net.module.util.IBpfMap;
import com.android.net.module.util.InterfaceParams;
import com.android.net.module.util.SingleWriterBpfMap;
import com.android.net.module.util.TcUtils;
import com.android.net.module.util.bpf.ClatEgress4Key;
import com.android.net.module.util.bpf.ClatEgress4Value;
@ -256,7 +257,7 @@ public class ClatCoordinator {
@Nullable
public IBpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
try {
return new BpfMap<>(CLAT_INGRESS6_MAP_PATH,
return SingleWriterBpfMap.getSingleton(CLAT_INGRESS6_MAP_PATH,
ClatIngress6Key.class, ClatIngress6Value.class);
} catch (ErrnoException e) {
Log.e(TAG, "Cannot create ingress6 map: " + e);
@ -268,7 +269,7 @@ public class ClatCoordinator {
@Nullable
public IBpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
try {
return new BpfMap<>(CLAT_EGRESS4_MAP_PATH,
return SingleWriterBpfMap.getSingleton(CLAT_EGRESS4_MAP_PATH,
ClatEgress4Key.class, ClatEgress4Value.class);
} catch (ErrnoException e) {
Log.e(TAG, "Cannot create egress4 map: " + e);
@ -280,6 +281,7 @@ public class ClatCoordinator {
@Nullable
public IBpfMap<CookieTagMapKey, CookieTagMapValue> getBpfCookieTagMap() {
try {
// also read and written from other locations
return new BpfMap<>(COOKIE_TAG_MAP_PATH,
CookieTagMapKey.class, CookieTagMapValue.class);
} catch (ErrnoException e) {