This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/main by this push:
new 446fa2e Upgrade LLVM to `18` for eBPF code compile (#126)
446fa2e is described below
commit 446fa2e68bbc9040c7081be06ecee013566ed1fd
Author: mrproliu <[email protected]>
AuthorDate: Mon Jun 3 15:42:52 2024 +0000
Upgrade LLVM to `18` for eBPF code compile (#126)
---
CHANGES.md | 13 +++
bpf/accesslog/syscalls/transfer.h | 189 ++++---------------------------
bpf/include/socket_data.h | 221 +++++++++++++++++++++++++++++++++++++
bpf/profiling/network/args.h | 28 -----
bpf/profiling/network/netmonitor.c | 140 ++++-------------------
bpf/profiling/network/sock_stats.h | 25 -----
docker/Dockerfile.base | 4 +-
7 files changed, 277 insertions(+), 343 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index fd58b82..5ea76ba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,19 @@ Changes by Version
==================
Release Notes.
+0.7.0
+------------------
+#### Features
+* Upgrade LLVM to `18`.
+
+#### Bug Fixes
+
+#### Documentation
+
+#### Issues and PR
+- All issues are
[here](https://github.com/apache/skywalking/milestone/209?closed=1)
+- All and pull requests are
[here](https://github.com/apache/skywalking-rover/milestone/7?closed=1)
+
0.6.0
------------------
#### Features
diff --git a/bpf/accesslog/syscalls/transfer.h
b/bpf/accesslog/syscalls/transfer.h
index f41161e..4fda16e 100644
--- a/bpf/accesslog/syscalls/transfer.h
+++ b/bpf/accesslog/syscalls/transfer.h
@@ -17,12 +17,13 @@
#include "api.h"
#include "socket_opts.h"
+#include "socket_data.h"
#include "socket_reader.h"
#include "protocol_analyzer.h"
#include "../common/connection.h"
#include "../common/data_args.h"
-#define SOCKET_UPLOAD_CHUNK_LIMIT 12
+
// openssl read or write
struct {
@@ -77,58 +78,6 @@ struct {
__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
} socket_detail_data_queue SEC(".maps");
-struct socket_data_upload_event {
- __u8 protocol;
- __u8 have_reduce_after_chunk;
- __u8 direction;
- __u8 finished;
- __u16 sequence;
- __u16 data_len;
- __u64 start_time;
- __u64 end_time;
- __u64 conid;
- __u64 randomid;
- __u64 data_id;
- __u64 total_size;
- char buffer[MAX_TRANSMIT_SOCKET_READ_LENGTH + 1];
-};
-struct {
- __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
- __type(key, __u32);
- __type(value, struct socket_data_upload_event);
- __uint(max_entries, 1);
-} socket_data_upload_event_per_cpu_map SEC(".maps");
-struct {
- __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
-} socket_data_upload_event_queue SEC(".maps");
-
-struct socket_data_sequence_t {
- __u64 data_id;
- __u16 sequence;
-};
-struct {
- __uint(type, BPF_MAP_TYPE_LRU_HASH);
- __uint(max_entries, 1000);
- __type(key, __u64);
- __type(value, struct socket_data_sequence_t);
-} socket_data_sequence_generator SEC(".maps");
-static __inline __u16 generate_socket_sequence(__u64 conid, __u64 data_id) {
- struct socket_data_sequence_t *seq =
bpf_map_lookup_elem(&socket_data_sequence_generator, &conid);
- if (seq == NULL) {
- struct socket_data_sequence_t data = {};
- data.data_id = data_id;
- data.sequence = 0;
- bpf_map_update_elem(&socket_data_sequence_generator, &conid, &data,
BPF_NOEXIST);
- return 0;
- }
- if (seq->data_id != data_id) {
- seq->data_id = data_id;
- seq->sequence = 0;
- } else {
- seq->sequence++;
- }
- return seq->sequence;
-}
static __inline void upload_socket_detail(void *ctx, __u64 conid, struct
active_connection_t *connection, __u8 func_name, struct sock_data_args_t
*data_args, bool ssl, __u64 end_nacs) {
// only send the original socket syscall(not ssl)
@@ -176,120 +125,6 @@ static __inline void upload_socket_detail(void *ctx,
__u64 conid, struct active_
bpf_perf_event_output(ctx, &socket_detail_data_queue, BPF_F_CURRENT_CPU,
detail, sizeof(*detail));
}
-static __always_inline void __upload_socket_data_with_buffer(void *ctx, __u8
index, char* buf, size_t size, __u32 is_finished, __u8 have_reduce_after_chunk,
struct socket_data_upload_event *event) {
- event->sequence = index;
- event->data_len = size;
- event->finished = is_finished;
- event->have_reduce_after_chunk = have_reduce_after_chunk;
- if (size <= 0) {
- return;
- }
- asm volatile("%[size] &= 0x7ff;\n" ::[size] "+r"(size) :);
- bpf_probe_read(&event->buffer, size & 0x7ff, buf);
-
- bpf_perf_event_output(ctx, &socket_data_upload_event_queue,
BPF_F_CURRENT_CPU, event, sizeof(*event));
-}
-
-static __always_inline void upload_socket_data_buf(void *ctx, char* buf,
ssize_t size, struct socket_data_upload_event *event, __u8 force_unfinished) {
- ssize_t already_send = 0;
-#pragma unroll
- for (__u8 index = 0; index < SOCKET_UPLOAD_CHUNK_LIMIT; index++) {
- // calculate bytes need to send
- ssize_t remaining = size - already_send;
- size_t need_send_in_chunk = 0;
- __u8 have_reduce_after_chunk = 0;
- if (remaining > MAX_TRANSMIT_SOCKET_READ_LENGTH) {
- need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH;
- have_reduce_after_chunk = 1;
- } else {
- need_send_in_chunk = remaining;
- }
-
- __u32 is_finished = (need_send_in_chunk + already_send) >= size ||
index == (SOCKET_UPLOAD_CHUNK_LIMIT - 1) ? true : false;
- __u8 sequence = index;
- if (force_unfinished == 1 && need_send_in_chunk > 0) {
- is_finished = 0;
- sequence = generate_socket_sequence(event->conid, event->data_id);
- }
- __upload_socket_data_with_buffer(ctx, sequence, buf + already_send,
need_send_in_chunk, is_finished, have_reduce_after_chunk, event);
- already_send += need_send_in_chunk;
-
- }
-}
-
-#define UPLOAD_PER_SOCKET_DATA_IOV() \
-if (iov_index < iovlen) { \
- struct iovec cur_iov; \
- bpf_probe_read(&cur_iov, sizeof(cur_iov), &iov[iov_index]); \
- ssize_t remaining = size - already_send; \
- size_t need_send_in_chunk = remaining - cur_iov_sended; \
- __u8 have_reduce_after_chunk = 0; \
- if (cur_iov_sended + need_send_in_chunk > cur_iov.iov_len) { \
- need_send_in_chunk = cur_iov.iov_len - cur_iov_sended; \
- if (need_send_in_chunk > MAX_TRANSMIT_SOCKET_READ_LENGTH) { \
- need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH; \
- have_reduce_after_chunk = 1; \
- } else { \
- iov_index++; \
- cur_iov_sended = 0; \
- } \
- } else if (need_send_in_chunk > MAX_TRANSMIT_SOCKET_READ_LENGTH) { \
- need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH; \
- have_reduce_after_chunk = 1; \
- } \
- __u32 is_finished = (need_send_in_chunk + already_send) >= size ||
loop_count == (SOCKET_UPLOAD_CHUNK_LIMIT - 1) ? true : false;
\
- __upload_socket_data_with_buffer(ctx, loop_count, cur_iov.iov_base +
cur_iov_sended, need_send_in_chunk, is_finished, have_reduce_after_chunk,
event); \
- already_send += need_send_in_chunk;
\
- loop_count++;
\
-}
-
-static __always_inline void upload_socket_data_iov(void *ctx, struct iovec*
iov, const size_t iovlen, ssize_t size, struct socket_data_upload_event *event)
{
- ssize_t already_send = 0;
- ssize_t cur_iov_sended = 0;
- __u8 iov_index = 0;
- __u8 loop_count = 0;
-
- // each count is same with SOCKET_UPLOAD_CHUNK_LIMIT
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
-}
-
-static __inline void upload_socket_data(void *ctx, __u64 start_time, __u64
end_time, __u64 conid, struct active_connection_t *connection, struct
sock_data_args_t *args, ssize_t bytes_count, __u32 existing_msg_type, __u32
data_direction, bool ssl) {
- // must have protocol and ssl must same(plain)
- // if the connection data is needs to skip upload, then skip
- if (connection->protocol == CONNECTION_PROTOCOL_UNKNOWN || connection->ssl
!= ssl || connection->skip_data_upload == 1) {
- return;
- }
- // generate event
- __u32 kZero = 0;
- struct socket_data_upload_event *event =
bpf_map_lookup_elem(&socket_data_upload_event_per_cpu_map, &kZero);
- if (event == NULL) {
- return;
- }
-
- // basic data
- event->start_time = start_time;
- event->end_time = end_time;
- event->protocol = connection->protocol;
- event->direction = data_direction;
- event->conid = conid;
- event->randomid = connection->random_id;
- event->total_size = bytes_count;
- event->data_id = args->data_id;
-
- if (args->buf != NULL) {
- upload_socket_data_buf(ctx, args->buf, bytes_count, event,
args->ssl_buffer_force_unfinished);
- } else if (args->iovec != NULL) {
- upload_socket_data_iov(ctx, args->iovec, args->iovlen, bytes_count,
event);
- }
-}
-
static __always_inline void process_write_data(void *ctx, __u64 id, struct
sock_data_args_t *args, ssize_t bytes_count,
__u32 data_direction, const bool vecs,
__u8 func_name, bool ssl) {
__u64 curr_nacs = bpf_ktime_get_ns();
@@ -356,5 +191,23 @@ static __always_inline void process_write_data(void *ctx,
__u64 id, struct sock_
upload_socket_detail(ctx, conid, conn, func_name, args, ssl, curr_nacs);
// upload the socket data if need
- upload_socket_data(ctx, args->start_nacs, curr_nacs, conid, conn, args,
bytes_count, msg_type, data_direction, ssl);
+ struct upload_data_args *upload_data_args = generate_socket_upload_args();
+ if (upload_data_args != NULL) {
+ upload_data_args->start_time = args->start_nacs;
+ upload_data_args->end_time = curr_nacs;
+ upload_data_args->con_id = conid;
+ upload_data_args->random_id = conn->random_id;
+ upload_data_args->socket_data_id = args->data_id;
+ upload_data_args->socket_data_iovec = args->iovec;
+ upload_data_args->socket_data_iovlen = args->iovlen;
+ upload_data_args->bytes_count = bytes_count;
+ upload_data_args->socket_data_buf = args->buf;
+ upload_data_args->data_direction = data_direction;
+ upload_data_args->connection_protocol = conn->protocol;
+ upload_data_args->connection_ssl = conn->ssl;
+ upload_data_args->socket_ssl_buffer_force_unfinished =
args->ssl_buffer_force_unfinished;
+ upload_data_args->connection_skip_data_upload = conn->skip_data_upload;
+ upload_data_args->socket_data_ssl = ssl;
+ upload_socket_data(ctx, upload_data_args);
+ };
}
\ No newline at end of file
diff --git a/bpf/include/socket_data.h b/bpf/include/socket_data.h
new file mode 100644
index 0000000..0e62675
--- /dev/null
+++ b/bpf/include/socket_data.h
@@ -0,0 +1,221 @@
+// Licensed to Apache Software Foundation (ASF) under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Apache Software Foundation (ASF) licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#pragma once
+
+#include "socket_opts.h"
+#include "protocol_analyzer.h"
+
+#define SOCKET_UPLOAD_CHUNK_LIMIT 12
+
+struct socket_data_upload_event {
+ __u8 protocol;
+ __u8 have_reduce_after_chunk;
+ __u8 direction;
+ __u8 finished;
+ __u16 sequence;
+ __u16 data_len;
+ __u64 start_time;
+ __u64 end_time;
+ __u64 conid;
+ __u64 randomid;
+ __u64 data_id;
+ __u64 total_size;
+ char buffer[MAX_TRANSMIT_SOCKET_READ_LENGTH + 1];
+};
+struct {
+ __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
+ __type(key, __u32);
+ __type(value, struct socket_data_upload_event);
+ __uint(max_entries, 1);
+} socket_data_upload_event_per_cpu_map SEC(".maps");
+struct {
+ __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
+} socket_data_upload_event_queue SEC(".maps");
+
+struct socket_data_sequence_t {
+ __u64 data_id;
+ __u16 sequence;
+};
+struct {
+ __uint(type, BPF_MAP_TYPE_LRU_HASH);
+ __uint(max_entries, 1000);
+ __type(key, __u64);
+ __type(value, struct socket_data_sequence_t);
+} socket_data_sequence_generator SEC(".maps");
+static __inline __u16 generate_socket_sequence(__u64 conid, __u64 data_id) {
+ struct socket_data_sequence_t *seq =
bpf_map_lookup_elem(&socket_data_sequence_generator, &conid);
+ if (seq == NULL) {
+ struct socket_data_sequence_t data = {};
+ data.data_id = data_id;
+ data.sequence = 0;
+ bpf_map_update_elem(&socket_data_sequence_generator, &conid, &data,
BPF_NOEXIST);
+ return 0;
+ }
+ if (seq->data_id != data_id) {
+ seq->data_id = data_id;
+ seq->sequence = 0;
+ } else {
+ seq->sequence++;
+ }
+ return seq->sequence;
+}
+
+struct upload_data_args {
+ __u64 start_time;
+ __u64 end_time;
+ __u64 con_id;
+ __u64 random_id;
+
+ __u64 socket_data_id;
+ struct iovec *socket_data_iovec;
+ size_t socket_data_iovlen;
+ ssize_t bytes_count;
+ char* socket_data_buf;
+
+ __u32 data_direction;
+ __u8 connection_protocol;
+ __u8 connection_ssl;
+ __u8 socket_ssl_buffer_force_unfinished;
+ // skip data upload when the protocol break(such as HTTP2)
+ __u8 connection_skip_data_upload;
+ bool socket_data_ssl;
+};
+struct {
+ __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
+ __type(key, __u32);
+ __type(value, struct upload_data_args);
+ __uint(max_entries, 1);
+} socket_data_upload_args_per_cpu_map SEC(".maps");
+static __always_inline struct upload_data_args* generate_socket_upload_args() {
+ __u32 kZero = 0;
+ return bpf_map_lookup_elem(&socket_data_upload_args_per_cpu_map, &kZero);
+}
+
+static __always_inline void __upload_socket_data_with_buffer(void *ctx, __u8
index, char* buf, size_t size, __u32 is_finished, __u8 have_reduce_after_chunk,
struct socket_data_upload_event *event) {
+ event->sequence = index;
+ event->data_len = size;
+ event->finished = is_finished;
+ event->have_reduce_after_chunk = have_reduce_after_chunk;
+ if (size <= 0) {
+ return;
+ }
+ asm volatile("%[size] &= 0x7ff;\n" ::[size] "+r"(size) :);
+ bpf_probe_read(&event->buffer, size & 0x7ff, buf);
+
+ bpf_perf_event_output(ctx, &socket_data_upload_event_queue,
BPF_F_CURRENT_CPU, event, sizeof(*event));
+}
+
+static __always_inline void upload_socket_data_buf(void *ctx, char* buf,
ssize_t size, struct socket_data_upload_event *event, __u8 force_unfinished) {
+ ssize_t already_send = 0;
+#pragma unroll
+ for (__u8 index = 0; index < SOCKET_UPLOAD_CHUNK_LIMIT; index++) {
+ // calculate bytes need to send
+ ssize_t remaining = size - already_send;
+ size_t need_send_in_chunk = 0;
+ __u8 have_reduce_after_chunk = 0;
+ if (remaining > MAX_TRANSMIT_SOCKET_READ_LENGTH) {
+ need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH;
+ have_reduce_after_chunk = 1;
+ } else {
+ need_send_in_chunk = remaining;
+ }
+
+ __u32 is_finished = (need_send_in_chunk + already_send) >= size ||
index == (SOCKET_UPLOAD_CHUNK_LIMIT - 1) ? true : false;
+ __u8 sequence = index;
+ if (force_unfinished == 1 && need_send_in_chunk > 0) {
+ is_finished = 0;
+ sequence = generate_socket_sequence(event->conid, event->data_id);
+ }
+ __upload_socket_data_with_buffer(ctx, sequence, buf + already_send,
need_send_in_chunk, is_finished, have_reduce_after_chunk, event);
+ already_send += need_send_in_chunk;
+
+ }
+}
+
+#define UPLOAD_PER_SOCKET_DATA_IOV() \
+if (iov_index < iovlen) { \
+ struct iovec cur_iov; \
+ bpf_probe_read(&cur_iov, sizeof(cur_iov), &iov[iov_index]); \
+ ssize_t remaining = size - already_send; \
+ size_t need_send_in_chunk = remaining - cur_iov_sended; \
+ __u8 have_reduce_after_chunk = 0; \
+ if (cur_iov_sended + need_send_in_chunk > cur_iov.iov_len) { \
+ need_send_in_chunk = cur_iov.iov_len - cur_iov_sended; \
+ if (need_send_in_chunk > MAX_TRANSMIT_SOCKET_READ_LENGTH) { \
+ need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH; \
+ have_reduce_after_chunk = 1; \
+ } else { \
+ iov_index++; \
+ cur_iov_sended = 0; \
+ } \
+ } else if (need_send_in_chunk > MAX_TRANSMIT_SOCKET_READ_LENGTH) { \
+ need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH; \
+ have_reduce_after_chunk = 1; \
+ } \
+ __u32 is_finished = (need_send_in_chunk + already_send) >= size ||
loop_count == (SOCKET_UPLOAD_CHUNK_LIMIT - 1) ? true : false;
\
+ __upload_socket_data_with_buffer(ctx, loop_count, cur_iov.iov_base +
cur_iov_sended, need_send_in_chunk, is_finished, have_reduce_after_chunk,
event); \
+ already_send += need_send_in_chunk;
\
+ loop_count++;
\
+}
+
+static __always_inline void upload_socket_data_iov(void *ctx, struct iovec*
iov, const size_t iovlen, ssize_t size, struct socket_data_upload_event *event)
{
+ ssize_t already_send = 0;
+ ssize_t cur_iov_sended = 0;
+ __u8 iov_index = 0;
+ __u8 loop_count = 0;
+
+ // each count is same with SOCKET_UPLOAD_CHUNK_LIMIT
+ UPLOAD_PER_SOCKET_DATA_IOV();
+ UPLOAD_PER_SOCKET_DATA_IOV();
+ UPLOAD_PER_SOCKET_DATA_IOV();
+ UPLOAD_PER_SOCKET_DATA_IOV();
+ UPLOAD_PER_SOCKET_DATA_IOV();
+ UPLOAD_PER_SOCKET_DATA_IOV();
+ UPLOAD_PER_SOCKET_DATA_IOV();
+ UPLOAD_PER_SOCKET_DATA_IOV();
+}
+
+static __inline void upload_socket_data(void *ctx, struct upload_data_args
*args) {
+ // must have protocol and ssl must same(plain)
+ // if the connection data is needs to skip upload, then skip
+ if (args->connection_protocol == CONNECTION_PROTOCOL_UNKNOWN ||
args->connection_ssl != args->socket_data_ssl ||
args->connection_skip_data_upload == 1) {
+ return;
+ }
+ // generate event
+ __u32 kZero = 0;
+ struct socket_data_upload_event *event =
bpf_map_lookup_elem(&socket_data_upload_event_per_cpu_map, &kZero);
+ if (event == NULL) {
+ return;
+ }
+
+ // basic data
+ event->start_time = args->start_time;
+ event->end_time = args->end_time;
+ event->protocol = args->connection_protocol;
+ event->direction = args->data_direction;
+ event->conid = args->con_id;
+ event->randomid = args->random_id;
+ event->total_size = args->bytes_count;
+ event->data_id = args->socket_data_id;
+
+ if (args->socket_data_buf != NULL) {
+ upload_socket_data_buf(ctx, args->socket_data_buf, args->bytes_count,
event, args->socket_ssl_buffer_force_unfinished);
+ } else if (args->socket_data_iovec != NULL) {
+ upload_socket_data_iov(ctx, args->socket_data_iovec,
args->socket_data_iovlen, args->bytes_count, event);
+ }
+}
\ No newline at end of file
diff --git a/bpf/profiling/network/args.h b/bpf/profiling/network/args.h
index 418edfe..94e81fe 100644
--- a/bpf/profiling/network/args.h
+++ b/bpf/profiling/network/args.h
@@ -216,31 +216,3 @@ static __inline struct socket_buffer_reader_t*
read_socket_data(struct sock_data
reader->data_len = size & MAX_PROTOCOL_SOCKET_READ_LENGTH;
return reader;
}
-
-struct socket_data_sequence_t {
- __u64 data_id;
- __u16 sequence;
-};
-struct {
- __uint(type, BPF_MAP_TYPE_LRU_HASH);
- __uint(max_entries, 1000);
- __type(key, __u64);
- __type(value, struct socket_data_sequence_t);
-} socket_data_sequence_generator SEC(".maps");
-static __inline __u16 generate_socket_sequence(__u64 conid, __u64 data_id) {
- struct socket_data_sequence_t *seq =
bpf_map_lookup_elem(&socket_data_sequence_generator, &conid);
- if (seq == NULL) {
- struct socket_data_sequence_t data = {};
- data.data_id = data_id;
- data.sequence = 0;
- bpf_map_update_elem(&socket_data_sequence_generator, &conid, &data,
BPF_NOEXIST);
- return 0;
- }
- if (seq->data_id != data_id) {
- seq->data_id = data_id;
- seq->sequence = 0;
- } else {
- seq->sequence++;
- }
- return seq->sequence;
-}
\ No newline at end of file
diff --git a/bpf/profiling/network/netmonitor.c
b/bpf/profiling/network/netmonitor.c
index a8c1489..0567224 100644
--- a/bpf/profiling/network/netmonitor.c
+++ b/bpf/profiling/network/netmonitor.c
@@ -35,14 +35,13 @@
#include "common.h"
#include "socket.h"
#include "sock_stats.h"
+#include "socket_data.h"
#include "args.h"
#include "protocol_analyzer.h"
#include "socket_detail.h"
char __license[] SEC("license") = "Dual MIT/GPL";
-#define SOCKET_UPLOAD_CHUNK_LIMIT 12
-
static __inline bool family_should_trace(const __u32 family) {
return family != AF_UNKNOWN && family != AF_INET && family != AF_INET6 ?
false : true;
}
@@ -267,123 +266,6 @@ static __always_inline void resent_connect_event(struct
pt_regs *ctx, __u32 tgid
}
}
-static __always_inline void __upload_socket_data_with_buffer(void *ctx, __u8
index, char* buf, size_t size, __u32 is_finished, __u8 have_reduce_after_chunk,
struct socket_data_upload_event *event) {
- event->sequence = index;
- event->data_len = size;
- event->finished = is_finished;
- event->have_reduce_after_chunk = have_reduce_after_chunk;
- if (size <= 0) {
- return;
- }
- asm volatile("%[size] &= 0x7ff;\n" ::[size] "+r"(size) :);
- bpf_probe_read(&event->buffer, size & 0x7ff, buf);
-
- bpf_perf_event_output(ctx, &socket_data_upload_event_queue,
BPF_F_CURRENT_CPU, event, sizeof(*event));
-}
-
-static __always_inline void upload_socket_data_buf(void *ctx, char* buf,
ssize_t size, struct socket_data_upload_event *event, __u8 force_unfinished) {
- ssize_t already_send = 0;
-#pragma unroll
- for (__u8 index = 0; index < SOCKET_UPLOAD_CHUNK_LIMIT; index++) {
- // calculate bytes need to send
- ssize_t remaining = size - already_send;
- size_t need_send_in_chunk = 0;
- __u8 have_reduce_after_chunk = 0;
- if (remaining > MAX_TRANSMIT_SOCKET_READ_LENGTH) {
- need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH;
- have_reduce_after_chunk = 1;
- } else {
- need_send_in_chunk = remaining;
- }
-
- __u32 is_finished = (need_send_in_chunk + already_send) >= size ||
index == (SOCKET_UPLOAD_CHUNK_LIMIT - 1) ? true : false;
- __u8 sequence = index;
- if (force_unfinished == 1 && need_send_in_chunk > 0) {
- is_finished = 0;
- sequence = generate_socket_sequence(event->conid, event->data_id);
- }
- __upload_socket_data_with_buffer(ctx, sequence, buf + already_send,
need_send_in_chunk, is_finished, have_reduce_after_chunk, event);
- already_send += need_send_in_chunk;
-
- }
-}
-
-#define UPLOAD_PER_SOCKET_DATA_IOV() \
-if (iov_index < iovlen) { \
- struct iovec cur_iov; \
- BPF_PROBE_READ_VAR(cur_iov, &iov[iov_index]); \
- ssize_t remaining = size - already_send; \
- size_t need_send_in_chunk = remaining - cur_iov_sended; \
- __u8 have_reduce_after_chunk = 0; \
- if (cur_iov_sended + need_send_in_chunk > cur_iov.iov_len) { \
- need_send_in_chunk = cur_iov.iov_len - cur_iov_sended; \
- if (need_send_in_chunk > MAX_TRANSMIT_SOCKET_READ_LENGTH) { \
- need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH; \
- have_reduce_after_chunk = 1; \
- } else { \
- iov_index++; \
- cur_iov_sended = 0; \
- } \
- } else if (need_send_in_chunk > MAX_TRANSMIT_SOCKET_READ_LENGTH) { \
- need_send_in_chunk = MAX_TRANSMIT_SOCKET_READ_LENGTH; \
- have_reduce_after_chunk = 1; \
- } \
- __u32 is_finished = (need_send_in_chunk + already_send) >= size ||
loop_count == (SOCKET_UPLOAD_CHUNK_LIMIT - 1) ? true : false;
\
- __upload_socket_data_with_buffer(ctx, loop_count, cur_iov.iov_base +
cur_iov_sended, need_send_in_chunk, is_finished, have_reduce_after_chunk,
event); \
- already_send += need_send_in_chunk;
\
- loop_count++;
\
-}
-
-static __always_inline void upload_socket_data_iov(void *ctx, struct iovec*
iov, const size_t iovlen, ssize_t size, struct socket_data_upload_event *event)
{
- ssize_t already_send = 0;
- ssize_t cur_iov_sended = 0;
- __u8 iov_index = 0;
- __u8 loop_count = 0;
-
- // each count is same with SOCKET_UPLOAD_CHUNK_LIMIT
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
- UPLOAD_PER_SOCKET_DATA_IOV();
-}
-
-static __inline void upload_socket_data(void *ctx, __u64 start_time, __u64
end_time, __u64 conid, struct active_connection_t *connection, struct
sock_data_args_t *args, ssize_t bytes_count, __u32 existing_msg_type, __u32
data_direction, bool ssl) {
- // generate event
- __u32 kZero = 0;
- struct socket_data_upload_event *event =
bpf_map_lookup_elem(&socket_data_upload_event_per_cpu_map, &kZero);
- if (event == NULL) {
- return;
- }
- // unknown protocol then ignore
- if (connection->protocol == CONNECTION_PROTOCOL_UNKNOWN) {
- return;
- }
- // ssl must same, means only process the plain data
- if (connection->ssl != ssl) {
- return;
- }
-
- // basic data
- event->start_time = start_time;
- event->end_time = end_time;
- event->protocol = connection->protocol;
- event->direction = data_direction;
- event->conid = conid;
- event->randomid = connection->random_id;
- event->total_size = bytes_count;
- event->data_id = args->data_id;
-
- if (args->buf != NULL) {
- upload_socket_data_buf(ctx, args->buf, bytes_count, event,
args->ssl_buffer_force_unfinished);
- } else if (args->iovec != NULL) {
- upload_socket_data_iov(ctx, args->iovec, args->iovlen, bytes_count,
event);
- }
-}
-
static __always_inline void process_write_data(struct pt_regs *ctx, __u64 id,
struct sock_data_args_t *args, ssize_t bytes_count,
__u32 data_direction, const bool vecs,
__u8 func_name, bool ssl) {
__u64 curr_nacs = bpf_ktime_get_ns();
@@ -452,7 +334,25 @@ static __always_inline void process_write_data(struct
pt_regs *ctx, __u64 id, st
upload_socket_detail(ctx, conid, conn, func_name, args, ssl);
// upload the socket data if need
- upload_socket_data(ctx, args->start_nacs, curr_nacs, conid, conn, args,
bytes_count, msg_type, data_direction, ssl);
+ struct upload_data_args *upload_data_args = generate_socket_upload_args();
+ if (upload_data_args != NULL) {
+ upload_data_args->start_time = args->start_nacs;
+ upload_data_args->end_time = curr_nacs;
+ upload_data_args->con_id = conid;
+ upload_data_args->random_id = conn->random_id;
+ upload_data_args->socket_data_id = args->data_id;
+ upload_data_args->socket_data_iovec = args->iovec;
+ upload_data_args->socket_data_iovlen = args->iovlen;
+ upload_data_args->bytes_count = bytes_count;
+ upload_data_args->socket_data_buf = args->buf;
+ upload_data_args->data_direction = data_direction;
+ upload_data_args->connection_protocol = conn->protocol;
+ upload_data_args->connection_ssl = conn->ssl;
+ upload_data_args->socket_ssl_buffer_force_unfinished =
args->ssl_buffer_force_unfinished;
+ upload_data_args->connection_skip_data_upload = 0;
+ upload_data_args->socket_data_ssl = ssl;
+ upload_socket_data(ctx, upload_data_args);
+ }
// add statics when is not ssl(native buffer)
if (ssl == false) {
diff --git a/bpf/profiling/network/sock_stats.h
b/bpf/profiling/network/sock_stats.h
index 9a4f10a..5f3f033 100644
--- a/bpf/profiling/network/sock_stats.h
+++ b/bpf/profiling/network/sock_stats.h
@@ -258,28 +258,3 @@ struct {
__type(key, __u64);
__type(value, struct sock_data_args_t);
} openssl_sock_data_args SEC(".maps");
-
-struct socket_data_upload_event {
- __u8 protocol;
- __u8 have_reduce_after_chunk;
- __u8 direction;
- __u8 finished;
- __u16 sequence;
- __u16 data_len;
- __u64 start_time;
- __u64 end_time;
- __u64 conid;
- __u64 randomid;
- __u64 data_id;
- __u64 total_size;
- char buffer[MAX_TRANSMIT_SOCKET_READ_LENGTH + 1];
-};
-struct {
- __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
- __type(key, __u32);
- __type(value, struct socket_data_upload_event);
- __uint(max_entries, 1);
-} socket_data_upload_event_per_cpu_map SEC(".maps");
-struct {
- __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
-} socket_data_upload_event_queue SEC(".maps");
\ No newline at end of file
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index 8303d2f..f4bc05e 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -26,6 +26,6 @@ RUN apt update && \
cd bpftool && make -C src install && cp $(which bpftool) /usr/sbin/bpftool
&& \
wget https://apt.llvm.org/llvm.sh && \
chmod +x llvm.sh && \
- ./llvm.sh 13
+ ./llvm.sh 18
-ENV PATH="${PATH}:/usr/lib/llvm-13/bin"
\ No newline at end of file
+ENV PATH="${PATH}:/usr/lib/llvm-18/bin"
\ No newline at end of file
