Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

bpftool: Make skeleton C++ compatible with explicit casts

Fix C++ compilation errors in generated skeleton by adding explicit
pointer casts and use char * subtraction for offset calculation

error: invalid conversion from 'void*' to '<obj_name>*' [-fpermissive]
| skel = skel_alloc(sizeof(*skel));
| ~~~~~~~~~~^~~~~~~~~~~~~~~
| |
| void*

error: arithmetic on pointers to void
| skel->ctx.sz = (void *)&skel->links - (void *)skel;
| ~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~

error: assigning to 'struct <obj_name>__<ident> *' from incompatible type 'void *'
| skel-><ident> = skel_prep_map_data((void *)data, 4096,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| sizeof(data) - 1);
| ~~~~~~~~~~~~~~~~~

error: assigning to 'struct <obj_name>__<ident> *' from incompatible type 'void *'
| skel-><ident> = skel_finalize_map_data(&skel->maps.<ident>.initial_value,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| 4096, PROT_READ | PROT_WRITE, skel->maps.<ident>.map_fd);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Minimum reproducer:

$ cat test.bpf.c
int val; // placed in .bss section

#include "vmlinux.h"
#include <bpf/bpf_helpers.h>

SEC("raw_tracepoint/sched_wakeup_new") int handle(void *ctx) { return 0; }

$ cat test.cpp
#include <cerrno>

extern "C" {
#include "test.bpf.skel.h"
}

$ bpftool btf dump file /sys/kernel/btf/vmlinux format c > vmlinux.h
$ clang -g -O2 -target bpf -c test.bpf.c -o test.bpf.o
$ bpftool gen skeleton test.bpf.o -L > test.bpf.skel.h
$ g++ -c test.cpp -I.

Co-developed-by: Menglong Dong <dongml2@chinatelecom.cn>
Signed-off-by: WanLi Niu <niuwl1@chinatelecom.cn>
Signed-off-by: Menglong Dong <dongml2@chinatelecom.cn>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20260106023123.2928-1-kiraskyler@163.com

authored by

WanLi Niu and committed by
Andrii Nakryiko
4effccde 2175ccfb

+4 -4
+4 -4
tools/bpf/bpftool/gen.c
··· 731 731 { \n\ 732 732 struct %1$s *skel; \n\ 733 733 \n\ 734 - skel = skel_alloc(sizeof(*skel)); \n\ 734 + skel = (struct %1$s *)skel_alloc(sizeof(*skel)); \n\ 735 735 if (!skel) \n\ 736 736 goto cleanup; \n\ 737 - skel->ctx.sz = (void *)&skel->links - (void *)skel; \n\ 737 + skel->ctx.sz = (char *)&skel->links - (char *)skel; \n\ 738 738 ", 739 739 obj_name, opts.data_sz); 740 740 bpf_object__for_each_map(map, obj) { ··· 755 755 \n\ 756 756 \"; \n\ 757 757 \n\ 758 - skel->%1$s = skel_prep_map_data((void *)data, %2$zd,\n\ 758 + skel->%1$s = (__typeof__(skel->%1$s))skel_prep_map_data((void *)data, %2$zd,\n\ 759 759 sizeof(data) - 1);\n\ 760 760 if (!skel->%1$s) \n\ 761 761 goto cleanup; \n\ ··· 857 857 858 858 codegen("\ 859 859 \n\ 860 - skel->%1$s = skel_finalize_map_data(&skel->maps.%1$s.initial_value, \n\ 860 + skel->%1$s = (__typeof__(skel->%1$s))skel_finalize_map_data(&skel->maps.%1$s.initial_value,\n\ 861 861 %2$zd, %3$s, skel->maps.%1$s.map_fd);\n\ 862 862 if (!skel->%1$s) \n\ 863 863 return -ENOMEM; \n\