[EBPF] Replace generated pointers to structs with uintptr (#29221)

DataDog · Oct 2, 2024 · b224e2e · b224e2e
1 parent 4cb5ad8
commit b224e2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/pkg/ebpf/cgo/genpost.go b/pkg/ebpf/cgo/genpost.go
@@ -44,6 +44,10 @@ func main() {
 	convertInt8ArrayToByteArrayRegex := regexp.MustCompile(`(` + strings.Join(int8variableNames, "|") + `)(\s+)\[(\d+)\]u?int8`)
 	b = convertInt8ArrayToByteArrayRegex.ReplaceAll(b, []byte("$1$2[$3]byte"))
 
+	// Convert generated pointers to CGo structs to uintptr
+	convertPointerToUint64Regex := regexp.MustCompile(`\*_Ctype_struct_(\w+)`)
+	b = convertPointerToUint64Regex.ReplaceAll(b, []byte("uintptr"))
+
 	b, err = format.Source(b)
 	if err != nil {
 		log.Fatal(err)

diff --git a/pkg/network/ebpf/kprobe_types_linux.go b/pkg/network/ebpf/kprobe_types_linux.go
diff --git a/tasks/system_probe.py b/tasks/system_probe.py
@@ -516,7 +516,7 @@ def ninja_cgo_type_files(nw: NinjaWriter):
             inputs=[f],
             outputs=[os.path.join(in_dir, out_file)],
             rule="godefs",
-            implicit=headers,
+            implicit=headers + [script_path],
             variables={
                 "in_dir": in_dir,
                 "in_file": in_file,