Fix #48 (libbpf building issue) (#58)

* Revert changes Try fixing Update Fix building of old libbpf * Fix CI * Fix CI * Fix CI * Remove bundled libbpf; use bpftool instead
eunomia-bpf · Oct 28, 2023 · e0c3ae7 · e0c3ae7
1 parent 3471e62
commit e0c3ae7
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 33 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "third_party/libbpf"]
-	path = third_party/libbpf
-	url = https://github.com/libbpf/libbpf.git
 [submodule "third_party/bpftool"]
 	path = third_party/bpftool
 	url = https://github.com/libbpf/bpftool

diff --git a/cmake/libbpf.cmake b/cmake/libbpf.cmake
@@ -16,40 +16,41 @@ ExternalProject_Add(libbpf
 
 # Set BpfObject input parameters -- note this is usually not necessary unless
 # you're in a highly vendored environment (like libbpf-bootstrap)
-set(LIBBPF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/libbpf)
+set(LIBBPF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/libbpf/)
 set(LIBBPF_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/libbpf/libbpf.a)
 
 set(header_output_list)
 
-function(copy_header TARGET SRC_DIR TARGET_DIR)
+function(copy_header SRC_DIR TARGET_DIR)
   file(GLOB_RECURSE FILES RELATIVE "${SRC_DIR}" "${SRC_DIR}/*")
   message(STATUS "copying ${FILES} from ${SRC_DIR} to ${TARGET_DIR}")
 
   foreach(file ${FILES})
     get_filename_component(PARENT_DIR "${TARGET_DIR}/${file}" DIRECTORY)
     add_custom_command(
-      PRE_BUILD
       COMMAND ${CMAKE_COMMAND} -E make_directory ${PARENT_DIR}
       COMMAND ${CMAKE_COMMAND} -E copy
       ${SRC_DIR}/${file}
       ${TARGET_DIR}/${file}
-      COMMENT "Copying file ${HEADER_DIRS}/${file} to ${TARGET_DIR}/${file}"
-      BYPRODUCTS ${TARGET_DIR}/${file}
+      COMMENT "Copying file ${SRC_DIR}/${file} to ${TARGET_DIR}/${file}"
       OUTPUT ${TARGET_DIR}/${file}
       DEPENDS ${SRC_DIR}/${file}
     )
     list(APPEND header_output_list ${TARGET_DIR}/${file})
+    set(header_output_list ${header_output_list} PARENT_SCOPE)
   endforeach()
 endfunction()
 
-copy_header(copy_headers "${LIBBPF_DIR}/include/linux" "${LIBBPF_INCLUDE_DIRS}/linux")
-copy_header(copy_headers "${LIBBPF_DIR}/include/uapi/linux" "${LIBBPF_INCLUDE_DIRS}/linux")
-
+copy_header("${LIBBPF_DIR}/include/linux" "${LIBBPF_INCLUDE_DIRS}/linux")
+copy_header("${LIBBPF_DIR}/include/uapi/" "${LIBBPF_INCLUDE_DIRS}/uapi")
+copy_header("${LIBBPF_DIR}/include/uapi/linux" "${LIBBPF_INCLUDE_DIRS}/linux")
 add_custom_target(copy_headers ALL
   COMMENT "Copying headers"
   DEPENDS ${header_output_list}
 )
 
+message(STATUS "All headers to copy: ${header_output_list}")
+
 set(HEADER_FILES relo_core.h hashmap.h nlattr.h libbpf_internal.h)
 
 foreach(file ${HEADER_FILES})

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
@@ -25,7 +25,6 @@ add_dependencies(libbpftime_daemon
 
 target_include_directories(libbpftime_daemon PRIVATE 
     ${CMAKE_CURRENT_BINARY_DIR} 
-    ${LIBBPF_INCLUDE_DIRS}/uapi
     ${LIBBPF_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../vm/include

diff --git a/daemon/test/CMakeLists.txt b/daemon/test/CMakeLists.txt
@@ -17,28 +17,27 @@ set(TEST_SOURCES
 add_executable(bpftime_daemon_tests ${TEST_SOURCES})
 set_property(TARGET bpftime_daemon_tests PROPERTY CXX_STANDARD 20)
 add_dependencies(bpftime_daemon_tests runtime bpftime-object)
-target_link_libraries(bpftime_daemon_tests PRIVATE 
-runtime 
-bpftime-object 
-Catch2::Catch2WithMain 
-libbpftime_daemon
+target_link_libraries(bpftime_daemon_tests PRIVATE
+    runtime
+    bpftime-object
+    Catch2::Catch2WithMain
+    libbpftime_daemon
 )
-target_include_directories(bpftime_daemon_tests 
+target_include_directories(bpftime_daemon_tests
     PRIVATE
-    ${BPFTIME_RUNTIME_INCLUDE} 
-    ${BPFTIME_OBJECT_INCLUDE_DIRS} 
-    ${Catch2_INCLUDE} 
+    ${BPFTIME_RUNTIME_INCLUDE}
+    ${BPFTIME_OBJECT_INCLUDE_DIRS}
+    ${Catch2_INCLUDE}
     ${Boost_INCLUDE}
     ../
 )
 add_test(NAME bpftime_daemon_tests COMMAND bpftime_daemon_tests)
 
 # These are necessary ebpf program required by the test
 # set(used_ebpf_programs
-#     uprobe
-#     # replace # Not used now
-#     filter)
-
+# uprobe
+# # replace # Not used now
+# filter)
 foreach(current ${used_ebpf_programs})
     set(curr_target_name bpftime_test_ebpf_prog_${current})
     add_ebpf_program_target(${curr_target_name} ${CMAKE_CURRENT_SOURCE_DIR}/assets/${current}.bpf.c ${CMAKE_CURRENT_BINARY_DIR}/${current}.bpf.o)

diff --git a/daemon/user/bpftime_driver.cpp b/daemon/user/bpftime_driver.cpp
@@ -126,7 +126,7 @@ int bpftime_driver::check_and_create_prog_related_maps(
 	map_ids.resize(info->nr_map_ids);
 	new_info.nr_map_ids = info->nr_map_ids;
 	new_info.map_ids = (unsigned long long)(uintptr_t)map_ids.data();
-	int res = bpf_prog_get_info_by_fd(fd, &new_info, &info_len);
+	int res = bpf_obj_get_info_by_fd(fd, &new_info, &info_len);
 	if (res < 0) {
 		spdlog::error(
 			"Failed to get prog info for fd {} to find related maps",
@@ -204,7 +204,7 @@ int bpftime_driver::bpftime_maps_create_server(int kernel_id)
 	}
 	bpf_map_info info = {};
 	uint32_t info_len = sizeof(info);
-	int res = bpf_map_get_info_by_fd(map_fd, &info, &info_len);
+	int res = bpf_obj_get_info_by_fd(map_fd, &info, &info_len);
 	if (res < 0) {
 		spdlog::error("Failed to get map info for id {}", kernel_id);
 		return -1;

diff --git a/daemon/user/handle_bpf_event.cpp b/daemon/user/handle_bpf_event.cpp
@@ -380,4 +380,4 @@ bpf_event_handler::bpf_event_handler(struct daemon_config config,
 	}
 
 	perf_type_id_strings[kprobe_type] = "PERF_TYPE_KPROBE";
-}
+}
diff --git a/example/malloc/malloc.c b/example/malloc/malloc.c
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
 		goto cleanup;
 	}
 	LIBBPF_OPTS(bpf_uprobe_opts, attach_opts, .func_name = "malloc",
-		    .retprobe = false, .attach_mode = PROBE_ATTACH_MODE_PERF);
+		    .retprobe = false);
 	struct bpf_link *attach = bpf_program__attach_uprobe_opts(
 		skel->progs.do_count, -1, "/lib/x86_64-linux-gnu/libc.so.6", 0,
 		&attach_opts);

diff --git a/example/sslsniff/sslsniff.bpf.c b/example/sslsniff/sslsniff.bpf.c
@@ -10,6 +10,14 @@
 #include <bpf/bpf_tracing.h>
 #include "sslsniff.h"
 
+#ifndef BPF_UPROBE
+#define BPF_UPROBE BPF_KPROBE
+#endif
+#ifndef BPF_URETPROBE
+#define BPF_URETPROBE BPF_KRETPROBE
+#endif
+
+
 struct {
     __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
     __uint(key_size, sizeof(__u32));

diff --git a/runtime/src/bpf_map/array_map_kernel_user.cpp b/runtime/src/bpf_map/array_map_kernel_user.cpp
@@ -34,7 +34,7 @@ void array_map_kernel_user_impl::init_map_fd()
 	}
 	bpf_map_info info = {};
 	unsigned int info_len = sizeof(info);
-	int res = bpf_map_get_info_by_fd(map_fd, &info, &info_len);
+	int res = bpf_obj_get_info_by_fd(map_fd, &info, &info_len);
 	if (res < 0) {
 		spdlog::error("Failed to get info for kernel map id {}",
 			      kernel_map_id);

diff --git a/runtime/src/bpf_map/hash_map_kernel_user.cpp b/runtime/src/bpf_map/hash_map_kernel_user.cpp
@@ -19,7 +19,7 @@ void hash_map_kernel_user_impl::init_map_fd()
 	}
 	bpf_map_info info = {};
 	unsigned int info_len = sizeof(info);
-	int res = bpf_map_get_info_by_fd(map_fd, &info, &info_len);
+	int res = bpf_obj_get_info_by_fd(map_fd, &info, &info_len);
 	if (res < 0) {
 		spdlog::error("Failed to get info for kernel map id {}",
 			      kernel_map_id);

diff --git a/runtime/test/bpf/replace.bpf.c b/runtime/test/bpf/replace.bpf.c
@@ -3,6 +3,13 @@
 #include "bpf/bpf_helpers.h"
 #include "ffi.bpf.h"
 
+#ifndef BPF_UPROBE
+#define BPF_UPROBE BPF_KPROBE
+#endif
+#ifndef BPF_URETPROBE
+#define BPF_URETPROBE BPF_KRETPROBE
+#endif
+
 static inline int add_func(int a, int b)
 {
 	return FFI_CALL_NAME_2("add_func", a, b);

diff --git a/runtime/unit-test/assets/filter.bpf.c b/runtime/unit-test/assets/filter.bpf.c
@@ -3,6 +3,13 @@
 #include "bpf/bpf_helpers.h"
 #include "ffi.bpf.h"
 
+#ifndef BPF_UPROBE
+#define BPF_UPROBE BPF_KPROBE
+#endif
+#ifndef BPF_URETPROBE
+#define BPF_URETPROBE BPF_KRETPROBE
+#endif
+
 enum PatchOp {
 	OP_SKIP,
 	OP_RESUME,

diff --git a/runtime/unit-test/assets/replace.bpf.c b/runtime/unit-test/assets/replace.bpf.c
@@ -3,6 +3,13 @@
 #include "bpf/bpf_helpers.h"
 #include "ffi.bpf.h"
 
+#ifndef BPF_UPROBE
+#define BPF_UPROBE BPF_KPROBE
+#endif
+#ifndef BPF_URETPROBE
+#define BPF_URETPROBE BPF_KRETPROBE
+#endif
+
 static inline int add_func(int a, int b)
 {
 	return FFI_CALL_NAME_2("add_func", a, b);

diff --git a/runtime/unit-test/assets/uprobe.bpf.c b/runtime/unit-test/assets/uprobe.bpf.c
@@ -3,6 +3,15 @@
 #include <bpf/bpf_tracing.h>
 #include <bpf/bpf_helpers.h>
 
+#ifndef BPF_UPROBE
+#define BPF_UPROBE BPF_KPROBE
+#endif
+#ifndef BPF_URETPROBE
+#define BPF_URETPROBE BPF_KRETPROBE
+#endif
+
+
+
 SEC("uprobe")
 int BPF_UPROBE(my_function_uprobe, int parm1, char* str, char c) {
 	bpf_printk("BPF_UPROBE: %d %s %c\n", parm1, str, c);

diff --git a/third_party/bpftool b/third_party/bpftool
diff --git a/third_party/libbpf b/third_party/libbpf
diff --git a/third_party/libbpf b/third_party/libbpf
@@ -0,0 +1 @@
+./bpftool/libbpf/
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	perf_type_id_strings[kprobe_type] = "PERF_TYPE_KPROBE";
-    }
+    }
+10 −33		.github/workflows/build.yaml
+7 −15		.github/workflows/docker.yaml
+0 −86		.github/workflows/lint-commits.yaml
+0 −27		.github/workflows/lint-shell.yaml
+20 −0		.github/workflows/lint.yaml
+0 −147		.github/workflows/release.yaml
+0 −60		.github/workflows/static-build.yaml
+1 −1		BPF-CHECKPOINT-COMMIT
+1 −1		CHECKPOINT-COMMIT
+3 −5		Dockerfile
+4 −35		README.md
+24 −21		bash-completion/bpftool
+2 −2		docs/bpftool-gen.rst
+4 −4		docs/bpftool-map.rst
+14 −15		docs/bpftool-prog.rst
+4 −8		docs/bpftool-struct_ops.rst
+0 −4		include/linux/compiler-gcc.h
+0 −4		include/linux/compiler.h
+17 −158		include/uapi/linux/bpf.h
+1 −1		include/uapi/linux/const.h
+0 −1		include/uapi/linux/if_link.h
+1 −5		include/uapi/linux/perf_event.h
+1 −1		libbpf
+1 −18		scripts/README.md
+0 −91		scripts/gh-label-release-assets.sh
+11 −11		scripts/sync-kernel-expected-diff.patch
+2 −7		src/Makefile
+15 −72		src/Makefile.feature
+5 −8		src/btf.c
+2 −85		src/btf_dumper.c
+13 −16		src/cfg.c
+1 −4		src/cfg.h
+2 −2		src/cgroup.c
+9 −27		src/common.c
+16 −16		src/feature.c
+1 −1		src/iter.c
+4 −1		src/json_writer.c
+0 −1		src/json_writer.h
+3 −98		src/link.c
+2 −11		src/main.h
+7 −20		src/map.c
+0 −106		src/net.c
+79 −128		src/prog.c
+5 −21		src/skeleton/pid_iter.bpf.c
+10 −17		src/skeleton/profiler.bpf.c
+14 −60		src/struct_ops.c
+3 −51		src/xlated_dumper.c
+1 −2		src/xlated_dumper.h