CI: fix test failure on 5.15 kernel

Signed-off-by: Tw <weii.tan>
tw4452852 · May 9, 2023 · 427ccad · 427ccad
1 parent 1afd70c
commit 427ccad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: goto-bus-stop/setup-zig@v2
       - run: sudo apt-get install -y libelf-dev libz-dev
+      - run: uname -a
       - run: zig build test
       - run: sudo ./zig-out/bin/test
   lint:

diff --git a/external/libbpf/src/libbpf.c b/external/libbpf/src/libbpf.c
@@ -2783,17 +2783,15 @@ static int bpf_object__sanitize_btf(struct bpf_object *obj, struct btf *btf)
 
 #ifdef ZIG_BTF_WA
 		// https://github.com/tw4452852/zbpf/issues/3
-		else if (!btf_is_var(t) && !btf_is_func(t) && !btf_is_datasec(t) && !btf_is_fwd(t)) {
+		else if (btf_is_ptr(t)) {
 			t->name_off = 0;
-		} else if (btf_is_fwd(t)) {
+		} else if (btf_is_fwd(t) || btf_is_struct(t)) {
 			char *name = (char *)btf__name_by_offset(btf, t->name_off);
 			while (*name) {
 				if (*name == '.')
 					*name = '_';
 				name++;
 			}
-		} else if (btf_is_func(t)) {
-			t->info = BTF_INFO_ENC(BTF_KIND_TYPEDEF, 0, 0);
 		}
 #endif
 	}

diff --git a/samples/ringbuf.zig b/samples/ringbuf.zig
@@ -8,7 +8,7 @@ var my_pid = bpf.Map.ArrayMap("my_pid", u32, 1, 0).init();
 
 var n: u32 = 0;
 
-export fn test_ringbuf(_: *opaque {}) linksection("kprobe/do_nanosleep") c_int {
+export fn test_ringbuf() linksection("kprobe/do_nanosleep") c_int {
     const pid = my_pid.lookup(0) orelse return 1;
 
     const cur_pid = @truncate(u32, helpers.get_current_pid_tgid());