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: test.c - use pindir instead of prefix

Browse source 
We continue to have:
  $ adbz shell ls -lZ /sys/fs/bpf/tethering/map_test_*
  -rw-rw---- 1 root network_stack u:object_r:fs_bpf_tethering:s0  0 2025-07-28 13:46 /sys/fs/bpf/tethering/map_test_bitmap
  -rw-rw---- 1 root network_stack u:object_r:fs_bpf_tethering:s0  0 2025-07-28 13:46 /sys/fs/bpf/tethering/map_test_tether2_downstream6_map
  -rw-rw---- 1 root network_stack u:object_r:fs_bpf_tethering:s0  0 2025-07-28 13:46 /sys/fs/bpf/tethering/map_test_tether3_downstream6_map
  -rw-rw---- 1 root network_stack u:object_r:fs_bpf_tethering:s0  0 2025-07-28 13:46 /sys/fs/bpf/tethering/map_test_tether_downstream6_map

Long term goal here is to eliminate 'prefix' entirely.
This will also allow merging all the bpf .o's into 1.

Test: TreeHugger
Flag: EXEMPT mainline/noop
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifdbc47243363e73ef46a9a9c71136f342fd381a7
This commit is contained in:
Maciej Żenczykowski 2025-07-28 13:36:04 -07:00
commit deed643567
1 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

@ -1668,7 +1668,7 @@ static int loadAllObjects(const unsigned int bpfloader_ver) {
// S+ Tethering mainline module (network_stack): tether offload
// loads under /sys/fs/bpf/tethering:
if (loadObject(bpfloader_ver, "tethering/", "offload.o")) return 1;
if (loadObject(bpfloader_ver, "tethering/", "test.o")) return 1;
if (loadObject(bpfloader_ver, "", "test.o")) return 1;
if (isAtLeastT) {
// T+ Tethering mainline module loads under:
// /sys/fs/bpf/net_shared: shared with netd & system server