From 2d7c95c26ee1dc787b030af5755b2c3be767d25f Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Fri, 20 Sep 2024 09:26:43 -0600 Subject: [PATCH] Use clang-tidy on ebpf code (#1180) --- .github/workflows/clang-tidy-check.yml | 36 +++ bpf/.clang-tidy | 25 ++ bpf/bpf_dbg.h | 3 + bpf/debug_log.c | 2 + bpf/flow.h | 2 + bpf/flows_common.h | 4 +- bpf/flows_sock.c | 7 +- bpf/go_common.h | 2 +- bpf/go_grpc.h | 2 +- bpf/go_sql.h | 14 +- bpf/go_traceparent.h | 2 +- bpf/headers/bpf_helpers.h | 230 ++++++++++-------- bpf/hpack.h | 4 +- bpf/http2_grpc.h | 6 +- bpf/http_ssl.c | 6 +- bpf/protocol_http.h | 8 +- bpf/protocol_tcp.h | 3 +- bpf/ringbuf.h | 5 +- bpf/trace_common.h | 11 +- bpf/trace_util.h | 11 +- pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o | 4 +- .../ebpf/gotracer/bpf_debug_arm64_bpfel.o | 4 +- .../ebpf/gotracer/bpf_debug_x86_bpfel.o | 4 +- .../ebpf/gotracer/bpf_tp_arm64_bpfel.o | 4 +- .../ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o | 4 +- .../ebpf/gotracer/bpf_tp_debug_x86_bpfel.o | 4 +- pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o | 4 +- pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o | 4 +- pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o | 4 +- .../ebpf/httpssl/bpf_debug_arm64_bpfel.o | 4 +- .../ebpf/httpssl/bpf_debug_x86_bpfel.o | 4 +- .../ebpf/httpssl/bpf_tp_arm64_bpfel.o | 4 +- .../ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o | 4 +- .../ebpf/httpssl/bpf_tp_debug_x86_bpfel.o | 4 +- pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o | 4 +- pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o | 4 +- pkg/internal/ebpf/ktracer/bpf_arm64_bpfel.o | 2 +- .../ebpf/ktracer/bpf_debug_arm64_bpfel.o | 2 +- .../ebpf/ktracer/bpf_debug_x86_bpfel.o | 2 +- .../ebpf/ktracer/bpf_tp_arm64_bpfel.o | 4 +- .../ebpf/ktracer/bpf_tp_debug_arm64_bpfel.o | 2 +- .../ebpf/ktracer/bpf_tp_debug_x86_bpfel.o | 2 +- pkg/internal/ebpf/ktracer/bpf_tp_x86_bpfel.o | 2 +- pkg/internal/ebpf/ktracer/bpf_x86_bpfel.o | 2 +- pkg/internal/netolly/ebpf/net_arm64_bpfel.o | 2 +- pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o | 4 +- pkg/internal/netolly/ebpf/netsk_x86_bpfel.o | 4 +- 47 files changed, 298 insertions(+), 177 deletions(-) create mode 100644 .github/workflows/clang-tidy-check.yml create mode 100644 bpf/.clang-tidy diff --git a/.github/workflows/clang-tidy-check.yml b/.github/workflows/clang-tidy-check.yml new file mode 100644 index 000000000..e46a32f43 --- /dev/null +++ b/.github/workflows/clang-tidy-check.yml @@ -0,0 +1,36 @@ +name: Clang Tidy Check + +on: + push: + branches: [ 'main', 'release-*' ] + pull_request: + branches: [ 'main', 'release-*' ] + +jobs: + clang-tidy: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + lfs: true + + - name: Install clang-tidy + run: | + sudo apt-get update + sudo apt-get install -y wget lsb-release software-properties-common gnupg + wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc + sudo add-apt-repository -y 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main' + sudo apt-get install -y clang-tidy-20 + + - name: Check Clang Tidy + run: | + cd bpf + clang-tidy-20 *.c *.h | tee clang-tidy-output.txt + + if [ $? -ne 0 ] || grep -q "warning:" clang-tidy-output.txt; then + echo "clang-tidy found warnings or errors." + exit 1 + fi + diff --git a/bpf/.clang-tidy b/bpf/.clang-tidy new file mode 100644 index 000000000..d921d6b98 --- /dev/null +++ b/bpf/.clang-tidy @@ -0,0 +1,25 @@ +Checks: + - '-*' + - 'readability-*' + - 'clang-diagnostic-error' + - 'misc-misplaced_const' + - 'misc-*' + - '-bugprone-*' + - 'bugprone-switch-missing-default-case' + - '-bugprone-multi-level-implicit-pointer-conversion' #TODO enable this + - '-bugprone-reserved-identifier' + - '-bugprone-easily-swappable-parameters' + - '-bugprone-narrowing-conversions' #TODO this needs to be checked/enabled + - '-misc-unused-parameters' + - '-misc-misplaced-const' + - '-misc-include-cleaner' + - '-readability-else-after-return' + - '-readability-identifier-length' + - '-readability-function-cognitive-complexity' + - '-readability-magic-numbers' + +WarningsAsErrors: '' +HeaderFilterRegex: '' +FormatStyle: none +ExtraArgs: ['--target=bpf', '-Iheaders', '-D__TARGET_ARCH_x86', '-DBPF_DEBUG', '-DBPF_TRACEPARENT'] + diff --git a/bpf/bpf_dbg.h b/bpf/bpf_dbg.h index 99dd60604..353dbf9bd 100644 --- a/bpf/bpf_dbg.h +++ b/bpf/bpf_dbg.h @@ -12,6 +12,9 @@ #ifndef BPF_DBG_H #define BPF_DBG_H +#include "vmlinux.h" +#include "bpf_core_read.h" + #ifdef BPF_DEBUG typedef struct log_info { diff --git a/bpf/debug_log.c b/bpf/debug_log.c index 416f8cdfc..5991362cc 100644 --- a/bpf/debug_log.c +++ b/bpf/debug_log.c @@ -2,4 +2,6 @@ #include "bpf_helpers.h" #include "bpf_dbg.h" +#ifdef BPF_DEBUG const log_info_t *unused_100 __attribute__((unused)); +#endif diff --git a/bpf/flow.h b/bpf/flow.h index 63dcaa1a0..3bcacc345 100644 --- a/bpf/flow.h +++ b/bpf/flow.h @@ -19,6 +19,8 @@ #ifndef __FLOW_H__ #define __FLOW_H__ +#include "vmlinux.h" + #define TC_ACT_OK 0 #define TC_ACT_SHOT 2 #define IP_MAX_LEN 16 diff --git a/bpf/flows_common.h b/bpf/flows_common.h index 8ed3ac8dc..6f44a5277 100644 --- a/bpf/flows_common.h +++ b/bpf/flows_common.h @@ -186,9 +186,11 @@ static inline u8 get_connection_initiator(flow_id *id, u16 flags) { flow_initiator = INITIATOR_SRC; } break; + default: + break; } return flow_initiator; } -#endif //__FLOW_HELPERS_H__ \ No newline at end of file +#endif //__FLOW_HELPERS_H__ diff --git a/bpf/flows_sock.c b/bpf/flows_sock.c index d7b6bd242..571e44d1c 100644 --- a/bpf/flows_sock.c +++ b/bpf/flows_sock.c @@ -150,7 +150,10 @@ static __always_inline bool read_sk_buff(struct __sk_buff *skb, flow_id *id, u16 id->src_port = __bpf_htons(port); bpf_skb_load_bytes(skb, hdr_len + offsetof(struct __udphdr, dest), &port, sizeof(port)); id->dst_port = __bpf_htons(port); + break; } + default: + return false; } // custom flags @@ -165,7 +168,7 @@ static __always_inline bool read_sk_buff(struct __sk_buff *skb, flow_id *id, u16 return true; } -static __always_inline bool same_ip(u8 *ip1, u8 *ip2) { +static __always_inline bool same_ip(const u8 *ip1, const u8 *ip2) { for (int i = 0; i < 16; i += 4) { if (*((u32 *)(ip1 + i)) != *((u32 *)(ip2 + i))) { return false; @@ -301,4 +304,4 @@ const flow_metrics *unused_flow_metrics __attribute__((unused)); const flow_id *unused_flow_id __attribute__((unused)); const flow_record *unused_flow_record __attribute__((unused)); -char _license[] SEC("license") = "GPL"; \ No newline at end of file +char _license[] SEC("license") = "GPL"; diff --git a/bpf/go_common.h b/bpf/go_common.h index 11a9d166f..d8cf269e2 100644 --- a/bpf/go_common.h +++ b/bpf/go_common.h @@ -308,7 +308,7 @@ static __always_inline u8 get_conn_info(void *conn_ptr, connection_info_t *info) static __always_inline void *unwrap_tls_conn_info(void *conn_ptr, void *tls_state) { if (conn_ptr && tls_state) { void *c_ptr = 0; - bpf_probe_read(&c_ptr, sizeof(c_ptr), (void *)(conn_ptr)); // unwrap conn + bpf_probe_read(&c_ptr, sizeof(c_ptr), conn_ptr); // unwrap conn bpf_dbg_printk("unwrapped conn ptr %llx", c_ptr); diff --git a/bpf/go_grpc.h b/bpf/go_grpc.h index 2fb18e96a..e360d8dd1 100644 --- a/bpf/go_grpc.h +++ b/bpf/go_grpc.h @@ -359,7 +359,7 @@ static __always_inline void clientConnStart( go_offset_of(ot, (go_offset){.v = _value_context_val_ptr_pos}) + sizeof(void *))); - invocation.flags = client_trace_parent(goroutine_addr, &invocation.tp, (void *)(val_ptr)); + invocation.flags = client_trace_parent(goroutine_addr, &invocation.tp, val_ptr); } else { // it's OK sending empty tp for a client, the userspace id generator will make random trace_id, span_id bpf_dbg_printk("No ctx_ptr %llx", ctx_ptr); diff --git a/bpf/go_sql.h b/bpf/go_sql.h index bc7fb97dc..4a4517462 100644 --- a/bpf/go_sql.h +++ b/bpf/go_sql.h @@ -16,6 +16,16 @@ // This implementation was inspired by https://github.com/open-telemetry/opentelemetry-go-instrumentation/blob/ca1afccea6ec520d18238c3865024a9f5b9c17fe/internal/pkg/instrumentors/bpf/database/sql/bpf/probe.bpf.c // and has been modified since. +#ifndef GO_SQL_H +#define GO_SQL_H + +#include "vmlinux.h" + +#include "bpf_helpers.h" +#include "http_types.h" +#include "go_common.h" +#include "ringbuf.h" + typedef struct sql_func_invocation { u64 start_monotime_ns; u64 sql_param; @@ -109,4 +119,6 @@ int uprobe_queryReturn(struct pt_regs *ctx) { bpf_dbg_printk("can't reserve space in the ringbuffer"); } return 0; -} \ No newline at end of file +} + +#endif diff --git a/bpf/go_traceparent.h b/bpf/go_traceparent.h index 5ddbb0128..43d04cdeb 100644 --- a/bpf/go_traceparent.h +++ b/bpf/go_traceparent.h @@ -66,7 +66,7 @@ struct { } golang_mapbucket_storage_map SEC(".maps"); // assumes s2 is all lowercase -static __always_inline int bpf_memicmp(char *s1, char *s2, s32 size) { +static __always_inline int bpf_memicmp(const char *s1, const char *s2, s32 size) { for (int i = 0; i < size; i++) { if (s1[i] != s2[i] && s1[i] != (s2[i] - 32)) // compare with each uppercase character { diff --git a/bpf/headers/bpf_helpers.h b/bpf/headers/bpf_helpers.h index 963b1060d..3c02a1e38 100644 --- a/bpf/headers/bpf_helpers.h +++ b/bpf/headers/bpf_helpers.h @@ -10,7 +10,7 @@ */ #include "bpf_helper_defs.h" -#define __uint(name, val) int (*name)[val] +#define __uint(name, val) int(*name)[val] #define __type(name, val) typeof(val) *name #define __array(name, val) typeof(val) *name[] @@ -22,11 +22,9 @@ * To allow use of SEC() with externs (e.g., for extern .maps declarations), * make sure __attribute__((unused)) doesn't trigger compilation warning. */ -#define SEC(name) \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wignored-attributes\"") \ - __attribute__((section(name), used)) \ - _Pragma("GCC diagnostic pop") \ +#define SEC(name) \ + _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wignored-attributes\"") \ + __attribute__((section(name), used)) _Pragma("GCC diagnostic pop") /* Avoid 'linux/stddef.h' definition of '__always_inline'. */ #undef __always_inline @@ -65,14 +63,14 @@ * Helper macros to manipulate data structures */ #ifndef offsetof -#define offsetof(TYPE, MEMBER) ((unsigned long)&((TYPE *)0)->MEMBER) +#define offsetof(TYPE, MEMBER) ((unsigned long)&((TYPE *)0)->MEMBER) #endif #ifndef container_of -#define container_of(ptr, type, member) \ - ({ \ - void *__mptr = (void *)(ptr); \ - ((type *)(__mptr - offsetof(type, member))); \ - }) +#define container_of(ptr, type, member) \ + ({ \ + void *__mptr = (void *)(ptr); \ + ((type *)(__mptr - offsetof(type, member))); \ + }) #endif /* @@ -88,20 +86,19 @@ * being compiled out. */ #ifndef __bpf_unreachable -# define __bpf_unreachable() __builtin_trap() +#define __bpf_unreachable() __builtin_trap() #endif /* * Helper function to perform a tail call with a constant/immediate map slot. */ #if __clang_major__ >= 8 && defined(__bpf__) -static __always_inline void -bpf_tail_call_static(void *ctx, const void *map, const __u32 slot) -{ - if (!__builtin_constant_p(slot)) - __bpf_unreachable(); +static __always_inline void bpf_tail_call_static(void *ctx, const void *map, const __u32 slot) { + if (!__builtin_constant_p(slot)) { + __bpf_unreachable(); + } - /* + /* * Provide a hard guarantee that LLVM won't optimize setting r2 (map * pointer) and r3 (constant map index) from _different paths_ ending * up at the _same_ call insn as otherwise we won't be able to use the @@ -114,12 +111,13 @@ bpf_tail_call_static(void *ctx, const void *map, const __u32 slot) * to mark them as clobber so that LLVM doesn't end up using them * before / after the call. */ - asm volatile("r1 = %[ctx]\n\t" - "r2 = %[map]\n\t" - "r3 = %[slot]\n\t" - "call 12" - :: [ctx]"r"(ctx), [map]"r"(map), [slot]"i"(slot) - : "r0", "r1", "r2", "r3", "r4", "r5"); + asm volatile("r1 = %[ctx]\n\t" + "r2 = %[map]\n\t" + "r3 = %[slot]\n\t" + "call 12" ::[ctx] "r"(ctx), + [map] "r"(map), + [slot] "i"(slot) + : "r0", "r1", "r2", "r3", "r4", "r5"); } #endif @@ -128,30 +126,30 @@ bpf_tail_call_static(void *ctx, const void *map, const __u32 slot) * to describe BPF map attributes to libbpf loader */ struct bpf_map_def { - unsigned int type; - unsigned int key_size; - unsigned int value_size; - unsigned int max_entries; - unsigned int map_flags; + unsigned int type; + unsigned int key_size; + unsigned int value_size; + unsigned int max_entries; + unsigned int map_flags; }; enum libbpf_pin_type { - LIBBPF_PIN_NONE, - /* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */ - LIBBPF_PIN_BY_NAME, + LIBBPF_PIN_NONE, + /* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */ + LIBBPF_PIN_BY_NAME, }; enum libbpf_tristate { - TRI_NO = 0, - TRI_YES = 1, - TRI_MODULE = 2, + TRI_NO = 0, + TRI_YES = 1, + TRI_MODULE = 2, }; #define __kconfig __attribute__((section(".kconfig"))) #define __ksym __attribute__((section(".ksyms"))) #ifndef ___bpf_concat -#define ___bpf_concat(a, b) a ## b +#define ___bpf_concat(a, b) a##b #endif #ifndef ___bpf_apply #define ___bpf_apply(fn, n) ___bpf_concat(fn, n) @@ -160,61 +158,79 @@ enum libbpf_tristate { #define ___bpf_nth(_, _1, _2, _3, _4, _5, _6, _7, _8, _9, _a, _b, _c, N, ...) N #endif #ifndef ___bpf_narg -#define ___bpf_narg(...) \ - ___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) +#define ___bpf_narg(...) ___bpf_nth(_, ##__VA_ARGS__, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) #endif -#define ___bpf_fill0(arr, p, x) do {} while (0) +#define ___bpf_fill0(arr, p, x) \ + do { \ + } while (0) #define ___bpf_fill1(arr, p, x) arr[p] = x -#define ___bpf_fill2(arr, p, x, args...) arr[p] = x; ___bpf_fill1(arr, p + 1, args) -#define ___bpf_fill3(arr, p, x, args...) arr[p] = x; ___bpf_fill2(arr, p + 1, args) -#define ___bpf_fill4(arr, p, x, args...) arr[p] = x; ___bpf_fill3(arr, p + 1, args) -#define ___bpf_fill5(arr, p, x, args...) arr[p] = x; ___bpf_fill4(arr, p + 1, args) -#define ___bpf_fill6(arr, p, x, args...) arr[p] = x; ___bpf_fill5(arr, p + 1, args) -#define ___bpf_fill7(arr, p, x, args...) arr[p] = x; ___bpf_fill6(arr, p + 1, args) -#define ___bpf_fill8(arr, p, x, args...) arr[p] = x; ___bpf_fill7(arr, p + 1, args) -#define ___bpf_fill9(arr, p, x, args...) arr[p] = x; ___bpf_fill8(arr, p + 1, args) -#define ___bpf_fill10(arr, p, x, args...) arr[p] = x; ___bpf_fill9(arr, p + 1, args) -#define ___bpf_fill11(arr, p, x, args...) arr[p] = x; ___bpf_fill10(arr, p + 1, args) -#define ___bpf_fill12(arr, p, x, args...) arr[p] = x; ___bpf_fill11(arr, p + 1, args) -#define ___bpf_fill(arr, args...) \ - ___bpf_apply(___bpf_fill, ___bpf_narg(args))(arr, 0, args) +#define ___bpf_fill2(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill1(arr, p + 1, args) +#define ___bpf_fill3(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill2(arr, p + 1, args) +#define ___bpf_fill4(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill3(arr, p + 1, args) +#define ___bpf_fill5(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill4(arr, p + 1, args) +#define ___bpf_fill6(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill5(arr, p + 1, args) +#define ___bpf_fill7(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill6(arr, p + 1, args) +#define ___bpf_fill8(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill7(arr, p + 1, args) +#define ___bpf_fill9(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill8(arr, p + 1, args) +#define ___bpf_fill10(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill9(arr, p + 1, args) +#define ___bpf_fill11(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill10(arr, p + 1, args) +#define ___bpf_fill12(arr, p, x, args...) \ + arr[p] = x; \ + ___bpf_fill11(arr, p + 1, args) +#define ___bpf_fill(arr, args...) ___bpf_apply(___bpf_fill, ___bpf_narg(args))(arr, 0, args) /* * BPF_SEQ_PRINTF to wrap bpf_seq_printf to-be-printed values * in a structure. */ -#define BPF_SEQ_PRINTF(seq, fmt, args...) \ -({ \ - static const char ___fmt[] = fmt; \ - unsigned long long ___param[___bpf_narg(args)]; \ - \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ - ___bpf_fill(___param, args); \ - _Pragma("GCC diagnostic pop") \ - \ - bpf_seq_printf(seq, ___fmt, sizeof(___fmt), \ - ___param, sizeof(___param)); \ -}) +#define BPF_SEQ_PRINTF(seq, fmt, args...) \ + ({ \ + static const char ___fmt[] = fmt; \ + unsigned long long ___param[___bpf_narg(args)]; \ + \ + _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ + ___bpf_fill(___param, args); \ + _Pragma("GCC diagnostic pop") \ + \ + bpf_seq_printf(seq, ___fmt, sizeof(___fmt), ___param, sizeof(___param)); \ + }) /* * BPF_SNPRINTF wraps the bpf_snprintf helper with variadic arguments instead of * an array of u64. */ -#define BPF_SNPRINTF(out, out_size, fmt, args...) \ -({ \ - static const char ___fmt[] = fmt; \ - unsigned long long ___param[___bpf_narg(args)]; \ - \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ - ___bpf_fill(___param, args); \ - _Pragma("GCC diagnostic pop") \ - \ - bpf_snprintf(out, out_size, ___fmt, \ - ___param, sizeof(___param)); \ -}) +#define BPF_SNPRINTF(out, out_size, fmt, args...) \ + ({ \ + static const char ___fmt[] = fmt; \ + unsigned long long ___param[___bpf_narg(args)]; \ + \ + _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ + ___bpf_fill(___param, args); \ + _Pragma("GCC diagnostic pop") \ + \ + bpf_snprintf(out, out_size, ___fmt, ___param, sizeof(___param)); \ + }) #ifdef BPF_NO_GLOBAL_DATA #define BPF_PRINTK_FMT_MOD @@ -222,39 +238,47 @@ enum libbpf_tristate { #define BPF_PRINTK_FMT_MOD static const #endif -#define __bpf_printk(fmt, ...) \ -({ \ - BPF_PRINTK_FMT_MOD char ____fmt[] = fmt; \ - bpf_trace_printk(____fmt, sizeof(____fmt), \ - ##__VA_ARGS__); \ -}) +#define __bpf_printk(fmt, ...) \ + ({ \ + BPF_PRINTK_FMT_MOD char ____fmt[] = fmt; \ + bpf_trace_printk(____fmt, sizeof(____fmt), ##__VA_ARGS__); \ + }) /* * __bpf_vprintk wraps the bpf_trace_vprintk helper with variadic arguments * instead of an array of u64. */ -#define __bpf_vprintk(fmt, args...) \ -({ \ - static const char ___fmt[] = fmt; \ - unsigned long long ___param[___bpf_narg(args)]; \ - \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ - ___bpf_fill(___param, args); \ - _Pragma("GCC diagnostic pop") \ - \ - bpf_trace_vprintk(___fmt, sizeof(___fmt), \ - ___param, sizeof(___param)); \ -}) +#define __bpf_vprintk(fmt, args...) \ + ({ \ + static const char ___fmt[] = fmt; \ + unsigned long long ___param[___bpf_narg(args)]; \ + \ + _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ + ___bpf_fill(___param, args); \ + _Pragma("GCC diagnostic pop") \ + \ + bpf_trace_vprintk(___fmt, sizeof(___fmt), ___param, sizeof(___param)); \ + }) /* Use __bpf_printk when bpf_printk call has 3 or fewer fmt args * Otherwise use __bpf_vprintk */ -#define ___bpf_pick_printk(...) \ - ___bpf_nth(_, ##__VA_ARGS__, __bpf_vprintk, __bpf_vprintk, __bpf_vprintk, \ - __bpf_vprintk, __bpf_vprintk, __bpf_vprintk, __bpf_vprintk, \ - __bpf_vprintk, __bpf_vprintk, __bpf_printk /*3*/, __bpf_printk /*2*/,\ - __bpf_printk /*1*/, __bpf_printk /*0*/) +#define ___bpf_pick_printk(...) \ + ___bpf_nth(_, \ + ##__VA_ARGS__, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_vprintk, \ + __bpf_printk /*3*/, \ + __bpf_printk /*2*/, \ + __bpf_printk /*1*/, \ + __bpf_printk /*0*/) /* Helper macro to print out debug messages */ #define bpf_printk(fmt, args...) ___bpf_pick_printk(args)(fmt, ##args) diff --git a/bpf/hpack.h b/bpf/hpack.h index 123982046..fce119825 100644 --- a/bpf/hpack.h +++ b/bpf/hpack.h @@ -152,6 +152,8 @@ static __always_inline int32_t hpack_encode_tp(struct hpack_ctx *d) { d->len += 3; return d->len; } + default: + break; } // case 4: uint32_t y = (uint32_t)(d->m_bytes); @@ -165,4 +167,4 @@ static __always_inline int32_t hpack_encode_tp(struct hpack_ctx *d) { return d->len; } -#endif \ No newline at end of file +#endif diff --git a/bpf/http2_grpc.h b/bpf/http2_grpc.h index 5769f2477..cbafd2224 100644 --- a/bpf/http2_grpc.h +++ b/bpf/http2_grpc.h @@ -34,7 +34,7 @@ typedef struct frame_header { } __attribute__((packed)) frame_header_t; static __always_inline u8 read_http2_grpc_frame_header(frame_header_t *frame, - unsigned char *p, + const unsigned char *p, u32 len) { if (len < FRAME_HEADER_LEN) { return 0; @@ -65,7 +65,7 @@ static __always_inline u8 is_headers_frame(frame_header_t *frame) { return frame->type == FrameHeaders && frame->stream_id; } -static __always_inline int bpf_memcmp(char *s1, char *s2, s32 size) { +static __always_inline int bpf_memcmp(const char *s1, const char *s2, s32 size) { for (int i = 0; i < size; i++) { if (s1[i] != s2[i]) { return i + 1; @@ -104,4 +104,4 @@ static __always_inline u8 is_flags_only_frame(frame_header_t *frame) { return frame->length <= 2; } -#endif // HTTP2_GRPC_HELPERS \ No newline at end of file +#endif // HTTP2_GRPC_HELPERS diff --git a/bpf/http_ssl.c b/bpf/http_ssl.c index b97c4abc1..230249b2d 100644 --- a/bpf/http_ssl.c +++ b/bpf/http_ssl.c @@ -100,7 +100,11 @@ int BPF_URETPROBE(uretprobe_ssl_read, int ret) { } SEC("uprobe/libssl.so:SSL_read_ex") -int BPF_UPROBE(uprobe_ssl_read_ex, void *ssl, const void *buf, int num, size_t *readbytes) { +int BPF_UPROBE(uprobe_ssl_read_ex, + void *ssl, + const void *buf, + int num, + size_t *readbytes) { //NOLINT(readability-non-const-parameter) u64 id = bpf_get_current_pid_tgid(); if (!valid_pid(id)) { diff --git a/bpf/protocol_http.h b/bpf/protocol_http.h index 6f5aa00ee..238d5da5b 100644 --- a/bpf/protocol_http.h +++ b/bpf/protocol_http.h @@ -8,6 +8,7 @@ #include "pid.h" #include "runtime.h" #include "protocol_common.h" +#include "trace_common.h" // http_info_t became too big to be declared as a variable in the stack. // We use a percpu array to keep a reusable copy of it @@ -47,7 +48,7 @@ static __always_inline http_info_t *empty_http_info() { return value; } -static __always_inline u8 is_http(unsigned char *p, u32 len, u8 *packet_type) { +static __always_inline u8 is_http(const unsigned char *p, u32 len, u8 *packet_type) { if (len < MIN_HTTP_SIZE) { return 0; } @@ -182,7 +183,8 @@ static __always_inline void process_http_request( info->task_tid = get_task_tid(); // required for deleting the trace information } -static __always_inline void process_http_response(http_info_t *info, unsigned char *buf, int len) { +static __always_inline void +process_http_response(http_info_t *info, const unsigned char *buf, int len) { info->resp_len = 0; info->end_monotime_ns = bpf_ktime_get_ns(); info->status = 0; @@ -328,4 +330,4 @@ int protocol_http(void *ctx) { return 0; } -#endif \ No newline at end of file +#endif diff --git a/bpf/protocol_tcp.h b/bpf/protocol_tcp.h index 3b58943ae..1a39469e6 100644 --- a/bpf/protocol_tcp.h +++ b/bpf/protocol_tcp.h @@ -7,6 +7,7 @@ #include "ringbuf.h" #include "pid.h" #include "protocol_common.h" +#include "trace_common.h" // Keeps track of tcp buffers for unknown protocols struct { @@ -111,4 +112,4 @@ int protocol_tcp(void *ctx) { return 0; } -#endif \ No newline at end of file +#endif diff --git a/bpf/ringbuf.h b/bpf/ringbuf.h index c4333a979..3c008b89e 100644 --- a/bpf/ringbuf.h +++ b/bpf/ringbuf.h @@ -40,11 +40,12 @@ volatile const u32 wakeup_data_bytes; static __always_inline long get_flags() { long sz; - if (!wakeup_data_bytes) + if (!wakeup_data_bytes) { return 0; + } sz = bpf_ringbuf_query(&events, BPF_RB_AVAIL_DATA); return sz >= wakeup_data_bytes ? BPF_RB_FORCE_WAKEUP : BPF_RB_NO_WAKEUP; } -#endif \ No newline at end of file +#endif diff --git a/bpf/trace_common.h b/bpf/trace_common.h index 080dc66d1..91f3f1763 100644 --- a/bpf/trace_common.h +++ b/bpf/trace_common.h @@ -7,6 +7,7 @@ #include "tracing.h" #include "pid_types.h" #include "runtime.h" +#include "ringbuf.h" typedef struct trace_key { pid_key_t p_key; // pid key as seen by the userspace (for example, inside its container) @@ -153,11 +154,11 @@ static __always_inline void delete_server_trace(trace_key_t *t_key) { // bpf_dbg_printk("Deleting server span for id=%llx, pid=%d, ns=%d, res = %d", bpf_get_current_pid_tgid(), t_key->p_key.pid, t_key->p_key.ns, res); } -static __always_inline u8 valid_span(unsigned char *span_id) { +static __always_inline u8 valid_span(const unsigned char *span_id) { return *((u64 *)span_id) != 0; } -static __always_inline u8 valid_trace(unsigned char *trace_id) { +static __always_inline u8 valid_trace(const unsigned char *trace_id) { return *((u64 *)trace_id) != 0 && *((u64 *)(trace_id + 8)) != 0; } @@ -282,7 +283,7 @@ static __always_inline void get_or_create_trace_info(http_connection_metadata_t unsigned char *buf = tp_char_buf(); if (buf) { - int buf_len = (int)bytes_len; + int buf_len = bytes_len; bpf_clamp_umax(buf_len, TRACE_BUF_SIZE - 1); bpf_probe_read(buf, buf_len, u_buf); @@ -311,8 +312,6 @@ static __always_inline void get_or_create_trace_info(http_connection_metadata_t bpf_map_update_elem(&trace_map, conn, tp_p, BPF_ANY); server_or_client_trace(meta, conn, tp_p); - - return; } -#endif \ No newline at end of file +#endif diff --git a/bpf/trace_util.h b/bpf/trace_util.h index 4eb5e4e6b..381f0497d 100644 --- a/bpf/trace_util.h +++ b/bpf/trace_util.h @@ -1,6 +1,9 @@ #ifndef TRACE_UTIL_H #define TRACE_UTIL_H +#include "vmlinux.h" +#include "bpf_helpers.h" + // 55+13 #define TRACE_PARENT_HEADER_LEN 68 @@ -29,7 +32,7 @@ static __always_inline void urand_bytes(unsigned char *buf, u32 size) { } } -static __always_inline void decode_hex(unsigned char *dst, unsigned char *src, int src_len) { +static __always_inline void decode_hex(unsigned char *dst, const unsigned char *src, int src_len) { for (int i = 1, j = 0; i < src_len; i += 2) { unsigned char p = src[i - 1]; unsigned char q = src[i]; @@ -44,7 +47,7 @@ static __always_inline void decode_hex(unsigned char *dst, unsigned char *src, i } } -static __always_inline void encode_hex(unsigned char *dst, unsigned char *src, int src_len) { +static __always_inline void encode_hex(unsigned char *dst, const unsigned char *src, int src_len) { for (int i = 0, j = 0; i < src_len; i++) { unsigned char p = src[i]; dst[j++] = hex[(p >> 4) & 0xff]; @@ -52,7 +55,7 @@ static __always_inline void encode_hex(unsigned char *dst, unsigned char *src, i } } -static __always_inline bool is_traceparent(unsigned char *p) { +static __always_inline bool is_traceparent(const unsigned char *p) { if (((p[0] == 'T') || (p[0] == 't')) && (p[1] == 'r') && (p[2] == 'a') && (p[3] == 'c') && (p[4] == 'e') && ((p[5] == 'p') || (p[5] == 'P')) && (p[6] == 'a') && (p[7] == 'r') && (p[8] == 'e') && (p[9] == 'n') && (p[10] == 't') && (p[11] == ':') && (p[12] == ' ')) { @@ -62,4 +65,4 @@ static __always_inline bool is_traceparent(unsigned char *p) { return false; } -#endif \ No newline at end of file +#endif diff --git a/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o index 9adb19325..876c67117 100644 --- a/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fbe76a7b43f3342442917c766afa61c3e412a93515f78050523fa26dbb38f67 -size 386896 +oid sha256:e95ce216c708c525841753d5b0d9b1377f84367748fdec5e11e548881f1fc09c +size 386880 diff --git a/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o index a3b8b90bc..d27972ed1 100644 --- a/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a718028bae4f9c78437ab56a69930fdd23aba97a917a657f7db38f0f9ec72632 -size 868896 +oid sha256:c61900617a1b66d410a42fb1069c8d8d71322d6567a4180b46baba5b887936c1 +size 868872 diff --git a/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o index 066021c81..23fe2c14c 100644 --- a/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:537982770a28c59e6d53ac02bcf354b3e7f56f007b7f59a738ae2c474ee54370 -size 870728 +oid sha256:1d3396d67d3222843ff6c4ca013174c8b27cfa99782ab027999e0ca359d980bc +size 870704 diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o index d1c004772..f2cfb900c 100644 --- a/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:449c15e687201e7dd26da5cef6f69904c0c80fa352701ae9a5b321a059ce1431 -size 432192 +oid sha256:385b77c64b84cf75ee53724418f578874be13b56b94fbc31af4b5a8f00c513b2 +size 432168 diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o index ba68b6c68..81ef27d8e 100644 --- a/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e01cdff8eefc11be4310420ca5e157e34491d8534f3955411f360daa594d4d5d -size 965352 +oid sha256:c62eaa7a75a368b73278be9645fef6405974fe5b3bff210504c39e244c60fede +size 965336 diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o index 2fac5786c..c46f6e124 100644 --- a/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6cb2f4ab11eff1f76891e2b5e105369c8948ed62c6a35f0ee13dc5a82d6e24f -size 967184 +oid sha256:56992e4a95a5ee6c9504d20658915b4a1ba2a5b23187fc0da62b34715a6cef23 +size 967160 diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o index 2746c665a..74d293188 100644 --- a/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5150858421a3fc99cc6adc0c0e6b3ff25f954f186b56fe4500fca498a91cd04 -size 434024 +oid sha256:5d5f8f5c682f49f2b91df7cf924c06970f7765df84fbfe7e095596d59ad04484 +size 434000 diff --git a/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o index b179ebacb..2b9f9277f 100644 --- a/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o +++ b/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7136ec475a8abc90403a8bb27f34dc4d1f05db1bcb0443b222f2d21c6c15501e -size 388728 +oid sha256:d5f0e23fa1230696dded45405478fe43735682338a8568ca049a59ba53fb83d2 +size 388712 diff --git a/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o index 702dd2b11..2dec17a0a 100644 --- a/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9efd845cb8ace719b17fcebfeef33a4ab435cb6abf9f805a9e8effe9d8b4f14 -size 244544 +oid sha256:ce0a3a5b6c4367fcf927040c33da71aacf9e3ad7215b4642d67c931fae3efb76 +size 244488 diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o index afeb82930..a60f24c88 100644 --- a/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7abdf6b1f398273096419c90c2a1687b3bacad52f4c8c297b6a1035ae01580c5 -size 403024 +oid sha256:e2a0e040f9b1c4b2534172a3b4e79dd78cfbf656341fd93f16c6d4eec1fcee0d +size 402968 diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o index b5b06b216..2283f41bc 100644 --- a/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f42f2c1f498a715b1b442c85f5482e34db329548c24f414f664b313523abfc65 -size 404208 +oid sha256:559e7fac62437383ada79dcb50ea864080d90e4cc8308388fe15bcf3fb820c37 +size 404152 diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o index 5c5d8da05..06c4b2241 100644 --- a/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c5c856dae24fbba43c00384bb66984741efe560666f57a73ef54666bae37f57 -size 259184 +oid sha256:4db996b4c6335ca808efde103ddf59884291acec220bf9ee590005c4edc2fb17 +size 259128 diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o index 9bf36848e..663bf75fc 100644 --- a/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:657a3852a6c0688624ff58960877b5a9c87278b2fe7730a738bb6f7f8b83eebc -size 421352 +oid sha256:08cf0bc6e79eb2b2ed0d10bdebaff60bb213ca9aaabd2b17d8ee2f04278e8456 +size 421296 diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o index c8f5f07eb..2ec22f846 100644 --- a/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a3f56457bbbd8aa11b110b7d8625116cbf812f899d1472c552eca97ee7bb03a -size 422536 +oid sha256:f23e9bf3cb19719021a7ccf6a6b0598c4703c7d762bfd2a70529f5a10a07c32b +size 422480 diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o index dbfd73efd..9019e6404 100644 --- a/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90d27a951d431325886c566e9bc8664676b461bac9498352ded97ebc512ccf28 -size 260368 +oid sha256:293882597c4263e4e49678f08ede9723d35584af6dc256b679ab2cc565da712e +size 260312 diff --git a/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o index 46d0a9407..bc5d8bb9d 100644 --- a/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o +++ b/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4a46ae0b77a81371ffad704bc927904a030d89851989ba30d9a10e18909c2b4 -size 245736 +oid sha256:9a59d4da88317c9d2938bf25314b2eded864accad3bbc242e4e1c40ed876e9f6 +size 245680 diff --git a/pkg/internal/ebpf/ktracer/bpf_arm64_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_arm64_bpfel.o index 97eb628f0..89f932e1a 100644 --- a/pkg/internal/ebpf/ktracer/bpf_arm64_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e63dbe8d574535fcf5c73a049a8d8c781cbd8ad35fb43a31abc2b482673fe47 +oid sha256:99a97a9e7fde5a0f6d70cd6359d3e84361d338bacee1d94ca452f0bfb6be05d3 size 353256 diff --git a/pkg/internal/ebpf/ktracer/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_debug_arm64_bpfel.o index 31857ebd3..192529fc3 100644 --- a/pkg/internal/ebpf/ktracer/bpf_debug_arm64_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_debug_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99ea0904936500cb2ad0e86684ff8a7701e165b1a8df9233e7b018efbd26b13d +oid sha256:c4d04edf1ebef57bbb8db0379195979bd0d710a06114eb5d2ee8f269454d6d9d size 540160 diff --git a/pkg/internal/ebpf/ktracer/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_debug_x86_bpfel.o index a601fa2e1..6b18026c3 100644 --- a/pkg/internal/ebpf/ktracer/bpf_debug_x86_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_debug_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9fd0a15497c1a7ece36389dd3626e173bd493b7e6239608f655153d1eaa7a44 +oid sha256:c14b852879ef39fa0d5e2ee34111921f43d48b92e2cb19a6a00c19871706aa52 size 540008 diff --git a/pkg/internal/ebpf/ktracer/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_tp_arm64_bpfel.o index 2fd952c67..cfcbd4249 100644 --- a/pkg/internal/ebpf/ktracer/bpf_tp_arm64_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_tp_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c2e528cbdc93b85a81650cd9457b7a041708b25c6e778ca33492122491700ee -size 367864 +oid sha256:d6f725136ad35f69f373fdad13caec688d574218500be10c77d2f8c544e7d067 +size 367872 diff --git a/pkg/internal/ebpf/ktracer/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_tp_debug_arm64_bpfel.o index 7b79073d4..f630b218c 100644 --- a/pkg/internal/ebpf/ktracer/bpf_tp_debug_arm64_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_tp_debug_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ded5a738738567ff35bbbb809deeb5a5370917f1ba4f475f9eb3d20a5ab8f36d +oid sha256:66f73a1b67ea42a11c781d4ae5572ef40c562d4d8d696d09141d1ebc855944e5 size 558488 diff --git a/pkg/internal/ebpf/ktracer/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_tp_debug_x86_bpfel.o index 3d6b54cd8..958a6c889 100644 --- a/pkg/internal/ebpf/ktracer/bpf_tp_debug_x86_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_tp_debug_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef777ab01429d5dcedae76d3d57f29a1b6d63ee9eddcb8dfb2e4fa2ea4c8b187 +oid sha256:4925eb60e05e7d0a3603d4ed8ae30fd8f50491aca0fc3eccd59f33c3b77668cf size 558336 diff --git a/pkg/internal/ebpf/ktracer/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_tp_x86_bpfel.o index 94c80afb5..7eda6b3f6 100644 --- a/pkg/internal/ebpf/ktracer/bpf_tp_x86_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_tp_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27c202a68c2ad59316d54571e05fba17b8fffc1fcad6c8eaa16d29d6d1f88ef4 +oid sha256:c1ad50d0031c07a4cf2572bca5e6a31afffe6c52172e44130dca8c16359a613b size 367608 diff --git a/pkg/internal/ebpf/ktracer/bpf_x86_bpfel.o b/pkg/internal/ebpf/ktracer/bpf_x86_bpfel.o index 8db42ec13..5fb3cc2be 100644 --- a/pkg/internal/ebpf/ktracer/bpf_x86_bpfel.o +++ b/pkg/internal/ebpf/ktracer/bpf_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc0db6c5ec24d76f4f130bca15aed7f933e3f06c4301f97dfddb0ba4f09cea2 +oid sha256:a53375e02dd9d2adb92f9db249f17fd6adc9ffd3b5612dc39b1cd09edee7640b size 353000 diff --git a/pkg/internal/netolly/ebpf/net_arm64_bpfel.o b/pkg/internal/netolly/ebpf/net_arm64_bpfel.o index 29755eeae..c26a2a9fd 100644 --- a/pkg/internal/netolly/ebpf/net_arm64_bpfel.o +++ b/pkg/internal/netolly/ebpf/net_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f1926ab4ebb8e41fa9d2d5f9bc0bfc351cec56b6d48ba22be01beb4335d2c3e +oid sha256:b2d5bbea40924b5d2e5954cb9ee69a8ec5008777747516586225d77ae3b5fa26 size 31232 diff --git a/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o b/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o index f4d96a9ed..1b14dc48a 100644 --- a/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o +++ b/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73645a8e3a78cd5e9a39d48ebb9b218186f067d5744db359cefa763699b81dde -size 28600 +oid sha256:804b4d262d43a1432af8027545e362ede6c4fe6fd274e521fd6084727103d268 +size 28584 diff --git a/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o b/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o index 6a6ef6273..999228ea5 100644 --- a/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o +++ b/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4ad417dd49e3ef64a90af85a2dc106e07a7c896d5e116df210e4bf99d8efbd9 -size 28384 +oid sha256:71a96753d080b4641984f14c9b5615930a33d035d18febfceed706c779103485 +size 28368