use inet_sock_destruct instead

DataDog · Nov 5, 2024 · 9927c74 · 9927c74
1 parent 76e86c6
commit 9927c74
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pkg/network/ebpf/c/tracer.c b/pkg/network/ebpf/c/tracer.c
@@ -324,17 +324,17 @@ int BPF_KRETPROBE(kretprobe__tcp_close_flush) {
     return 0;
 }
 
-SEC("kprobe/tcp_v4_destroy_sock")
-int BPF_BYPASSABLE_KPROBE(kprobe__tcp_v4_destroy_sock, struct sock *sk) {
+SEC("kprobe/inet_sock_destruct")
+int BPF_BYPASSABLE_KPROBE(kprobe__inet_sock_destruct, struct sock *sk) {
     conn_tuple_t t = {};
     u64 pid_tgid = bpf_get_current_pid_tgid();
 
     // Get network namespace id
-    log_debug("adamk kprobe/tcp_v4_destroy_sock: tgid: %llu, pid: %llu", pid_tgid >> 32, pid_tgid & 0xFFFFFFFF);
+    log_debug("adamk kprobe/inet_sock_destruct: tgid: %llu, pid: %llu", pid_tgid >> 32, pid_tgid & 0xFFFFFFFF);
     if (!read_conn_tuple(&t, sk, pid_tgid, CONN_TYPE_TCP)) {
         return 0;
     }
-    log_debug("adamk kprobe/tcp_v4_destroy_sock: netns: %u, sport: %u, dport: %u", t.netns, t.sport, t.dport);
+    log_debug("adamk kprobe/inet_sock_destruct: netns: %u, sport: %u, dport: %u", t.netns, t.sport, t.dport);
 
     bpf_map_delete_elem(&conn_close_flushed, &t);
 

diff --git a/pkg/network/ebpf/probes/probes.go b/pkg/network/ebpf/probes/probes.go
@@ -82,8 +82,8 @@ const (
 
 	// TCPClose traces the tcp_close() system call
 	TCPClose ProbeFuncName = "kprobe__tcp_close"
-	// TCPDestroySock does stuff
-	TCPDestroySock ProbeFuncName = "kprobe__tcp_v4_destroy_sock"
+	// TCPInetSockDestruct traces the inet_sock_destruct() system call
+	TCPInetSockDestruct ProbeFuncName = "kprobe__inet_sock_destruct"
 	// TCPDone traces the tcp_done() system call
 	TCPDone ProbeFuncName = "kprobe__tcp_done"
 	// TCPDoneFlushReturn traces the return of the tcp_done() system call

diff --git a/pkg/network/tracer/connection/kprobe/config.go b/pkg/network/tracer/connection/kprobe/config.go
@@ -76,7 +76,7 @@ func enabledProbes(c *config.Config, runtimeTracer, coreTracer bool) (map[probes
 		enableProbe(enabled, probes.TCPReadSock)
 		enableProbe(enabled, probes.TCPReadSockReturn)
 		enableProbe(enabled, probes.TCPClose)
-		enableProbe(enabled, probes.TCPDestroySock)
+		enableProbe(enabled, probes.TCPInetSockDestruct)
 		enableProbe(enabled, probes.TCPCloseFlushReturn)
 		enableProbe(enabled, probes.TCPConnect)
 		enableProbe(enabled, probes.TCPDone)

diff --git a/pkg/network/tracer/connection/kprobe/manager.go b/pkg/network/tracer/connection/kprobe/manager.go
@@ -31,7 +31,7 @@ var mainProbes = []probes.ProbeFuncName{
 	probes.TCPReadSock,
 	probes.TCPReadSockReturn,
 	probes.TCPClose,
-	probes.TCPDestroySock,
+	probes.TCPInetSockDestruct,
 	probes.TCPDone,
 	probes.TCPDoneFlushReturn,
 	probes.TCPCloseCleanProtocolsReturn,