Skip to content

Commit

Permalink
[eBPF] Remove duplicate data caused by MSG_PEEK #20313 (#2460)
Browse files Browse the repository at this point in the history
The recv() function usually takes a last argument of 0, which means fetch from the buffer, whereas MSG_PEEK means just look at the data, not fetch the data. As a result, the ebpf gets a lot of duplicate data.

We made a judgment at sys_enter_recvfrom/sys_recvmmsg/sys_recvmsg, not to collect data with MSG_PEEK.
  • Loading branch information
yinjiping committed Feb 21, 2023
1 parent 87a7240 commit 5c66744
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
1 change: 1 addition & 0 deletions agent/src/ebpf/kernel/include/socket_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ struct syscall_comm_enter_ctx {
};
};
size_t count; /* 32 8 */
unsigned int flags;
};

struct sched_comm_exit_ctx {
Expand Down
22 changes: 18 additions & 4 deletions agent/src/ebpf/kernel/socket_trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1181,15 +1181,20 @@ TPPROG(sys_exit_sendto) (struct syscall_comm_exit_ctx *ctx) {
struct data_args_t* write_args = active_write_args_map__lookup(&id);
if (write_args != NULL) {
process_syscall_data((struct pt_regs*)ctx, id, T_EGRESS, write_args, bytes_count);
active_write_args_map__delete(&id);
}

active_write_args_map__delete(&id);
return 0;
}

// ssize_t recvfrom(int sockfd, void *buf, size_t len, int flags,
// struct sockaddr *src_addr, socklen_t *addrlen);
TPPROG(sys_enter_recvfrom) (struct syscall_comm_enter_ctx *ctx) {
// If flags contains MSG_PEEK, it is returned directly.
// ref : https://linux.die.net/man/2/recvfrom
if (ctx->flags & MSG_PEEK)
return 0;

__u64 id = bpf_get_current_pid_tgid();
int sockfd = (int)ctx->fd;
char *buf = (char *)ctx->buf;
Expand All @@ -1213,8 +1218,9 @@ TPPROG(sys_exit_recvfrom) (struct syscall_comm_exit_ctx *ctx) {
struct data_args_t* read_args = active_read_args_map__lookup(&id);
if (read_args != NULL) {
process_syscall_data((struct pt_regs *)ctx, id, T_INGRESS, read_args, bytes_count);
active_read_args_map__delete(&id);
}
active_read_args_map__delete(&id);

return 0;
}

Expand Down Expand Up @@ -1250,9 +1256,9 @@ TPPROG(sys_exit_sendmsg) (struct syscall_comm_exit_ctx *ctx) {
struct data_args_t* write_args = active_write_args_map__lookup(&id);
if (write_args != NULL) {
process_syscall_data_vecs((struct pt_regs *)ctx, id, T_EGRESS, write_args, bytes_count);
active_write_args_map__delete(&id);
}

active_write_args_map__delete(&id);
return 0;
}

Expand Down Expand Up @@ -1303,6 +1309,10 @@ TPPROG(sys_exit_sendmmsg) (struct syscall_comm_exit_ctx *ctx) {
// bool forbid_cmsg_compat)
// ssize_t recvmsg(int sockfd, struct msghdr *msg, int flags);
KPROG(__sys_recvmsg) (struct pt_regs* ctx) {
int flags = (int) PT_REGS_PARM3(ctx);
if (flags & MSG_PEEK)
return 0;

__u64 id = bpf_get_current_pid_tgid();
struct user_msghdr __msg, *msghdr = (struct user_msghdr *)PT_REGS_PARM2(ctx);
int sockfd = (int) PT_REGS_PARM1(ctx);
Expand Down Expand Up @@ -1331,15 +1341,19 @@ TPPROG(sys_exit_recvmsg) (struct syscall_comm_exit_ctx *ctx) {
struct data_args_t* read_args = active_read_args_map__lookup(&id);
if (read_args != NULL) {
process_syscall_data_vecs((struct pt_regs *)ctx, id, T_INGRESS, read_args, bytes_count);
active_read_args_map__delete(&id);
}

active_read_args_map__delete(&id);
return 0;
}

// int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
// unsigned int flags, struct timespec *timeout)
KPROG(__sys_recvmmsg) (struct pt_regs* ctx) {
int flags = (int) PT_REGS_PARM4(ctx);
if (flags & MSG_PEEK)
return 0;

__u64 id = bpf_get_current_pid_tgid();
int sockfd = (int)PT_REGS_PARM1(ctx);
struct mmsghdr *msgvec = (struct mmsghdr *)PT_REGS_PARM2(ctx);
Expand Down

0 comments on commit 5c66744

Please sign in to comment.