Use the existing accept4 program instead of inet_csk_accept

Author: mmat11

bpf/generictracer/k_tracer.c

@@ -117,13 +117,10 @@ int BPF_KRETPROBE(obi_kretprobe_sys_accept4, s32 fd) {
     (void)ctx;
 
     u64 id = bpf_get_current_pid_tgid();
-
     if (!valid_pid(id)) {
         return 0;
     }
 
-    //bpf_dbg_printk("=== accept 4 ret id=%d ===", id);
-
     bpf_dbg_printk("=== accept 4 ret id=%d, fd=%d ===", id, fd);
 
     // The file descriptor is the value returned from the accept4 syscall.
@@ -138,6 +135,11 @@ int BPF_KRETPROBE(obi_kretprobe_sys_accept4, s32 fd) {
         goto cleanup;
     }
 
+    struct socket *sock = (struct socket *)args->addr;
+    struct sock *sk = BPF_CORE_READ(sock, sk);
+    struct sock_port_ns np = sock_port_ns_from_sk(sk);
+    bpf_map_update_elem(&listening_ports, &np, &(bool){true}, BPF_ANY);
+
     ssl_pid_connection_info_t info = {};
 
     if (parse_accept_socket_info(args, &info.p_conn.conn)) {
@@ -1053,20 +1055,6 @@ int obi_handle_buf_with_args(void *ctx) {
     return 0;
 }
 
-SEC("kprobe/inet_csk_accept")
-int BPF_KPROBE(obi_kprobe_inet_csk_accept, struct sock *sk) {
-    (void)ctx;
-
-    u64 id = bpf_get_current_pid_tgid();
-    (void)id;
-
-    bpf_dbg_printk("=== inet_csk_accept id=%d ===", id);
-
-    struct sock_port_ns np = sock_port_ns_from_sk(sk);
-    bpf_map_update_elem(&listening_ports, &np, &(bool){true}, BPF_ANY);
-    return 0;
-}
-
 SEC("kprobe/inet_csk_listen_stop")
 int BPF_KPROBE(obi_kprobe_inet_csk_listen_stop, struct sock *sk) {
     (void)ctx;

pkg/components/ebpf/generictracer/generictracer.go

@@ -304,10 +304,6 @@ func (p *Tracer) KProbes() map[string]ebpfcommon.ProbeDesc {
 			Start:    p.bpfObjects.ObiKprobeUnixStreamSendmsg,
 			End:      p.bpfObjects.ObiKretprobeUnixStreamSendmsg,
 		},
-		"inet_csk_accept": {
-			Required: true,
-			Start:    p.bpfObjects.ObiKprobeInetCskAccept,
-		},
 		"inet_csk_listen_stop": {
 			Required: true,
 			Start:    p.bpfObjects.ObiKprobeInetCskListenStop,