bpftool: use __typeof__() instead of typeof() in BPF skeleton
Andrii Nakryiko
maintainerPATCH 1/1 bpftool: use __typeof__() instead of typeof() in BPF skeleton
When generated BPF skeleton header is included in C++ code base, some compiler setups will emit warning about using language extensions due to typeof() usage, resulting in something like:
error: extension used [-Werror,-Wlanguage-extension-token] obj->struct_ops.empty_tcp_ca = (typeof(obj->struct_ops.empty_tcp_ca))
^
It looks like __typeof__() is a preferred way to do typeof() with better C++ compatibility behavior, so switch to that. With __typeof__() we get no such warning.
--- tools/bpf/bpftool/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/bpf/bpftool/gen.c +2 -2
@@ -386,7 +386,7 @@ static int codegen_subskel_datasecs(struct bpf_object *obj, const char *obj_name*/ needs_typeof =btf_is_array (var) ||btf_is_ptr_to_func_proto (btf, var);if (needs_typeof) -printf ("typeof(" ); +printf ("__typeof__(" ); err =btf_dump__emit_type_decl (d, var_type_id, &opts);if (err)
@@ -1131,7 +1131,7 @@ static void gen_st_ops_shadow_init(struct btf *btf, struct bpf_object *obj)continue ;codegen ("\ \n\ -obj->struct_ops.%1$s = (typeof(obj->struct_ops.%1$s))\n\ +obj->struct_ops.%1$s = (__typeof__(obj->struct_ops.%1$s))\n\ bpf_map__initial_value(obj->maps.%1$s, NULL);\n\ \n\ " , ident);
Signature · 1 line
2.43.0
Quoted 33 lines · Andrii Nakryiko
When generated BPF skeleton header is included in C++ code base, some compiler setups will emit warning about using language extensions due to
typeof()usage, resulting in something like:error: extension used [-Werror,-Wlanguage-extension-token] obj->struct_ops.empty_tcp_ca = (typeof(obj->struct_ops.empty_tcp_ca)) ^It looks like
__typeof__()is a preferred way to dotypeof()with better C++ compatibility behavior, so switch to that. With__typeof__()we get no such warning.Fixes c2a0257c1edf ("bpftool: Cast pointers for shadow types explicitly.")Fixes 00389c58ffe9 ("bpftool: Add support for subskeletons")Signed-off-by Andrii Nakryiko <[email protected]>--- tools/bpf/bpftool/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/bpf/bpftool/gen.c +1
-1@@ -386,7 +386,7 @@ static int codegen_subskel_datasecs(struct bpf_object *obj, const char *obj_name*/ needs_typeof =btf_is_array (var) ||btf_is_ptr_to_func_proto (btf, var);if (needs_typeof) -printf ("typeof(" ); +printf ("__typeof__(" ); err =btf_dump__emit_type_decl (d, var_type_id, &opts);if (err)
tools/bpf/bpftool/gen.c static void gen_st_ops_shadow_init(struct btf *btf, struct bpf_object *obj) · line 1137
Quoted 8 lines
tools/bpf/bpftool/gen.c +1
-1@@ -1131,7 +1131,7 @@ static void gen_st_ops_shadow_init(struct btf *btf, struct bpf_object *obj)continue ;codegen ("\ \n\ -obj->struct_ops.%1$s = (typeof(obj->struct_ops.%1$s))\n\ +obj->struct_ops.%1$s = (__typeof__(obj->struct_ops.%1$s))\n\ bpf_map__initial_value(obj->maps.%1$s, NULL);\n\ \n\ " , ident);
LGTM!
Thanks!
Quoted 52 lines · Kui-Feng Lee
Quoted 43 lines · Andrii Nakryiko
When generated BPF skeleton header is included in C++ code base, some compiler setups will emit warning about using language extensions due to
typeof()usage, resulting in something like:error: extension used [-Werror,-Wlanguage-extension-token]
obj->struct_ops.empty_tcp_ca= (typeof(obj->struct_ops.empty_tcp_ca)) ^It looks like
__typeof__()is a preferred way to dotypeof()with better C++ compatibility behavior, so switch to that. With__typeof__()we get no such warning.Fixes c2a0257c1edf ("bpftool: Cast pointers for shadow typesexplicitly.")
Fixes 00389c58ffe9 ("bpftool: Add support for subskeletons")Signed-off-by Andrii Nakryiko <[email protected]>---
tools/bpf/bpftool/gen.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)tools/bpf/bpftool/gen.c +0
-0@@ -386,7 +386,7 @@ static int codegen_subskel_datasecs(struct
bpf_object*obj, const char*obj_name
*/
needs_typeof=btf_is_array(var)||btf_is_ptr_to_func_proto(btf, var);
if (needs_typeof)
- printf("typeof(");
+ printf("__typeof__(");
err =btf_dump__emit_type_decl(d, var_type_id, &opts); if (err)tools/bpf/bpftool/gen.c +1
-1@@ -1131,7 +1131,7 @@ static void gen_st_ops_shadow_init(struct btf *btf, struct bpf_object *obj) continue; codegen("\ \n\ - obj->struct_ops.%1$s = (typeof(obj->struct_ops.%1$s))\n\ + obj->struct_ops.%1$s = (__typeof__(obj->struct_ops. %1$s))\n\ bpf_map__initial_value(obj->maps.%1$s, NULL);\n\Quoted 2 lines
\n\
", ident);LGTM!
Quoted 4 lines
Acked-by Kui-Feng Lee <[email protected]>Thanks!
Quoted 45 lines · Andrii Nakryiko
When generated BPF skeleton header is included in C++ code base, some compiler setups will emit warning about using language extensions due to
typeof()usage, resulting in something like:error: extension used [-Werror,-Wlanguage-extension-token]
obj->struct_ops.empty_tcp_ca= (typeof(obj->struct_ops.empty_tcp_ca))^It looks like
__typeof__()is a preferred way to dotypeof()with better C++ compatibility behavior, so switch to that. With__typeof__()we get no such warning.Fixes c2a0257c1edf ("bpftool: Cast pointers for shadow types explicitly.")Fixes 00389c58ffe9 ("bpftool: Add support for subskeletons")Signed-off-by Andrii Nakryiko <[email protected]>--- tools/bpf/bpftool/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/bpf/bpftool/gen.c +2
-2@@ -386,7 +386,7 @@ static int codegen_subskel_datasecs(struct bpf_object *obj, const char *obj_name*/ needs_typeof =btf_is_array (var) ||btf_is_ptr_to_func_proto (btf, var);if (needs_typeof) -printf ("typeof(" ); +printf ("__typeof__(" ); err =btf_dump__emit_type_decl (d, var_type_id, &opts);if (err)@@ -1131,7 +1131,7 @@ static void gen_st_ops_shadow_init(struct btf *btf, struct bpf_object *obj)continue ;codegen ("\ \n\ -obj->struct_ops.%1$s = (typeof(obj->struct_ops.%1$s))\n\ +obj->struct_ops.%1$s = (__typeof__(obj->struct_ops.%1$s))\n\ bpf_map__initial_value(obj->maps.%1$s, NULL);\n\ \n\ " , ident);Signature · 1 line
2.43.0
sure.
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Mon, 1 Apr 2024 10:07:13 -0700 you wrote:
When generated BPF skeleton header is included in C++ code base, some compiler setups will emit warning about using language extensions due to
typeof()usage, resulting in something like:error: extension used [-Werror,-Wlanguage-extension-token]
obj->struct_ops.empty_tcp_ca= (typeof(obj->struct_ops.empty_tcp_ca))^[...]
Here is the summary with links:
- [bpf-next] bpftool: use __typeof__() instead of typeof() in BPF skeleton
https://git.kernel.org/bpf/bpf-next/c/2a24e2485722
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html