diff --git a/tests/mts/bpf_existence_test.cpp b/tests/mts/bpf_existence_test.cpp index 7efc2b1a0d..db39e6fc26 100644 --- a/tests/mts/bpf_existence_test.cpp +++ b/tests/mts/bpf_existence_test.cpp @@ -107,14 +107,10 @@ static const set INTRODUCED_T = { NETD "map_netd_uid_counterset_map", NETD "map_netd_uid_owner_map", NETD "map_netd_uid_permission_map", - SHARED "prog_block_bind4_block_port", - SHARED "prog_block_bind6_block_port", SHARED "prog_clatd_schedcls_egress4_clat_ether", SHARED "prog_clatd_schedcls_egress4_clat_rawip", SHARED "prog_clatd_schedcls_ingress6_clat_ether", SHARED "prog_clatd_schedcls_ingress6_clat_rawip", - SHARED "prog_dscp_policy_schedcls_set_dscp_ether", - SHARED "prog_dscp_policy_schedcls_set_dscp_raw_ip", NETD "prog_netd_cgroupskb_egress_stats", NETD "prog_netd_cgroupskb_ingress_stats", NETD "prog_netd_cgroupsock_inet_create", @@ -125,6 +121,13 @@ static const set INTRODUCED_T = { NETD "prog_netd_skfilter_ingress_xtbpf", }; +static const set INTRODUCED_T_5_4 = { + SHARED "prog_block_bind4_block_port", + SHARED "prog_block_bind6_block_port", + SHARED "prog_dscp_policy_schedcls_set_dscp_ether", + SHARED "prog_dscp_policy_schedcls_set_dscp_raw_ip", +}; + static const set REMOVED_T = { }; @@ -164,6 +167,7 @@ void getFileLists(set* expected, set* unexpected) { if (IsAtLeastT()) { addAll(expected, INTRODUCED_T); + if (android::bpf::isAtLeastKernelVersion(5, 4, 0)) addAll(expected, INTRODUCED_T_5_4); removeAll(expected, REMOVED_T); addAll(unexpected, REMOVED_T);