LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0 am: 99d1eeebff

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb398ac4c2eb1dcbd13391b06f6277c1a671e540
This commit is contained in:
Treehugger Robot
2021-01-27 08:28:04 +00:00
committed by Automerger Merge Worker
parent bc2cb208f3 99d1eeebff
commit b33e05d475
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Tethering/bpf_progs/offload.c
View File

@@ -40,13 +40,13 @@ DEFINE_BPF_MAP_GRW(tether_limit_map, HASH, TetherLimitKey, TetherLimitValue, 16,
// ----- IPv6 Support ----- // ----- IPv6 Support -----
DEFINE_BPF_MAP_GRW(tether_downstream6_map, HASH, TetherDownstream6Key, TetherDownstream6Value, 64, DEFINE_BPF_MAP_GRW(tether_downstream6_map, HASH, TetherDownstream6Key, Tether6Value, 64,
AID_NETWORK_STACK) AID_NETWORK_STACK)
DEFINE_BPF_MAP_GRW(tether_downstream64_map, HASH, TetherDownstream64Key, TetherDownstream64Value, DEFINE_BPF_MAP_GRW(tether_downstream64_map, HASH, TetherDownstream64Key, TetherDownstream64Value,
64, AID_NETWORK_STACK) 64, AID_NETWORK_STACK)
DEFINE_BPF_MAP_GRW(tether_upstream6_map, HASH, TetherUpstream6Key, TetherUpstream6Value, 64, DEFINE_BPF_MAP_GRW(tether_upstream6_map, HASH, TetherUpstream6Key, Tether6Value, 64,
AID_NETWORK_STACK) AID_NETWORK_STACK)
static inline __always_inline int do_forward6(struct __sk_buff* skb, const bool is_ethernet, static inline __always_inline int do_forward6(struct __sk_buff* skb, const bool is_ethernet,
@@ -113,14 +113,13 @@ static inline __always_inline int do_forward6(struct __sk_buff* skb, const bool
.iif = skb->ifindex, .iif = skb->ifindex,
}; };
TetherDownstream6Value* vd = downstream ? bpf_tether_downstream6_map_lookup_elem(&kd) : NULL; Tether6Value* v = downstream ? bpf_tether_downstream6_map_lookup_elem(&kd)
TetherUpstream6Value* vu = downstream ? NULL : bpf_tether_upstream6_map_lookup_elem(&ku); : bpf_tether_upstream6_map_lookup_elem(&ku);
// If we don't find any offload information then simply let the core stack handle it... // If we don't find any offload information then simply let the core stack handle it...
if (downstream && !vd) return TC_ACT_OK; if (!v) return TC_ACT_OK;
if (!downstream && !vu) return TC_ACT_OK;
uint32_t stat_and_limit_k = downstream ? skb->ifindex : vu->oif; uint32_t stat_and_limit_k = downstream ? skb->ifindex : v->oif;
TetherStatsValue* stat_v = bpf_tether_stats_map_lookup_elem(&stat_and_limit_k); TetherStatsValue* stat_v = bpf_tether_stats_map_lookup_elem(&stat_and_limit_k);
@@ -133,8 +132,7 @@ static inline __always_inline int do_forward6(struct __sk_buff* skb, const bool
if (!limit_v) return TC_ACT_OK; if (!limit_v) return TC_ACT_OK;
// Required IPv6 minimum mtu is 1280, below that not clear what we should do, abort... // Required IPv6 minimum mtu is 1280, below that not clear what we should do, abort...
const int pmtu = downstream ? vd->pmtu : vu->pmtu; if (v->pmtu < IPV6_MIN_MTU) return TC_ACT_OK;
if (pmtu < IPV6_MIN_MTU) return TC_ACT_OK;
// Approximate handling of TCP/IPv6 overhead for incoming LRO/GRO packets: default // Approximate handling of TCP/IPv6 overhead for incoming LRO/GRO packets: default
// outbound path mtu of 1500 is not necessarily correct, but worst case we simply // outbound path mtu of 1500 is not necessarily correct, but worst case we simply
@@ -145,9 +143,9 @@ static inline __always_inline int do_forward6(struct __sk_buff* skb, const bool
// (This is also blindly assuming 12 bytes of tcp timestamp option in tcp header) // (This is also blindly assuming 12 bytes of tcp timestamp option in tcp header)
uint64_t packets = 1; uint64_t packets = 1;
uint64_t bytes = skb->len; uint64_t bytes = skb->len;
if (bytes > pmtu) { if (bytes > v->pmtu) {
const int tcp_overhead = sizeof(struct ipv6hdr) + sizeof(struct tcphdr) + 12; const int tcp_overhead = sizeof(struct ipv6hdr) + sizeof(struct tcphdr) + 12;
const int mss = pmtu - tcp_overhead; const int mss = v->pmtu - tcp_overhead;
const uint64_t payload = bytes - tcp_overhead; const uint64_t payload = bytes - tcp_overhead;
packets = (payload + mss - 1) / mss; packets = (payload + mss - 1) / mss;
bytes = tcp_overhead * packets + payload; bytes = tcp_overhead * packets + payload;
@@ -203,7 +201,7 @@ static inline __always_inline int do_forward6(struct __sk_buff* skb, const bool
// Overwrite any mac header with the new one // Overwrite any mac header with the new one
// For a rawip tx interface it will simply be a bunch of zeroes and later stripped. // For a rawip tx interface it will simply be a bunch of zeroes and later stripped.
*eth = downstream ? vd->macHeader : vu->macHeader; *eth = v->macHeader;
// Redirect to forwarded interface. // Redirect to forwarded interface.
// //
@@ -211,7 +209,7 @@ static inline __always_inline int do_forward6(struct __sk_buff* skb, const bool
// The redirect actually happens after the ebpf program has already terminated, // The redirect actually happens after the ebpf program has already terminated,
// and can fail for example for mtu reasons at that point in time, but there's nothing // and can fail for example for mtu reasons at that point in time, but there's nothing
// we can do about it here. // we can do about it here.
return bpf_redirect(downstream ? vd->oif : vu->oif, 0 /* this is effectively BPF_F_EGRESS */); return bpf_redirect(v->oif, 0 /* this is effectively BPF_F_EGRESS */);
} }
DEFINE_BPF_PROG("schedcls/tether_downstream6_ether", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG("schedcls/tether_downstream6_ether", AID_ROOT, AID_NETWORK_STACK,

2
Tethering/bpf_progs/test.c
View File

@@ -23,7 +23,7 @@
#include "netdbpf/bpf_shared.h" #include "netdbpf/bpf_shared.h"
// Used only by TetheringPrivilegedTests, not by production code. // Used only by TetheringPrivilegedTests, not by production code.
DEFINE_BPF_MAP_GRW(tether_downstream6_map, HASH, TetherDownstream6Key, TetherDownstream6Value, 16, DEFINE_BPF_MAP_GRW(tether_downstream6_map, HASH, TetherDownstream6Key, Tether6Value, 16,
AID_NETWORK_STACK) AID_NETWORK_STACK)
DEFINE_BPF_PROG_KVER("xdp/drop_ipv4_udp_ether", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER("xdp/drop_ipv4_udp_ether", AID_ROOT, AID_NETWORK_STACK,