commit 588c707f20c56c10b3c5e9d6b7025c6d46852bd7
author Maciej Żenczykowski <maze@google.com> Wed May 18 23:00:36 2022 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Thu May 19 13:52:09 2022 +0000
tree d26a737d62441b68403e96bdd52c601a214c0e67
parent fa61d49a99e33417a0ed82b43912afa3e98c13bf

bpf_existence_test: block & dscp_policy progs require 5.4+ kernel

Bug: 233119387
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8df3c0c1b9f4b60a55472d2402dcea368020985b
(cherry picked from commit 93b8cc1556d5272f6b3677cdb01615037341380c)
Merged-In: I8df3c0c1b9f4b60a55472d2402dcea368020985b

tests/mts/bpf_existence_test.cpp

diff --git a/tests/mts/bpf_existence_test.cpp b/tests/mts/bpf_existence_test.cpp
index 7efc2b1..db39e6f 100644
--- a/tests/mts/bpf_existence_test.cpp
+++ b/tests/mts/bpf_existence_test.cpp
@@ -107,14 +107,10 @@
     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 @@
     NETD "prog_netd_skfilter_ingress_xtbpf",
 };
 
+static const set<string> 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<string> REMOVED_T = {
 };
 
@@ -164,6 +167,7 @@
 
     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);