internal/sys: make generate-btf and regenerate types

Signed-off-by: Florian Lehner <dev@der-flo.net>
cilium · Aug 1, 2023 · cf8aadd · cf8aadd
1 parent b4b25b3
commit cf8aadd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -103,7 +103,7 @@ testdata/loader-%-eb.elf: testdata/loader.c
 	$(STRIP) -g $@
 
 .PHONY: generate-btf
-generate-btf: KERNEL_VERSION?=5.19
+generate-btf: KERNEL_VERSION?=6.1.29
 generate-btf:
 	$(eval TMP := $(shell mktemp -d))
 	curl -fL "$(CI_KERNEL_URL)/linux-$(KERNEL_VERSION).bz" -o "$(TMP)/bzImage"

diff --git a/btf/testdata/btf_testmod.btf b/btf/testdata/btf_testmod.btf
diff --git a/btf/testdata/vmlinux.btf.gz b/btf/testdata/vmlinux.btf.gz
diff --git a/internal/cmd/gentypes/main.go b/internal/cmd/gentypes/main.go
@@ -158,7 +158,8 @@ import (
 				replace(objName, "name"),
 				replace(pointer, "xlated_prog_insns"),
 				replace(pointer, "map_ids"),
-				replace(btfID, "btf_id"),
+				replace(btfID, "btf_id", "attach_btf_obj_id"),
+				replace(typeID, "attach_btf_id"),
 			},
 		},
 		{

diff --git a/internal/sys/types.go b/internal/sys/types.go