Merge pull request #14 from Alan-Jowett/map_in_map

Add tests for map_in_map performance
microsoft · Oct 27, 2023 · d2c32f1 · d2c32f1
2 parents fe55919 + 8bfbde5
commit d2c32f1
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 9 deletions.
diff --git a/bpf/CMakeLists.txt b/bpf/CMakeLists.txt
@@ -19,7 +19,8 @@ set(test_cases
     "lpm,lpm_16384,-DMAX_ENTRIES=16384"
     "lpm,lpm_262144,-DMAX_ENTRIES=262144"
     "lpm,lpm_1048576,-DMAX_ENTRIES=1048576"
-    "map_in_map"
+    "map_in_map,hash_of_array,-DTYPE=BPF_MAP_TYPE_HASH_OF_MAPS"
+    "map_in_map,array_of_array,-DTYPE=BPF_MAP_TYPE_ARRAY_OF_MAPS"
     "rolling_lru"
     "tail_call"
     "xdp"

diff --git a/bpf/map_in_map.c b/bpf/map_in_map.c
@@ -7,6 +7,10 @@
 #define MAX_ENTRIES 8192
 #endif
 
+#if !defined(TYPE)
+#define TYPE BPF_MAP_TYPE_HASH_OF_MAPS
+#endif
+
 struct
 {
     __uint(type, BPF_MAP_TYPE_HASH);
@@ -17,7 +21,7 @@ struct
 
 struct
 {
-    __uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
+    __uint(type, TYPE);
     __type(key, unsigned int);
     __type(value, unsigned int);
     __uint(max_entries, 1);
@@ -50,11 +54,11 @@ SEC("xdp/read") int read(void* ctx)
 {
     int outer_key = 0;
     int key = bpf_get_prandom_u32() % MAX_ENTRIES;
-    void* inner_map = bpf_map_lookup_elem(&outer_map, &outer_key);
-    if (!inner_map) {
-        return 1;
+    void* map = bpf_map_lookup_elem(&outer_map, &outer_key);
+    if (!map) {
+        return 2;
     }
-    int* value = bpf_map_lookup_elem(inner_map, &key);
+    int* value = bpf_map_lookup_elem(map, &key);
     if (value) {
         return 0;
     }
@@ -66,9 +70,9 @@ SEC("xdp/update") int update(void* ctx)
 {
     int outer_key = 0;
     int key = bpf_get_prandom_u32() % MAX_ENTRIES;
-    void* inner_map = bpf_map_lookup_elem(&outer_map, &outer_key);
-    if (!inner_map) {
+    void* map = bpf_map_lookup_elem(&outer_map, &outer_key);
+    if (!map) {
         return 1;
     }
-    return bpf_map_update_elem(inner_map, &key, &key, BPF_ANY);
+    return bpf_map_update_elem(map, &key, &key, BPF_ANY);
 }
diff --git a/bpf/tests.yml b/bpf/tests.yml
@@ -426,4 +426,46 @@ tests:
     program_cpu_assignment:
       test_bpf_get_smp_processor_id: all
 
+  - name: BPF_MAP_TYPE_ARRAY_OF_MAPS read
+    description: Tests the BPF_MAP_TYPE_ARRAY_OF_MAPS map type.
+    elf_file: array_of_array.o
+    map_state_preparation:
+      program: prepare
+      iteration_count: 8192
+    iteration_count: 10000000
+    program_cpu_assignment:
+      read: all
+
+  - name: BPF_MAP_TYPE_ARRAY_OF_MAPS update
+    description: Tests the BPF_MAP_TYPE_ARRAY_OF_MAPS map type.
+    elf_file: array_of_array.o
+    map_state_preparation:
+      program: prepare
+      iteration_count: 8192
+    iteration_count: 10000000
+    program_cpu_assignment:
+      update: all
+
+  - name: BPF_MAP_TYPE_HASH_OF_MAPS read
+    description: Tests the BPF_MAP_TYPE_HASH_OF_MAPS map type.
+    elf_file: hash_of_array.o
+    platform: Linux
+    map_state_preparation:
+      program: prepare
+      iteration_count: 8192
+    iteration_count: 10000000
+    program_cpu_assignment:
+      read: all
+
+  - name: BPF_MAP_TYPE_HASH_OF_MAPS update
+    description: Tests the BPF_MAP_TYPE_HASH_OF_MAPS map type.
+    elf_file: hash_of_array.o
+    platform: Linux
+    map_state_preparation:
+      program: prepare
+      iteration_count: 8192
+    iteration_count: 10000000
+    program_cpu_assignment:
+      update: all
+
   # Add more test cases as needed