From f1efc291609ac359125fc2f9c68cd86194dfeffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 21 Jan 2025 19:09:17 -0800 Subject: [PATCH] bpf netd: introduce 25Q2 specific cgroupskb/egress/stats programs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I875d3451063cc322fe998db29ffeeabf7c9f3ec8 --- bpf/progs/netd.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/bpf/progs/netd.c b/bpf/progs/netd.c index c4f7803dd3..330a9fb069 100644 --- a/bpf/progs/netd.c +++ b/bpf/progs/netd.c @@ -563,10 +563,26 @@ DEFINE_NETD_BPF_PROG_KVER_RANGE("cgroupskb/ingress/stats$4_9", // ----- cgroupskb/egress/stats ----- -// Android U+ 5.10+ (tracing) +// Android 25Q2+ 5.10+ (localnet protection + tracing) +DEFINE_NETD_BPF_PROG_RANGES("cgroupskb/egress/stats$5_10_25q2", + bpf_cgroup_egress_5_10_25q2, KVER_5_10, KVER_INF, + BPFLOADER_MAINLINE_25Q2_VERSION, BPFLOADER_MAX_VER) +(struct __sk_buff* skb) { + return bpf_traffic_account(skb, EGRESS, KVER_5_10, SDK_LEVEL_25Q2); +} + +// Android 25Q2+ 5.4 (localnet protection) +DEFINE_NETD_BPF_PROG_RANGES("cgroupskb/egress/stats$5_4_25q2", + bpf_cgroup_egress_5_4_25q2, KVER_5_4, KVER_5_10, + BPFLOADER_MAINLINE_25Q2_VERSION, BPFLOADER_MAX_VER) +(struct __sk_buff* skb) { + return bpf_traffic_account(skb, EGRESS, KVER_5_4, SDK_LEVEL_25Q2); +} + +// Android U/V 5.10+ (tracing) DEFINE_NETD_BPF_PROG_RANGES("cgroupskb/egress/stats$5_10_u", bpf_cgroup_egress_5_10_u, KVER_5_10, KVER_INF, - BPFLOADER_MAINLINE_U_VERSION, BPFLOADER_MAX_VER) + BPFLOADER_MAINLINE_U_VERSION, BPFLOADER_MAINLINE_25Q2_VERSION) (struct __sk_buff* skb) { return bpf_traffic_account(skb, EGRESS, KVER_5_10, SDK_LEVEL_U); }