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

Merge "dscpPolicy: minor optimization for verifier" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-08-22 19:41:12 +00:00 • committed by Gerrit Code Review
commit 1e09ac05bb
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bpf/progs/dscpPolicy.c
View file

@ -28,7 +28,7 @@ DEFINE_BPF_MAP_GRW(socket_policy_cache_map, HASH, uint64_t, RuleEntry, CACHE_MAP
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)
static inline __always_inline void match_policy(struct __sk_buff* skb, bool ipv4) {
static inline __always_inline void match_policy(struct __sk_buff* skb, const bool ipv4) {
void* data = (void*)(long)skb->data;
const void* data_end = (void*)(long)skb->data_end;
@ -145,8 +145,10 @@ static inline __always_inline void match_policy(struct __sk_buff* skb, bool ipv4
policy = bpf_ipv6_dscp_policies_map_lookup_elem(&key);
}
// If the policy lookup failed, just continue (this should not ever happen)
if (!policy) continue;
// Lookup failure cannot happen on an array with MAX_POLICIES entries.
// While 'continue' would make logical sense here, 'return' should be
// easier for the verifier to analyze.
if (!policy) return;
// If policy iface index does not match skb, then skip to next policy.
if (policy->ifindex != skb->ifindex) continue;