Skip to content

fix: agent - eBPF Ensure the Sofa protocol can reassemble #7151

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
yinjiping merged 2 commits into from
Jul 1, 2024
Merged

fix: agent - eBPF Ensure the Sofa protocol can reassemble #7151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee5bbb
fix: agent - eBPF Ensure the Sofa protocol can reassemble
yinjiping Jul 1, 2024
237af4a
Merge branch 'main' into fix_sofarpc_ebpf_main
sharang Jul 1, 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
17 changes: 17 additions & 0 deletions agent/src/ebpf/kernel/include/protocol_inference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,23 @@ static __inline enum message_type infer_sofarpc_message(const char *buf,
if (is_infer_socket_valid(conn_info->socket_info_ptr)) {
if (conn_info->socket_info_ptr->l7_proto != PROTO_SOFARPC)
return MSG_UNKNOWN;
/*
* The system call behavior of sofarpc protocol is to first receive
* 64 bytes when receiving, and then receive the following content.
* We make sure that this type of data is reassembled.
*/
if (conn_info->socket_info_ptr->allow_reassembly &&
(conn_info->direction == T_INGRESS)) {
if (conn_info->prev_direction == conn_info->direction &&
conn_info->socket_info_ptr->force_reasm)
return MSG_UNKNOWN;

if (count == 64)
conn_info->socket_info_ptr->force_reasm = true;
else
conn_info->socket_info_ptr->force_reasm = false;
}

goto out;
}
// code for remoting command (Heartbeat, RpcRequest, RpcResponse)
Expand Down
8 changes: 7 additions & 1 deletion agent/src/ebpf/kernel/include/socket_trace_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,13 @@ struct socket_info_s {
__u16 allow_reassembly: 1;
__u16 finish_reasm: 1; // Has the reassembly been completed?
__u16 udp_pre_set_addr: 1; // Is the socket address pre-set during the system call phase in the UDP protocol?
__u16 unused_bits: 13;
/*
* Indicate that the current and next data must be pushed in
* the form of data reorganization.
* Currently only protocol inference is available on sofarpc.
*/
__u16 force_reasm: 1;
__u16 unused_bits: 12;
__u32 reasm_bytes; // The amount of data bytes that have been reassembled.

/*
Expand Down