commit 878aae0856f77e5268c7ed52784c29b3bc4d6bdc
author Maciej Żenczykowski <maze@google.com> Sat Jun 15 11:54:36 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Sat Jun 15 14:04:03 2024 -0700
tree f132ce90389809591eeb334143e4db8b162ee94e
parent 45e9372733ac1cd599e1e6bbc22f6b86659f9cdb

BpfMapTest: fixes for testGetFd

Test: TreeHugger, atest BpfMapTest happier
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib2915d48fab2c1e90300f1d4aa5d2cb2f69741f9

Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java

diff --git a/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java b/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java
index d5d941a..a0928c5 100644
--- a/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java
+++ b/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java
@@ -71,6 +71,8 @@
             "/sys/fs/bpf/tethering/map_test_tether_downstream6_map";
     private static final String TETHER2_DOWNSTREAM6_FS_PATH =
             "/sys/fs/bpf/tethering/map_test_tether2_downstream6_map";
+    private static final String TETHER3_DOWNSTREAM6_FS_PATH =
+            "/sys/fs/bpf/tethering/map_test_tether3_downstream6_map";
 
     private ArrayMap<TetherDownstream6Key, Tether6Value> mTestData;
 
@@ -156,7 +158,7 @@
                 assertEquals(OsConstants.EPERM, expected.errno);
             }
         }
-        try (BpfMap writeOnlyMap = new BpfMap<>(TETHER_DOWNSTREAM6_FS_PATH, BpfMap.BPF_F_WRONLY,
+        try (BpfMap writeOnlyMap = new BpfMap<>(TETHER3_DOWNSTREAM6_FS_PATH, BpfMap.BPF_F_WRONLY,
                 TetherDownstream6Key.class, Tether6Value.class)) {
             assertNotNull(writeOnlyMap);
             try {

bpf_progs/test.c

diff --git a/bpf_progs/test.c b/bpf_progs/test.c
index fd6f9b5..6a4471c 100644
--- a/bpf_progs/test.c
+++ b/bpf_progs/test.c
@@ -47,6 +47,8 @@
                    TETHERING_GID)
 DEFINE_BPF_MAP_GRW(tether2_downstream6_map, HASH, TetherDownstream6Key, Tether6Value, 16,
                    TETHERING_GID)
+DEFINE_BPF_MAP_GRW(tether3_downstream6_map, HASH, TetherDownstream6Key, Tether6Value, 16,
+                   TETHERING_GID)
 // Used only by BpfBitmapTest, not by production code.
 DEFINE_BPF_MAP_GRW(bitmap, ARRAY, int, uint64_t, 2, TETHERING_GID)
 

tests/mts/bpf_existence_test.cpp

diff --git a/tests/mts/bpf_existence_test.cpp b/tests/mts/bpf_existence_test.cpp
index 1dc2e90..e212e7d 100644
--- a/tests/mts/bpf_existence_test.cpp
+++ b/tests/mts/bpf_existence_test.cpp
@@ -69,6 +69,7 @@
     TETHERING "map_test_bitmap",
     TETHERING "map_test_tether_downstream6_map",
     TETHERING "map_test_tether2_downstream6_map",
+    TETHERING "map_test_tether3_downstream6_map",
     TETHERING "prog_offload_schedcls_tether_downstream4_ether",
     TETHERING "prog_offload_schedcls_tether_downstream4_rawip",
     TETHERING "prog_offload_schedcls_tether_downstream6_ether",