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

bpf: clatd.c - use pindir instead of prefix

Browse source 
We continue to have:
  $ adbz shell ls -lZ /sys/fs/bpf/*/*_clatd_*
  -rw-rw---- 1 root system u:object_r:fs_bpf_net_shared:s0  0 2025-07-28 14:15 /sys/fs/bpf/net_shared/map_clatd_clat_egress4_map
  -rw-rw---- 1 root system u:object_r:fs_bpf_net_shared:s0  0 2025-07-28 14:15 /sys/fs/bpf/net_shared/map_clatd_clat_ingress6_map
  -r--r----- 1 root system u:object_r:fs_bpf_net_shared:s0  0 2025-07-28 14:15 /sys/fs/bpf/net_shared/prog_clatd_schedcls_egress4_clat_rawip
  -r--r----- 1 root system u:object_r:fs_bpf_net_shared:s0  0 2025-07-28 14:15 /sys/fs/bpf/net_shared/prog_clatd_schedcls_ingress6_clat_ether
  -r--r----- 1 root system u:object_r:fs_bpf_net_shared:s0  0 2025-07-28 14:15 /sys/fs/bpf/net_shared/prog_clatd_schedcls_ingress6_clat_rawip

Test: TreeHugger
Flag: EXEMPT mainline/noop
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id015d91f5e42acedea1ccf813334012f4b0f64ec
This commit is contained in:
Maciej Żenczykowski 2025-07-28 14:16:34 -07:00
commit 6fba0348b6
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bpf/loader/NetBpfLoad.cpp
View file

@ -1672,7 +1672,7 @@ static int loadAllObjects(const unsigned int bpfloader_ver) {
if (isAtLeastT) {
// T+ Tethering mainline module loads under:
// /sys/fs/bpf/net_shared: shared with netd & system server
if (loadObject(bpfloader_ver, "net_shared/", "clatd.o")) return 1;
if (loadObject(bpfloader_ver, "", "clatd.o")) return 1;
if (loadObject(bpfloader_ver, "", "dscpPolicy.o")) return 1;
// /sys/fs/bpf/netd_shared: shared with netd & system server

1
bpf/progs/clatd.c
View file

@ -16,6 +16,7 @@
// The resulting .o needs to load on Android T+
#define BPFLOADER_MIN_VER BPFLOADER_MAINLINE_T_VERSION
#define DEFAULT_BPF_PIN_SUBDIR "net_shared/"
#include "bpf_net_helpers.h"
#include "clatd.h"