commit a44510ba0c8892074223dd1f228b95c6e19ad3a0
author Maciej Żenczykowski <maze@google.com> Tue Aug 09 14:59:25 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Tue Aug 09 14:59:46 2022 +0000
tree e8c583da08e689d66bfed5dc95e06843528105c2
parent d4e6d1c9711455e177ef27a77fe8343e31c08138

dscpPolicy - remove bpf byteswap in favour of userspace

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

bpf_progs/dscpPolicy.c

diff --git a/bpf_progs/dscpPolicy.c b/bpf_progs/dscpPolicy.c
index 6e85710..08fbcb1 100644
--- a/bpf_progs/dscpPolicy.c
+++ b/bpf_progs/dscpPolicy.c
@@ -183,9 +183,9 @@
             if (sport != policy->src_port) continue;
             score += 0xFFFF;
         }
-        if (ntohs(dport) < ntohs(policy->dst_port_start)) continue;
-        if (ntohs(dport) > ntohs(policy->dst_port_end)) continue;
-        score += 0xFFFF + ntohs(policy->dst_port_start) - ntohs(policy->dst_port_end);
+        if (ntohs(dport) < policy->dst_port_start) continue;
+        if (ntohs(dport) > policy->dst_port_end) continue;
+        score += 0xFFFF + policy->dst_port_start - policy->dst_port_end;
 
         if (score > best_score) {
             best_score = score;

bpf_progs/dscpPolicy.h

diff --git a/bpf_progs/dscpPolicy.h b/bpf_progs/dscpPolicy.h
index 1a6e14d..9680670 100644
--- a/bpf_progs/dscpPolicy.h
+++ b/bpf_progs/dscpPolicy.h
@@ -53,8 +53,8 @@
     struct in6_addr dst_ip;
     uint32_t ifindex;
     __be16 src_port;
-    __be16 dst_port_start;
-    __be16 dst_port_end;
+    uint16_t dst_port_start;
+    uint16_t dst_port_end;
     uint8_t proto;
     int8_t dscp_val;  // -1 none, or 0..63 DSCP value
     uint8_t present_fields;

service/src/com/android/server/connectivity/DscpPolicyValue.java

diff --git a/service/src/com/android/server/connectivity/DscpPolicyValue.java b/service/src/com/android/server/connectivity/DscpPolicyValue.java
index 5495f1f..fed96b4 100644
--- a/service/src/com/android/server/connectivity/DscpPolicyValue.java
+++ b/service/src/com/android/server/connectivity/DscpPolicyValue.java
@@ -43,10 +43,10 @@
     @Field(order = 3, type = Type.UBE16)
     public final int srcPort;
 
-    @Field(order = 4, type = Type.UBE16)
+    @Field(order = 4, type = Type.U16)
     public final int dstPortStart;
 
-    @Field(order = 5, type = Type.UBE16)
+    @Field(order = 5, type = Type.U16)
     public final int dstPortEnd;
 
     @Field(order = 6, type = Type.U8)