Skip to content

chore: rebase upstream #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mayankpande88 merged 3 commits into from
Aug 5, 2024
Merged

chore: rebase upstream #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7af2e5
register non-tcp connections (UDP) in `active_connections`
def Aug 5, 2024
094c562
Merge pull request #119 from coroot/non_tcp_connection
def Aug 5, 2024
fedf910
Merge remote-tracking branch 'upstream/main' into rebase-upstream
mayankpande88 Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ebpftracer/ebpf.go
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 31 additions & 15 deletions ebpftracer/ebpf/tcp/state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,34 +199,50 @@ int sys_enter_connect(void *ctx) {
}

SEC("tracepoint/syscalls/sys_exit_connect")
int sys_exit_connect(void *ctx) {
int sys_exit_connect(struct trace_event_raw_sys_exit__stub* ctx) {
__u64 id = bpf_get_current_pid_tgid();
__u64 *fdp = bpf_map_lookup_elem(&fd_by_pid_tgid, &id);
if (!fdp) {
return 0;
}
struct connection_id cid = {};
cid.pid = id >> 32;
cid.fd = *fdp;
struct connection *conn = bpf_map_lookup_elem(&active_connections, &cid);
if (!conn && ctx->ret == 0) { // non-TCP connection
struct connection conn = {};
conn.timestamp = bpf_ktime_get_ns();
bpf_map_update_elem(&active_connections, &cid, &conn, BPF_ANY);
}
bpf_map_delete_elem(&fd_by_pid_tgid, &id);
return 0;
}

static inline __attribute__((__always_inline__))
int trace_exit_accept(struct trace_event_raw_sys_exit__stub* ctx) {
if (ctx->ret < 0) {
SEC("tracepoint/syscalls/sys_enter_close")
int sys_enter_close(void *ctx) {
struct trace_event_raw_args_with_fd__stub args = {};
if (bpf_probe_read(&args, sizeof(args), ctx) < 0) {
return 0;
}
__u64 id = bpf_get_current_pid_tgid();
bpf_map_update_elem(&fd_by_pid_tgid, &id, &args.fd, BPF_ANY);
return 0;
}

SEC("tracepoint/syscalls/sys_exit_close")
int sys_exit_close(struct trace_event_raw_sys_exit__stub* ctx) {
__u64 id = bpf_get_current_pid_tgid();
__u64 *fdp = bpf_map_lookup_elem(&fd_by_pid_tgid, &id);
if (!fdp) {
return 0;
}
struct connection_id cid = {};
cid.pid = id >> 32;
cid.fd = ctx->ret;
cid.fd = *fdp;
bpf_map_delete_elem(&active_connections, &cid);
bpf_map_delete_elem(&fd_by_pid_tgid, &id);
return 0;
}

SEC("tracepoint/syscalls/sys_exit_accept")
int sys_exit_accept(struct trace_event_raw_sys_exit__stub* ctx) {
return trace_exit_accept(ctx);
}

SEC("tracepoint/syscalls/sys_exit_accept4")
int sys_exit_accept4(struct trace_event_raw_sys_exit__stub* ctx) {
return trace_exit_accept(ctx);
}