eunomia-bpf · yunwei37 · Nov 20, 2023 · Nov 20, 2023 · Nov 20, 2023 · Nov 20, 2023
diff --git a/.github/workflows/test-verifier.yml b/.github/workflows/test-verifier.yml
@@ -19,8 +19,7 @@ jobs:
           sudo apt-get install binutils-dev libboost1.74-all-dev libelf-dev zlib1g-dev ninja-build libyaml-cpp-dev -y
       - name: Build test target
         run: |
-          cmake -DBPFTIME_ENABLE_UNIT_TESTING=YES -DBPFTIME_LLVM_JIT=NO -DENABLE_EBPF_VERIFIER=YES -DCMAKE_BUILD_TYPE:STRING=Release -S . -B build -G Ninja
-          cmake --build build --config Release --target bpftime_verifier_tests
+          make build-with-user-verifier
       - name: Run tests
         run: |
           ./build/bpftime-verifier/bpftime_verifier_tests
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "verifier/ebpf-verifier"]
 	path = bpftime-verifier/ebpf-verifier
 	url = https://github.com/vbpf/ebpf-verifier
+[submodule "third_party/Catch2"]
+	path = third_party/Catch2
+	url = https://github.com/catchorg/Catch2.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,6 +77,8 @@ endif()
 
 # spdlog
 add_subdirectory(third_party/spdlog)
+# catch2
+add_subdirectory(third_party/Catch2)
 
 set(SPDLOG_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include)
 

diff --git a/Makefile b/Makefile
@@ -63,6 +63,10 @@ build-llvm: ## build with llvm as jit backend
 	cmake -Bbuild  -DBPFTIME_ENABLE_UNIT_TESTING=1 -DBPFTIME_LLVM_JIT=1
 	cmake --build build --config Debug
 
+build-with-user-verifier: ## build with userspace ebpf verifier
+	cmake -DBPFTIME_ENABLE_UNIT_TESTING=YES -DBPFTIME_LLVM_JIT=NO -DENABLE_EBPF_VERIFIER=YES -DCMAKE_BUILD_TYPE:STRING=Release -B build
+	cmake --build build --config Release --target bpftime_verifier_tests
+
 clean: ## clean the project
 	rm -rf build
 	make -C runtime clean

diff --git a/bpftime-verifier/CMakeLists.txt b/bpftime-verifier/CMakeLists.txt
@@ -21,16 +21,6 @@ set(TEST_SOURCES
     test/non_kernel_helper.cpp
 )
 
-Include(FetchContent)
-
-FetchContent_Declare(
-    Catch2
-    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG v3.0.1
-)
-
-FetchContent_MakeAvailable(Catch2)
-
 add_executable(bpftime_verifier_tests ${TEST_SOURCES})
 add_dependencies(bpftime_verifier_tests bpftime-verifier)
 target_link_libraries(bpftime_verifier_tests PRIVATE bpftime-verifier Catch2::Catch2WithMain)

diff --git a/daemon/kernel/bpf_tracer.bpf.c b/daemon/kernel/bpf_tracer.bpf.c
@@ -398,7 +398,7 @@ process_perf_event_open_enter(struct trace_event_raw_sys_enter *ctx)
 		return 0;
 	}
 	bpf_probe_read_user(&new_attr_buffer, sizeof(new_attr_buffer), attr);
-	struct perf_event_attr* new_attr_pointer = &new_attr_buffer;
+	struct perf_event_attr* new_attr_pointer = (struct perf_event_attr*)&new_attr_buffer;
 	if (new_attr_pointer->type == uprobe_perf_type) {
 		// found uprobe
 		if (enable_replace_uprobe) {

diff --git a/daemon/test/CMakeLists.txt b/daemon/test/CMakeLists.txt
@@ -1,12 +1,3 @@
-Include(FetchContent)
-FetchContent_Declare(
-    Catch2
-    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG v3.0.1
-)
-
-FetchContent_MakeAvailable(Catch2)
-
 find_package(Boost REQUIRED)
 
 set(TEST_SOURCES

diff --git a/example/hot_patch/redis/.gitignore → example/patch/redis/.gitignore b/example/hot_patch/redis/.gitignore → example/patch/redis/.gitignore
diff --git a/example/hot_patch/redis/Makefile → example/patch/redis/Makefile b/example/hot_patch/redis/Makefile → example/patch/redis/Makefile
diff --git a/example/hot_patch/redis/README.md → example/patch/redis/README.md b/example/hot_patch/redis/README.md → example/patch/redis/README.md
diff --git a/example/hot_patch/redis/ffi.bpf.h → example/patch/redis/ffi.bpf.h b/example/hot_patch/redis/ffi.bpf.h → example/patch/redis/ffi.bpf.h
diff --git a/example/hot_patch/redis/redis-patch.bpf.c → example/patch/redis/redis-patch.bpf.c b/example/hot_patch/redis/redis-patch.bpf.c → example/patch/redis/redis-patch.bpf.c
diff --git a/example/hot_patch/redis/redis-patch.c → example/patch/redis/redis-patch.c b/example/hot_patch/redis/redis-patch.c → example/patch/redis/redis-patch.c
diff --git a/example/hot_patch/redis/redis-server.h → example/patch/redis/redis-server.h b/example/hot_patch/redis/redis-server.h → example/patch/redis/redis-server.h
diff --git a/example/hot_patch/vim/README.md → example/patch/vim/README.md b/example/hot_patch/vim/README.md → example/patch/vim/README.md
diff --git a/example/hot_patch/vim/poc.bpf.c → example/patch/vim/poc.bpf.c b/example/hot_patch/vim/poc.bpf.c → example/patch/vim/poc.bpf.c
diff --git a/example/sslsniff/README.md b/example/sslsniff/README.md
@@ -1,5 +1,2 @@
 # sslsniff
 
-Not working because we refactored the runtime.
-
-TODO: make the ring buffer work again.
diff --git a/runtime/test/bpf/global.bpf.c b/runtime/test/bpf/global.bpf.c
diff --git a/runtime/test/bpf/patch.bpf.c b/runtime/test/bpf/patch.bpf.c
diff --git a/runtime/unit-test/CMakeLists.txt b/runtime/unit-test/CMakeLists.txt
@@ -1,11 +1,3 @@
-Include(FetchContent)
-FetchContent_Declare(
-    Catch2
-    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG v3.0.1
-)
-
-FetchContent_MakeAvailable(Catch2)
 
 find_package(Boost REQUIRED)
 

diff --git a/third_party/Catch2 b/third_party/Catch2
diff --git a/tools/cli-rs/src/main.rs b/tools/cli-rs/src/main.rs
@@ -153,6 +153,7 @@ fn run_command(
     }
     Ok(())
 }
+
 #[allow(unused)]
 fn my_execve(
     path: impl AsRef<str>,

diff --git a/vm/README.md b/vm/README.md
@@ -41,4 +41,5 @@ see [github.com/eunomia-bpf/bpf-benchmark](https://github.com/eunomia-bpf/bpf-be
 
 ## Roadmap
 
+- [ ] Replace simple JIT with ubpf
 - [ ] AOT support for LLVM JIT
-Original file line number
+Diff line change
@@ Expand Up / @@ -153,6 +153,7 @@ fn run_command( @@
         }
         Ok(())
     }
     #[allow(unused)]
     fn my_execve(
         path: impl AsRef<str>,
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,4 +41,5 @@ see [github.com/eunomia-bpf/bpf-benchmark](https://github.com/eunomia-bpf/bpf-be

		## Roadmap

		- [ ] Replace simple JIT with ubpf
		- [ ] AOT support for LLVM JIT