bpf,test: Initialize per-cluster CT/SNAT for test

Initialize per-cluster CT/SNAT map when BPF_TEST macro is defined. Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
cilium · Mar 22, 2023 · b5996c2 · b5996c2
1 parent c1f2237
commit b5996c2
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 18 deletions.
diff --git a/bpf/lib/conntrack_map.h b/bpf/lib/conntrack_map.h
@@ -123,33 +123,55 @@ struct {
 } CT_MAP_ANY4 __section_maps_btf;
 
 #ifdef ENABLE_CLUSTER_AWARE_ADDRESSING
+struct per_cluster_ct_map4_inner_map {
+		__uint(type, BPF_MAP_TYPE_LRU_HASH);
+		__type(key, struct ipv4_ct_tuple);
+		__type(value, struct ct_entry);
+		__uint(max_entries, CT_MAP_SIZE_TCP);
+#ifndef BPF_TEST
+};
+#else
+} per_cluster_ct_tcp4_1 __section_maps_btf,
+  per_cluster_ct_tcp4_2 __section_maps_btf,
+  per_cluster_ct_any4_1 __section_maps_btf,
+  per_cluster_ct_any4_2 __section_maps_btf;
+#endif
+
 struct {
 	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
 	__type(key, __u32);
 	__type(value, __u32);
 	__uint(pinning, LIBBPF_PIN_BY_NAME);
 	__uint(max_entries, 256); /* Keep this sync with ClusterIDMax */
-	__array(values, struct {
-		__uint(type, BPF_MAP_TYPE_LRU_HASH);
-		__type(key, struct ipv4_ct_tuple);
-		__type(value, struct ct_entry);
-		__uint(max_entries, CT_MAP_SIZE_TCP);
-	});
+	__array(values, struct per_cluster_ct_map4_inner_map);
+#ifndef BPF_TEST
 } PER_CLUSTER_CT_TCP4 __section_maps_btf;
+#else
+} PER_CLUSTER_CT_TCP4 __section_maps_btf = {
+	.values = {
+		[1] = &per_cluster_ct_tcp4_1,
+		[2] = &per_cluster_ct_tcp4_2,
+	},
+};
+#endif
 
 struct {
 	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
 	__type(key, __u32);
 	__type(value, __u32);
 	__uint(pinning, LIBBPF_PIN_BY_NAME);
 	__uint(max_entries, 256); /* Keep this sync with ClusterIDMax */
-	__array(values, struct {
-		__uint(type, BPF_MAP_TYPE_LRU_HASH);
-		__type(key, struct ipv4_ct_tuple);
-		__type(value, struct ct_entry);
-		__uint(max_entries, CT_MAP_SIZE_ANY);
-	});
+	__array(values, struct per_cluster_ct_map4_inner_map);
+#ifndef BPF_TEST
 } PER_CLUSTER_CT_ANY4 __section_maps_btf;
+#else
+} PER_CLUSTER_CT_ANY4 __section_maps_btf = {
+	.values = {
+		[1] = &per_cluster_ct_any4_1,
+		[2] = &per_cluster_ct_any4_2,
+	},
+};
+#endif
 #endif
 
 static __always_inline void *

diff --git a/bpf/lib/nat.h b/bpf/lib/nat.h
@@ -122,19 +122,35 @@ struct {
 } SNAT_MAPPING_IPV4 __section_maps_btf;
 
 #ifdef ENABLE_CLUSTER_AWARE_ADDRESSING
+struct per_cluster_snat_mapping_ipv4_inner_map {
+	__uint(type, BPF_MAP_TYPE_LRU_HASH);
+	__type(key, struct ipv4_ct_tuple);
+	__type(value, struct ipv4_nat_entry);
+	__uint(max_entries, SNAT_MAPPING_IPV4_SIZE);
+#ifndef BPF_TEST
+};
+#else
+} per_cluster_snat_mapping_ipv4_1 __section_maps_btf,
+  per_cluster_snat_mapping_ipv4_2 __section_maps_btf;
+#endif
+
 struct {
 	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
 	__type(key, __u32);
 	__type(value, __u32);
 	__uint(pinning, LIBBPF_PIN_BY_NAME);
 	__uint(max_entries, 256);
-	__array(values, struct {
-		__uint(type, BPF_MAP_TYPE_LRU_HASH);
-		__type(key, struct ipv4_ct_tuple);
-		__type(value, struct ipv4_nat_entry);
-		__uint(max_entries, SNAT_MAPPING_IPV4_SIZE);
-	});
+	__array(values, struct per_cluster_snat_mapping_ipv4_inner_map);
+#ifndef BPF_TEST
 } PER_CLUSTER_SNAT_MAPPING_IPV4 __section_maps_btf;
+#else
+} PER_CLUSTER_SNAT_MAPPING_IPV4 __section_maps_btf = {
+	.values = {
+		[1] = &per_cluster_snat_mapping_ipv4_1,
+		[2] = &per_cluster_snat_mapping_ipv4_2,
+	},
+};
+#endif
 #endif
 
 #ifdef ENABLE_IP_MASQ_AGENT