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 "bpf: tcpAccECN: eliminate header file and move more fully into netd" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-09-12 10:03:39 -07:00 • committed by Android (Google) Code Review
commit cb44b89e11
4 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bpf/progs/netd.c
View file

@ -902,10 +902,6 @@ DEFINE_NETD_V_BPF_PROG_KVER(setsockopt, prog, , 5_4)
return BPF_ALLOW;
}
#undef BPFLOADER_MIN_VER
#undef BPF_OBJ_NAME
#undef DEFAULT_BPF_PIN_SUBDIR
#include "tcpAccECN.c"
LICENSE("Apache 2.0");

17
bpf/progs/netd.h
View file

@ -158,8 +158,25 @@ ASSERT_STRING_EQUAL(XT_BPF_DENYLIST_PROG_PATH, BPF_NETD_PATH "prog_netd_skfilte
#define LOCAL_NET_ACCESS_MAP_PATH BPF_NETD_PATH "map_netd_local_net_access_map"
#define LOCAL_NET_BLOCKED_UID_MAP_PATH BPF_NETD_PATH "map_netd_local_net_blocked_uid_map"
#define L4S_INGRESS_ETHER_PROG_PATH BPF_NETD_PATH "prog_netd_schedcls_ingress_accecn_eth"
#define L4S_EGRESS_ETHER_PROG_PATH BPF_NETD_PATH "prog_netd_schedcls_egress_accecn_eth"
#define L4S_INGRESS_RAWIP_PROG_PATH BPF_NETD_PATH "prog_netd_schedcls_ingress_accecn_rawip"
#define L4S_EGRESS_RAWIP_PROG_PATH BPF_NETD_PATH "prog_netd_schedcls_egress_accecn_rawip"
#define L4S_OPTIONS_SOCKOPS_PROG_PATH BPF_NETD_PATH "prog_netd_sockops_accecn_option"
#define L4S_ACCECN_CE_MAP_PATH BPF_NETD_PATH "map_netd_l4s_accecn_ce_map"
#define L4S_ACCECN_BYTE_MAP_PATH BPF_NETD_PATH "map_netd_l4s_accecn_byte_map"
#define L4S_ACCECN_MSS_MAP_PATH BPF_NETD_PATH "map_netd_l4s_accecn_mss_map"
#endif // __cplusplus
typedef struct {
uint64_t ceb;
uint64_t e0b;
uint64_t e1b;
} EcnByteCounters;
STRUCT_SIZE(EcnByteCounters, 3 * 8); // 24
// LINT.IfChange(match_type)
enum UidOwnerMatchType : uint32_t {
NO_MATCH = 0,

6
bpf/progs/tcpAccECN.c
View file

@ -33,13 +33,11 @@
#include <linux/tcp.h>
#include <stdint.h>
// The resulting .o needs to load on Android 26Q2+
// The resulting maps/programs need to load on Android 26Q2+
#undef BPFLOADER_MIN_VER
#define BPFLOADER_MIN_VER BPFLOADER_MAINLINE_26Q2_VERSION
#define BPF_OBJ_NAME "tcpAccECN"
#define DEFAULT_BPF_PIN_SUBDIR "netd_shared"
#include "bpf_net_helpers.h"
#include "tcpAccECN.h"
#define TCP_FLAGS_OFF 12
#define IP4_TCP_FLAGS_OFF (sizeof(struct iphdr) + TCP_FLAGS_OFF)

17
bpf/progs/tcpAccECN.h
View file

@ -1,17 +0,0 @@
#pragma once
#define L4S_INGRESS_ETHER_PROG_PATH BPF_NETD_PATH "prog_tcpAccECN_schedcls_ingress_accecn_eth"
#define L4S_EGRESS_ETHER_PROG_PATH BPF_NETD_PATH "prog_tcpAccECN_schedcls_egress_accecn_eth"
#define L4S_INGRESS_RAWIP_PROG_PATH BPF_NETD_PATH "prog_tcpAccECN_schedcls_ingress_accecn_rawip"
#define L4S_EGRESS_RAWIP_PROG_PATH BPF_NETD_PATH "prog_tcpAccECN_schedcls_egress_accecn_rawip"
#define L4S_OPTIONS_SOCKOPS_PROG_PATH BPF_NETD_PATH "prog_tcpAccECN_sockops_l4s_accecn_option"
#define L4S_ACCECN_CE_MAP_PATH BPF_NETD_PATH "map_tcpAccECN_l4s_accecn_ce_map"
#define L4S_ACCECN_BYTE_MAP_PATH BPF_NETD_PATH "map_tcpAccECN_l4s_accecn_byte_map"
#define L4S_ACCECN_MSS_MAP_PATH BPF_NETD_PATH "map_tcpAccECN_l4s_accecn_mss_map"
typedef struct{
uint64_t ceb;
uint64_t e0b;
uint64_t e1b;
} EcnByteCounters;
STRUCT_SIZE(EcnByteCounters, 8 * 3);