Fix locking issue

eunomia-bpf · Nov 9, 2023 · 7a00458 · 7a00458
1 parent c7c303a
commit 7a00458
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/daemon/kernel/bpf_tracer.bpf.c b/daemon/kernel/bpf_tracer.bpf.c
@@ -334,14 +334,12 @@ static int process_bpf_syscall_exit(struct bpf_args_t *ap, int ret)
 						    .kernel_id = id };
 			set_bpf_fd_data(ret, &data);
 			bpf_printk("bpftime: bpf_link_create");
-			if (submit_bpf_events) {
-				bpf_printk("bpftime: Submitting link creation");
-				struct event *event =
-					get_ringbuf_sys_exit_bpf_event(ap, ret);
-				if (!event)
-					return 0;
-				bpf_ringbuf_submit(event, 0);
-			}
+			bpf_printk("bpftime: Submitting link creation");
+			struct event *event =
+				get_ringbuf_sys_exit_bpf_event(ap, ret);
+			if (!event)
+				return 0;
+			bpf_ringbuf_submit(event, 0);
 			break;
 		}
 		case BPF_BTF_LOAD: {

diff --git a/daemon/user/daemon_config.hpp b/daemon/user/daemon_config.hpp
@@ -34,7 +34,7 @@ struct daemon_config {
 	// should bpftime be involve
 	bool is_driving_bpftime = true;
 	// should trace and submit bpf related detail events
-	bool submit_bpf_events = true;
+	bool submit_bpf_events = false;
 	// specify whether uprobe should work similar to kernel uprobe and auto
 	// attach to the target process
 	bool enable_auto_attach = false;

diff --git a/runtime/src/bpf_map/shared/hash_map_kernel_user.hpp b/runtime/src/bpf_map/shared/hash_map_kernel_user.hpp
@@ -27,7 +27,7 @@ class hash_map_kernel_user_impl {
 	void init_map_fd();
 
     public:
-	const static bool should_lock = true;
+	const static bool should_lock = false;
 	hash_map_kernel_user_impl(managed_shared_memory &memory, int km_id);
 	~hash_map_kernel_user_impl();
 

diff --git a/runtime/src/bpf_map/shared/percpu_array_map_kernel_user.hpp b/runtime/src/bpf_map/shared/percpu_array_map_kernel_user.hpp
@@ -18,7 +18,7 @@ class percpu_array_map_kernel_user_impl {
 	bytes_vec value_data;
 
     public:
-	const static bool should_lock = true;
+	const static bool should_lock = false;
 	void *elem_lookup(const void *key);
 
 	long elem_update(const void *key, const void *value, uint64_t flags);

diff --git a/vm/llvm-jit/src/bpf_jit.cpp b/vm/llvm-jit/src/bpf_jit.cpp
@@ -42,6 +42,7 @@ extern "C" void __aeabi_unwind_cpp_pr1();
 
 ebpf_jit_fn bpf_jit_context::compile()
 {
+	spdlog::info("Compiling using LLJIT");
 	// Create a JIT builder
 	auto jit = ExitOnErr(LLJITBuilder().create());
 	auto &mainDylib = jit->getMainJITDylib();