Make verifier happy on older linux

grafana · Jan 30, 2024 · 429e057 · 429e057
1 parent 63bc537
commit 429e057
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 2 deletions.
diff --git a/bpf/go_common.h b/bpf/go_common.h
@@ -102,6 +102,14 @@ static __always_inline void tp_from_parent(tp_info_t *tp, tp_info_t *parent) {
     tp->flags = parent->flags;
 }
 
+static __always_inline void tp_clone(tp_info_t *dest, tp_info_t *src) {
+    *((u64 *)dest->trace_id) = *((u64 *)src->trace_id);
+    *((u64 *)(dest->trace_id + 8)) = *((u64 *)(src->trace_id + 8));
+    *((u64 *)dest->span_id) = *((u64 *)src->span_id);
+    *((u64 *)dest->parent_id) = *((u64 *)src->parent_id);
+    dest->flags = src->flags;
+}
+
 static __always_inline void server_trace_parent(void *goroutine_addr, tp_info_t *tp, void *req_header) {
     // May get overriden when decoding existing traceparent, but otherwise we set sample ON
     tp->flags = 1;

diff --git a/bpf/go_nethttp.c b/bpf/go_nethttp.c
@@ -681,9 +681,9 @@ int uprobe_persistConnRoundTrip(struct pt_regs *ctx) {
                 tp_info_pid_t tp_p = {
                     .pid = pid,
                     .valid = 1,
-                    .tp = invocation->tp
                 };
-
+
+                tp_clone(&tp_p.tp, &invocation->tp);
                 tp_p.tp.ts = bpf_ktime_get_ns();
                 bpf_dbg_printk("storing trace_map info for black-box tracing");
                 bpf_map_update_elem(&trace_map, &conn, &tp_p, BPF_ANY);

diff --git a/pkg/internal/ebpf/gosql/bpf_bpfel_arm64.o b/pkg/internal/ebpf/gosql/bpf_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/gosql/bpf_bpfel_x86.o b/pkg/internal/ebpf/gosql/bpf_bpfel_x86.o
diff --git a/pkg/internal/ebpf/gosql/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/gosql/bpf_debug_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/gosql/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/gosql/bpf_debug_bpfel_x86.o
diff --git a/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o
diff --git a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_bpfel_x86.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_x86.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_x86.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_arm64.o
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_x86.o