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

Rename time_in_state.o to timeInState.o

Browse Source 
Underscore character may cause bpf prog/map naming collision. For
example, x.o with map y_z and x_y.o with map z both result in x_y_z
prog/map name, which should be prevented during compile-time.

aosp/2147825 will prohibit underscore character in bpf source name
(source name derives the obj name). Existing bpf modules with underscore
characters in source name need to be updated accordingly.

Bug: 236706995
Test: adb root; adb shell ls -l /sys/fs/bpf/ | grep timeInState
Test: atest CtsNativeNetTestCases:BpfTest#bpfStructSizeTest
Change-Id: Ic1ded563b8d42ecde3d32a27130f9f01a89c8572
This commit is contained in:
Ken Chen
2022-07-10 19:09:27 +08:00
parent 7acc4e6db6
commit e8bc257597
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/net/native/src/BpfCompatTest.cpp
View File

@@ -49,10 +49,11 @@ TEST(BpfTest, bpfStructSizeTestPreT) {
TEST(BpfTest, bpfStructSizeTest) { TEST(BpfTest, bpfStructSizeTest) {
if (android::modules::sdklevel::IsAtLeastU()) { if (android::modules::sdklevel::IsAtLeastU()) {
doBpfStructSizeTest("/system/etc/bpf/gpuMem.o"); doBpfStructSizeTest("/system/etc/bpf/gpuMem.o");
doBpfStructSizeTest("/system/etc/bpf/timeInState.o");
} else { } else {
doBpfStructSizeTest("/system/etc/bpf/gpu_mem.o"); doBpfStructSizeTest("/system/etc/bpf/gpu_mem.o");
doBpfStructSizeTest("/system/etc/bpf/time_in_state.o");
} }
doBpfStructSizeTest("/system/etc/bpf/time_in_state.o");
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {