commit 8693c789d3ba1b6787bc9c00d105b808a50d375c
author Ken Chen <cken@google.com> Sat Jul 09 14:22:38 2022 +0800
committer Ken Chen <cken@google.com> Sun Jul 10 18:31:18 2022 +0800
tree 91ac4e54cef7b4178f5fe576e3281c7b1d49c52c
parent d6c6835f27225b820365fc7950c635541adfdc42

Rename bpf_load_tp_prog.o and bpf_load_tp_prog_btf.o

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: atest libbpf_load_test
Change-Id: I037ccfedc4d2e48688ee47f575c73998ce1c2c4b

libbpf_android/BpfLoadTest.cpp

diff --git a/libbpf_android/BpfLoadTest.cpp b/libbpf_android/BpfLoadTest.cpp
index d5e5814..8e853b9 100644
--- a/libbpf_android/BpfLoadTest.cpp
+++ b/libbpf_android/BpfLoadTest.cpp
@@ -101,7 +101,7 @@
         // Earlier kernels lack BPF_BTF_LOAD support
         if (!isAtLeastKernelVersion(4, 19, 0)) GTEST_SKIP() << "pre-4.19 kernel does not support BTF";
 
-        const bool haveBtf = GetParam().find("btf") != std::string::npos;
+        const bool haveBtf = GetParam().find("Btf") != std::string::npos;
 
         std::string str;
         EXPECT_EQ(android::base::ReadFileToString(mTpMapPath, &str), haveBtf);
@@ -115,8 +115,7 @@
 };
 
 INSTANTIATE_TEST_SUITE_P(BpfLoadTests, BpfLoadTest,
-                         ::testing::Values("bpf_load_tp_prog",
-                                           "bpf_load_tp_prog_btf"));
+                         ::testing::Values("bpfLoadTpProg", "bpfLoadTpProgBtf"));
 
 TEST_P(BpfLoadTest, bpfCheckMap) {
     checkMapNonZero();