[Fix] fix

hengyoush · Sep 10, 2024 · e7f5f90 · e7f5f90
1 parent c501670
commit e7f5f90
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 21 deletions.
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -397,6 +397,7 @@ func TestRecvmsg(t *testing.T) {
 				connIdDirect:     bpf.AgentTrafficDirectionTKIngress,
 				pid:              uint64(os.Getpid()),
 				fd:               uint32(conn.TgidFd),
+				ignoreFuncName:   true,
 				funcName:         "syscall",
 				dataLen:          uint32(readBufSizeSlice[index]),
 				seq:              seq,
@@ -644,6 +645,7 @@ func TestSendMsg(t *testing.T) {
 			KernDataEventAssertConditions: KernDataEventAssertConditions{connIdDirect: bpf.AgentTrafficDirectionTKEgress,
 				pid:              uint64(os.Getpid()),
 				fd:               uint32(conn.TgidFd),
+				ignoreFuncName:   true,
 				funcName:         "syscall",
 				dataLen:          uint32(len(sendMessages[index])),
 				seq:              seq,

diff --git a/bpf/agent_x86_bpfel.go b/bpf/agent_x86_bpfel.go
diff --git a/bpf/agentold_x86_bpfel.go b/bpf/agentold_x86_bpfel.go
diff --git a/bpf/pktlatency.bpf.c b/bpf/pktlatency.bpf.c
@@ -1529,17 +1529,20 @@ int tracepoint__syscalls__sys_exit_close(struct trace_event_raw_sys_exit *ctx)
 
 
 //int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
-SEC("kprobe/__sys_connect")
-int BPF_KPROBE(connect_entry, int sockfd, const struct sockaddr* addr) {
+// SEC("kprobe/__sys_connect")
+// int BPF_KPROBE(connect_entry, int sockfd, const struct sockaddr* addr) {
+SEC("tracepoint/syscalls/sys_enter_connect")
+int tracepoint__syscalls__sys_enter_connect(struct trace_event_raw_sys_enter *ctx) {
 	uint64_t id = bpf_get_current_pid_tgid();
 
 	struct connect_args args = {0};
-	args.fd = sockfd;
-	args.addr = addr;
+	TP_ARGS(&args.fd, 0, ctx)
+	TP_ARGS(&args.addr, 1, ctx)
 	args.start_ts = bpf_ktime_get_ns();
 	bpf_map_update_elem(&connect_args_map, &id, &args, BPF_ANY);
 	return 0;
 }
+
 SEC("tracepoint/syscalls/sys_exit_connect")
 int tracepoint__syscalls__sys_exit_connect(struct trace_event_raw_sys_exit *ctx) {
 	uint64_t id = bpf_get_current_pid_tgid();
@@ -1555,12 +1558,15 @@ int tracepoint__syscalls__sys_exit_connect(struct trace_event_raw_sys_exit *ctx)
 }
 
 
-SEC("kprobe/accept4")
-int BPF_KPROBE(accept4_entry, int sockfd, struct sockaddr* addr) {
+// SEC("kprobe/accept4")
+// int BPF_KPROBE(accept4_entry, int sockfd, struct sockaddr* addr) {
+
+SEC("tracepoint/syscalls/sys_enter_accept4")
+int tracepoint__syscalls__sys_enter_accept4(struct trace_event_raw_sys_enter *ctx) {
 	uint64_t id = bpf_get_current_pid_tgid();
 
 	struct accept_args args = {0};
-	args.addr = addr;
+	TP_ARGS(&args.addr, 1, ctx)
 	bpf_map_update_elem(&accept_args_map, &id, &args, BPF_ANY);
 	return 0;
 }

diff --git a/bpf/prog.go b/bpf/prog.go
@@ -29,7 +29,7 @@ func GetProgram(programs any, fieldName string) *ebpf.Program {
 
 /* accept pair */
 func AttachSyscallAcceptEntry(programs interface{}) link.Link {
-	return kprobe("__sys_accept4", GetProgram(programs, "Accept4Entry"))
+	return tracepoint("syscalls", "sys_enter_accept4", GetProgram(programs, "TracepointSyscallsSysEnterAccept4"))
 }
 
 func AttachSyscallAcceptExit(programs interface{}) link.Link {
@@ -43,7 +43,7 @@ func AttachSyscallSockAllocExit(programs interface{}) link.Link {
 
 /* connect pair */
 func AttachSyscallConnectEntry(programs interface{}) link.Link {
-	return kprobe("__sys_connect", GetProgram(programs, "ConnectEntry"))
+	return tracepoint("syscalls", "sys_enter_connect", GetProgram(programs, "TracepointSyscallsSysEnterConnect"))
 }
 
 func AttachSyscallConnectExit(programs interface{}) link.Link {