joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

dscpPolicy.c - increase size of cache map

Browse source 
(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
This commit is contained in:
Maciej Żenczykowski 2022-07-27 12:56:01 +00:00 • committed by Patrick Rohr
commit f75b7e199a
3 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bpf_progs/dscpPolicy.c
View file

@ -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 @@ static inline __always_inline void match_policy(struct __sk_buff* skb, bool ipv4
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 @@ static inline __always_inline void match_policy(struct __sk_buff* skb, bool ipv4
};
// 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) {

1
bpf_progs/dscpPolicy.h
View file

@ -14,6 +14,7 @@
* limitations under the License.
*/
#define CACHE_MAP_SIZE 1024
#define MAX_POLICIES 16
#define SRC_IP_MASK_FLAG 1

3
tests/mts/bpf_existence_test.cpp
View file

@ -88,9 +88,8 @@ static const set<string> MAINLINE_FOR_T_PLUS = {
SHARED "map_clatd_clat_egress4_map",
SHARED "map_clatd_clat_ingress6_map",
SHARED "map_dscpPolicy_ipv4_dscp_policies_map",
SHARED "map_dscpPolicy_ipv4_socket_to_policies_map",
SHARED "map_dscpPolicy_ipv6_dscp_policies_map",
SHARED "map_dscpPolicy_ipv6_socket_to_policies_map",
SHARED "map_dscpPolicy_socket_policy_cache_map",
NETD "map_netd_app_uid_stats_map",
NETD "map_netd_configuration_map",
NETD "map_netd_cookie_tag_map",