diff --git a/bpf_progs/bpf_shared.h b/bpf_progs/bpf_shared.h index 2ddc7b86e3..a6e78b67d9 100644 --- a/bpf_progs/bpf_shared.h +++ b/bpf_progs/bpf_shared.h @@ -98,7 +98,7 @@ static const int IFACE_STATS_MAP_SIZE = 1000; static const int CONFIGURATION_MAP_SIZE = 2; static const int UID_OWNER_MAP_SIZE = 2000; -#define BPF_PATH "/sys/fs/bpf/" +#define BPF_PATH "/sys/fs/bpf/net_shared/" #define BPF_EGRESS_PROG_PATH BPF_PATH "prog_netd_cgroupskb_egress_stats" #define BPF_INGRESS_PROG_PATH BPF_PATH "prog_netd_cgroupskb_ingress_stats" diff --git a/service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java b/service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java index 25c88eb6bd..5011dec06e 100644 --- a/service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java +++ b/service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java @@ -38,7 +38,7 @@ public class BpfInterfaceMapUpdater { private static final String TAG = BpfInterfaceMapUpdater.class.getSimpleName(); // This is current path but may be changed soon. private static final String IFACE_INDEX_NAME_MAP_PATH = - "/sys/fs/bpf/map_netd_iface_index_name_map"; + "/sys/fs/bpf/net_shared/map_netd_iface_index_name_map"; private final IBpfMap mBpfMap; private final INetd mNetd; private final Handler mHandler; diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java index e3794e441a..82b1fb5ad8 100644 --- a/service-t/src/com/android/server/net/NetworkStatsService.java +++ b/service-t/src/com/android/server/net/NetworkStatsService.java @@ -218,17 +218,16 @@ public class NetworkStatsService extends INetworkStatsService.Stub { private static final String NETSTATS_COMBINE_SUBTYPE_ENABLED = "netstats_combine_subtype_enabled"; - // This is current path but may be changed soon. private static final String UID_COUNTERSET_MAP_PATH = - "/sys/fs/bpf/map_netd_uid_counterset_map"; + "/sys/fs/bpf/net_shared/map_netd_uid_counterset_map"; private static final String COOKIE_TAG_MAP_PATH = - "/sys/fs/bpf/map_netd_cookie_tag_map"; + "/sys/fs/bpf/net_shared/map_netd_cookie_tag_map"; private static final String APP_UID_STATS_MAP_PATH = - "/sys/fs/bpf/map_netd_app_uid_stats_map"; + "/sys/fs/bpf/net_shared/map_netd_app_uid_stats_map"; private static final String STATS_MAP_A_PATH = - "/sys/fs/bpf/map_netd_stats_map_A"; + "/sys/fs/bpf/net_shared/map_netd_stats_map_A"; private static final String STATS_MAP_B_PATH = - "/sys/fs/bpf/map_netd_stats_map_B"; + "/sys/fs/bpf/net_shared/map_netd_stats_map_B"; private final Context mContext; private final NetworkStatsFactory mStatsFactory; diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 47c214648b..843d33defe 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -754,7 +754,7 @@ public class ConnectivityService extends IConnectivityManager.Stub * The BPF program attached to the tc-police hook to account for to-be-dropped traffic. */ private static final String TC_POLICE_BPF_PROG_PATH = - "/sys/fs/bpf/prog_netd_schedact_ingress_account"; + "/sys/fs/bpf/net_shared/prog_netd_schedact_ingress_account"; private static String eventName(int what) { return sMagicDecoderRing.get(what, Integer.toString(what)); diff --git a/service/src/com/android/server/connectivity/ClatCoordinator.java b/service/src/com/android/server/connectivity/ClatCoordinator.java index 5ca888cd6b..cc815224dc 100644 --- a/service/src/com/android/server/connectivity/ClatCoordinator.java +++ b/service/src/com/android/server/connectivity/ClatCoordinator.java @@ -100,11 +100,11 @@ public class ClatCoordinator { private static final String CLAT_INGRESS6_MAP_PATH = makeMapPath("ingress6"); private static String makeMapPath(String which) { - return "/sys/fs/bpf/map_clatd_clat_" + which + "_map"; + return "/sys/fs/bpf/net_shared/map_clatd_clat_" + which + "_map"; } private static String makeProgPath(boolean ingress, boolean ether) { - String path = "/sys/fs/bpf/prog_clatd_schedcls_" + String path = "/sys/fs/bpf/net_shared/prog_clatd_schedcls_" + (ingress ? "ingress6" : "egress4") + "_clat_" + (ether ? "ether" : "rawip"); diff --git a/service/src/com/android/server/connectivity/ConnectivityNativeService.java b/service/src/com/android/server/connectivity/ConnectivityNativeService.java index cde6ea75e2..c1ba40e69f 100644 --- a/service/src/com/android/server/connectivity/ConnectivityNativeService.java +++ b/service/src/com/android/server/connectivity/ConnectivityNativeService.java @@ -47,10 +47,11 @@ public class ConnectivityNativeService extends ConnectivityNative.Stub { private static final String TAG = ConnectivityNativeService.class.getSimpleName(); private static final String CGROUP_PATH = "/sys/fs/cgroup"; private static final String V4_PROG_PATH = - "/sys/fs/bpf/prog_block_bind4_block_port"; + "/sys/fs/bpf/net_shared/prog_block_bind4_block_port"; private static final String V6_PROG_PATH = - "/sys/fs/bpf/prog_block_bind6_block_port"; - private static final String BLOCKED_PORTS_MAP_PATH = "/sys/fs/bpf/map_block_blocked_ports_map"; + "/sys/fs/bpf/net_shared/prog_block_bind6_block_port"; + private static final String BLOCKED_PORTS_MAP_PATH = + "/sys/fs/bpf/net_shared/map_block_blocked_ports_map"; private final Context mContext; diff --git a/service/src/com/android/server/connectivity/DscpPolicyTracker.java b/service/src/com/android/server/connectivity/DscpPolicyTracker.java index de9dfe368e..7829d1a3c7 100644 --- a/service/src/com/android/server/connectivity/DscpPolicyTracker.java +++ b/service/src/com/android/server/connectivity/DscpPolicyTracker.java @@ -52,7 +52,7 @@ public class DscpPolicyTracker { private static final String TAG = DscpPolicyTracker.class.getSimpleName(); private static final String PROG_PATH = - "/sys/fs/bpf/prog_dscp_policy_schedcls_set_dscp"; + "/sys/fs/bpf/net_shared/prog_dscp_policy_schedcls_set_dscp"; // Name is "map + *.o + map_name + map". Can probably shorten this private static final String IPV4_POLICY_MAP_PATH = makeMapPath( "dscp_policy_ipv4_dscp_policies"); @@ -61,7 +61,7 @@ public class DscpPolicyTracker { private static final int MAX_POLICIES = 16; private static String makeMapPath(String which) { - return "/sys/fs/bpf/map_" + which + "_map"; + return "/sys/fs/bpf/net_shared/map_" + which + "_map"; } private Set mAttachedIfaces; diff --git a/tests/mts/bpf_existence_test.cpp b/tests/mts/bpf_existence_test.cpp index 2bba282d6d..7e7cabde0e 100644 --- a/tests/mts/bpf_existence_test.cpp +++ b/tests/mts/bpf_existence_test.cpp @@ -42,6 +42,7 @@ using android::modules::sdklevel::IsAtLeastT; #define PLATFORM "/sys/fs/bpf/" #define TETHERING "/sys/fs/bpf/tethering/" +#define SHARED "/sys/fs/bpf/net_shared/" class BpfExistenceTest : public ::testing::Test { }; diff --git a/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java b/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java index c3d64cb102..f84d10f395 100644 --- a/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java +++ b/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java @@ -109,9 +109,9 @@ public class ClatCoordinatorTest { new FileDescriptor()); private static final String EGRESS_PROG_PATH = - "/sys/fs/bpf/prog_clatd_schedcls_egress4_clat_rawip"; + "/sys/fs/bpf/net_shared/prog_clatd_schedcls_egress4_clat_rawip"; private static final String INGRESS_PROG_PATH = - "/sys/fs/bpf/prog_clatd_schedcls_ingress6_clat_ether"; + "/sys/fs/bpf/net_shared/prog_clatd_schedcls_ingress6_clat_ether"; private static final ClatEgress4Key EGRESS_KEY = new ClatEgress4Key(STACKED_IFINDEX, INET4_LOCAL4); private static final ClatEgress4Value EGRESS_VALUE = new ClatEgress4Value(BASE_IFINDEX,