libbpf bpf_helpers: Use __builtin_offsetof for offsetof
Subsystems (4)
PATCH v2 1/1 libbpf bpf_helpers: Use __builtin_offsetof for offsetof
The non-builtin route for offsetof has a dependency on size_t from stdlib.h/stdint.h that is undeclared and may break targets. The offsetof macro in bpf_helpers may disable the same macro in other headers that have a #ifdef offsetof guard. Rather than add additional dependencies improve the offsetof macro declared here to use the builtin that is available since llvm 3.7 (the first with a BPF backend).
--- tools/lib/bpf/bpf_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/bpf_helpers.h +1 -1
@@ -40,7 +40,7 @@* Helper macro to manipulate data structures */ #ifndef offsetof -#define offsetof (TYPE ,MEMBER ) ((size_t)&((TYPE *)0)->MEMBER) +#define offsetof (TYPE ,MEMBER ) __builtin_offsetof(TYPE, MEMBER)#endif #ifndef container_of#define container_of (ptr, type, member) \
Signature · 1 line
2.28.0.rc0.105.gf9edc3c819-goog
Quoted 10 lines · Ian Rogers
The non-builtin route for offsetof has a dependency on
size_tfromstdlib.h/stdint.hthat is undeclared and may break targets. The offsetof macro inbpf_helpersmay disable the same macro in other headers that have a #ifdef offsetof guard. Rather than add additional dependencies improve the offsetof macro declared here to use the builtin that is available since llvm 3.7 (the first with a BPF backend).Signed-off-by Ian Rogers <[email protected]>---
Quoted 19 lines
tools/lib/bpf/bpf_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/lib/bpf/bpf_helpers.h +1
-2@@ -40,7 +40,7 @@* Helper macro to manipulate data structures */ #ifndef offsetof -#define offsetof (TYPE ,MEMBER ) ((size_t)&((TYPE *)0)->MEMBER) +#define offsetof (TYPE ,MEMBER ) __builtin_offsetof(TYPE, MEMBER)#endif #ifndef container_of#define container_of (ptr, type, member) \ --2.28.0.rc0.105.gf9edc3c819-goog
Alexei Starovoitov
AppliedQuoted 10 lines · Andrii Nakryiko
Quoted 8 lines · Ian Rogers
The non-builtin route for offsetof has a dependency on
size_tfromstdlib.h/stdint.hthat is undeclared and may break targets. The offsetof macro inbpf_helpersmay disable the same macro in other headers that have a #ifdef offsetof guard. Rather than add additional dependencies improve the offsetof macro declared here to use the builtin that is available since llvm 3.7 (the first with a BPF backend).
Quoted 4 lines
Quoted 2 lines
Signed-off-by Ian Rogers <[email protected]>---
Acked-by Andrii Nakryiko <[email protected]>
Applied. Thanks