commit f75b7e199ace475dcece91d0b0d3c027f13829d1
author Maciej Żenczykowski <maze@google.com> Wed Jul 27 12:56:01 2022 +0000
committer Patrick Rohr <prohr@google.com> Wed Jul 27 16:20:40 2022 -0700
tree 052520aabf6645728d306ad3af6599b6cf222501
parent 0ff4ec058ba6c9b7c6034b28ca98466620bb5d44

dscpPolicy.c - increase size of cache map

(and merge the ipv4 and ipv6 caches into one,
as there really is no need for separate ones)

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

bpf_progs/dscpPolicy.c

diff --git a/bpf_progs/dscpPolicy.c b/bpf_progs/dscpPolicy.c
index 36a2d5b..e55f473 100644
--- a/bpf_progs/dscpPolicy.c
+++ b/bpf_progs/dscpPolicy.c
@@ -37,8 +37,7 @@
 #define IP4_OFFSET(field, header) (header + offsetof(struct iphdr, field))
 #define UPDATE_TOS(dscp, tos) (dscp << 2) | (tos & ECN_MASK)
 
-DEFINE_BPF_MAP_GRW(ipv4_socket_to_policies_map, HASH, uint64_t, RuleEntry, MAX_POLICIES, AID_SYSTEM)
-DEFINE_BPF_MAP_GRW(ipv6_socket_to_policies_map, HASH, uint64_t, RuleEntry, MAX_POLICIES, AID_SYSTEM)
+DEFINE_BPF_MAP_GRW(socket_policy_cache_map, HASH, uint64_t, RuleEntry, CACHE_MAP_SIZE, AID_SYSTEM)
 
 DEFINE_BPF_MAP_GRW(ipv4_dscp_policies_map, ARRAY, uint32_t, DscpPolicy, MAX_POLICIES, AID_SYSTEM)
 DEFINE_BPF_MAP_GRW(ipv6_dscp_policies_map, ARRAY, uint32_t, DscpPolicy, MAX_POLICIES, AID_SYSTEM)
@@ -120,12 +119,7 @@
             return;
     }
 
-    RuleEntry* existing_rule;
-    if (ipv4) {
-        existing_rule = bpf_ipv4_socket_to_policies_map_lookup_elem(&cookie);
-    } else {
-        existing_rule = bpf_ipv6_socket_to_policies_map_lookup_elem(&cookie);
-    }
+    RuleEntry* existing_rule = bpf_socket_policy_cache_map_lookup_elem(&cookie);
 
     if (existing_rule && v6_equal(src_ip, existing_rule->src_ip) &&
             v6_equal(dst_ip, existing_rule->dst_ip) && skb->ifindex == existing_rule->ifindex &&
@@ -226,11 +220,7 @@
     };
 
     // Update map with new policy.
-    if (ipv4) {
-        bpf_ipv4_socket_to_policies_map_update_elem(&cookie, &value, BPF_ANY);
-    } else {
-        bpf_ipv6_socket_to_policies_map_update_elem(&cookie, &value, BPF_ANY);
-    }
+    bpf_socket_policy_cache_map_update_elem(&cookie, &value, BPF_ANY);
 
     // Need to store bytes after updating map or program will not load.
     if (ipv4) {