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

tethering offload ebpf - lower requirement from 5.9 to 5.8 am: b0ac41f0cd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d8fecaab82002ff4e6eee14adff9d50ea585ea9
This commit is contained in:
Maciej Żenczykowski
2021-02-15 11:51:41 +00:00
committed by Automerger Merge Worker
parent ceafffa6c0 b0ac41f0cd
commit c456856971
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Tethering/bpf_progs/offload.c
View File

@@ -535,54 +535,54 @@ if (!is_tcp) return TC_ACT_OK; // HACK
return bpf_redirect(v->oif, 0 /* this is effectively BPF_F_EGRESS */); return bpf_redirect(v->oif, 0 /* this is effectively BPF_F_EGRESS */);
} }
// Real implementations for 5.9+ kernels // Real implementations for 5.8+ kernels
DEFINE_BPF_PROG_KVER("schedcls/tether_downstream4_ether$5_9", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER("schedcls/tether_downstream4_ether$5_8", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_downstream4_ether_5_9, KVER(5, 9, 0)) sched_cls_tether_downstream4_ether_5_8, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return do_forward4(skb, /* is_ethernet */ true, /* downstream */ true); return do_forward4(skb, /* is_ethernet */ true, /* downstream */ true);
} }
DEFINE_BPF_PROG_KVER("schedcls/tether_downstream4_rawip$5_9", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER("schedcls/tether_downstream4_rawip$5_8", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_downstream4_rawip_5_9, KVER(5, 9, 0)) sched_cls_tether_downstream4_rawip_5_8, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return do_forward4(skb, /* is_ethernet */ false, /* downstream */ true); return do_forward4(skb, /* is_ethernet */ false, /* downstream */ true);
} }
DEFINE_BPF_PROG_KVER("schedcls/tether_upstream4_ether$5_9", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER("schedcls/tether_upstream4_ether$5_8", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_upstream4_ether_5_9, KVER(5, 9, 0)) sched_cls_tether_upstream4_ether_5_8, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return do_forward4(skb, /* is_ethernet */ true, /* downstream */ false); return do_forward4(skb, /* is_ethernet */ true, /* downstream */ false);
} }
DEFINE_BPF_PROG_KVER("schedcls/tether_upstream4_rawip$5_9", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER("schedcls/tether_upstream4_rawip$5_8", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_upstream4_rawip_5_9, KVER(5, 9, 0)) sched_cls_tether_upstream4_rawip_5_8, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return do_forward4(skb, /* is_ethernet */ false, /* downstream */ false); return do_forward4(skb, /* is_ethernet */ false, /* downstream */ false);
} }
// Placeholder implementations for older pre-5.9 kernels // Placeholder implementations for older pre-5.8 kernels
DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_downstream4_ether$stub", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_downstream4_ether$stub", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_downstream4_ether_stub, KVER_NONE, KVER(5, 9, 0)) sched_cls_tether_downstream4_ether_stub, KVER_NONE, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return TC_ACT_OK; return TC_ACT_OK;
} }
DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_downstream4_rawip$stub", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_downstream4_rawip$stub", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_downstream4_rawip_stub, KVER_NONE, KVER(5, 9, 0)) sched_cls_tether_downstream4_rawip_stub, KVER_NONE, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return TC_ACT_OK; return TC_ACT_OK;
} }
DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_upstream4_ether$stub", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_upstream4_ether$stub", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_upstream4_ether_stub, KVER_NONE, KVER(5, 9, 0)) sched_cls_tether_upstream4_ether_stub, KVER_NONE, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return TC_ACT_OK; return TC_ACT_OK;
} }
DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_upstream4_rawip$stub", AID_ROOT, AID_NETWORK_STACK, DEFINE_BPF_PROG_KVER_RANGE("schedcls/tether_upstream4_rawip$stub", AID_ROOT, AID_NETWORK_STACK,
sched_cls_tether_upstream4_rawip_stub, KVER_NONE, KVER(5, 9, 0)) sched_cls_tether_upstream4_rawip_stub, KVER_NONE, KVER(5, 8, 0))
(struct __sk_buff* skb) { (struct __sk_buff* skb) {
return TC_ACT_OK; return TC_ACT_OK;
} }