libbpf: replace typeof with __typeof__
Subsystems (4)
PATCH v2 1/1 libbpf: replace typeof with __typeof__
It seems the gcc preprocessor breaks when typeof is used with macros.
Fixes errors like:
error: expected identifier or '(' before '#pragma'
106 | SEC("cgroup/bind6")
| ^~~
error: expected '=', ',', ';', 'asm' or '__attribute__' before '#pragma'
114 | char _license[] SEC("license") = "GPL";
| ^~~---
Changes v1 -> v2:
- replace typeof with __typeof__ instead of changing pragma macros
--- tools/lib/bpf/bpf_core_read.h | 16 ++++++++-------- tools/lib/bpf/bpf_helpers.h | 4 ++-- tools/lib/bpf/bpf_tracing.h | 24 ++++++++++++------------ tools/lib/bpf/btf.h | 4 ++-- tools/lib/bpf/libbpf_internal.h | 6 +++--- tools/lib/bpf/usdt.bpf.h | 6 +++--- tools/lib/bpf/xsk.h | 12 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-)
tools/lib/bpf/bpf_core_read.h +8 -8
@@ -111,7 +111,7 @@ enum bpf_enum_value_kind { })#define ___bpf_field_ref1 (field) (field) -#define ___bpf_field_ref2 (type, field) (((typeof(type) *)0)->field) +#define ___bpf_field_ref2 (type, field) (((__typeof__(type) *)0)->field) #define ___bpf_field_ref(args...) \ ___bpf_apply(___bpf_field_ref, ___bpf_narg(args))(args)
@@ -161,7 +161,7 @@ enum bpf_enum_value_kind {* BTF. Always succeeds. */ #define bpf_core_type_id_local (type) \ - __builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_LOCAL) + __builtin_btf_type_id(*(__typeof__(type) *)0, BPF_TYPE_ID_LOCAL)/* * Convenience macro to get BTF type ID of a target kernel's type that matches
@@ -171,7 +171,7 @@ enum bpf_enum_value_kind {* - 0, if no matching type was found in a target kernel BTF. */ #define bpf_core_type_id_kernel (type) \ - __builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_TARGET) + __builtin_btf_type_id(*(__typeof__(type) *)0, BPF_TYPE_ID_TARGET)/* * Convenience macro to check that provided named type
@@ -181,7 +181,7 @@ enum bpf_enum_value_kind {* 0, if no matching type is found. */ #define bpf_core_type_exists (type) \ - __builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_EXISTS) + __builtin_preserve_type_info(*(__typeof__(type) *)0, BPF_TYPE_EXISTS)/* * Convenience macro to get the byte size of a provided named type
@@ -191,7 +191,7 @@ enum bpf_enum_value_kind {* 0, if no matching type is found. */ #define bpf_core_type_size (type) \ - __builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_SIZE) + __builtin_preserve_type_info(*(__typeof__(type) *)0, BPF_TYPE_SIZE)/* * Convenience macro to check that provided enumerator value is defined in
@@ -202,7 +202,7 @@ enum bpf_enum_value_kind {* 0, if no matching enum and/or enum value within that enum is found. */ #define bpf_core_enum_value_exists (enum_type, enum_value) \ - __builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, BPF_ENUMVAL_EXISTS) + __builtin_preserve_enum_value(*(__typeof__(enum_type) *)enum_value, BPF_ENUMVAL_EXISTS)/* * Convenience macro to get the integer value of an enumerator value in
@@ -213,7 +213,7 @@ enum bpf_enum_value_kind {* 0, if no matching enum and/or enum value within that enum is found. */ #define bpf_core_enum_value (enum_type, enum_value) \ - __builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, BPF_ENUMVAL_VALUE) + __builtin_preserve_enum_value(*(__typeof__(enum_type) *)enum_value, BPF_ENUMVAL_VALUE)/* * bpf_core_read() abstracts away bpf_probe_read_kernel() call and captures
@@ -300,7 +300,7 @@ enum bpf_enum_value_kind {#define ___arrow10 (a, b, c, d, e, f, g, h, i, j) a->b->c->d->e->f->g->h->i->j#define ___arrow (...) ___apply(___arrow, ___narg(__VA_ARGS__))(__VA_ARGS__) -#define ___type (...) typeof(___arrow(__VA_ARGS__)) +#define ___type (...) __typeof__(___arrow(__VA_ARGS__))#define ___read (read_fn, dst, src_type, src, accessor) \ read_fn((void *)(dst), sizeof(*(dst)), &((src_type)(src))->accessor)
tools/lib/bpf/bpf_helpers.h +2 -2
@@ -11,8 +11,8 @@#include "bpf_helper_defs.h" #define __uint (name, val) int (*name)[val] -#define __type (name, val) typeof(val) *name -#define __array (name, val) typeof(val) *name[] +#define __type (name, val) __typeof__(val) *name +#define __array (name, val) __typeof__(val) *name[]/* * Helper macro to place programs, maps, license in
tools/lib/bpf/bpf_tracing.h +12 -12
@@ -424,16 +424,16 @@ struct pt_regs;*/ #define BPF_PROG(name, args...) \ name(unsigned long long *ctx); \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(unsigned long long *ctx, ##args); \ -typeof(name(0)) name(unsigned long long *ctx) \ +__typeof__(name(0)) name(unsigned long long *ctx) \ { \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ return ____##name(___bpf_ctx_cast(args)); \ _Pragma("GCC diagnostic pop") \ } \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(unsigned long long *ctx, ##args)struct pt_regs ;
@@ -458,16 +458,16 @@ struct pt_regs;*/ #define BPF_KPROBE(name, args...) \ name(struct pt_regs *ctx); \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(struct pt_regs *ctx, ##args); \ -typeof(name(0)) name(struct pt_regs *ctx) \ +__typeof__(name(0)) name(struct pt_regs *ctx) \ { \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ return ____##name(___bpf_kprobe_args(args)); \ _Pragma("GCC diagnostic pop") \ } \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(struct pt_regs *ctx, ##args)#define ___bpf_kretprobe_args0 () ctx
@@ -482,16 +482,16 @@ ____##name(struct pt_regs *ctx, ##args)*/ #define BPF_KRETPROBE(name, args...) \ name(struct pt_regs *ctx); \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(struct pt_regs *ctx, ##args); \ -typeof(name(0)) name(struct pt_regs *ctx) \ +__typeof__(name(0)) name(struct pt_regs *ctx) \ { \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ return ____##name(___bpf_kretprobe_args(args)); \ _Pragma("GCC diagnostic pop") \ } \ -static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args) +static __always_inline __typeof__(name(0)) ____##name(struct pt_regs *ctx, ##args)#define ___bpf_syscall_args0 () ctx#define ___bpf_syscall_args1 (x) ___bpf_syscall_args0(), (void *)PT_REGS_PARM1_CORE_SYSCALL(regs)
@@ -515,9 +515,9 @@ static __always_inline typeof(name(0)) ____##name(struct pt_regs *ctx, ##args)*/ #define BPF_KPROBE_SYSCALL(name, args...) \ name(struct pt_regs *ctx); \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(struct pt_regs *ctx, ##args); \ -typeof(name(0)) name(struct pt_regs *ctx) \ +__typeof__(name(0)) name(struct pt_regs *ctx) \ { \ struct pt_regs *regs = PT_REGS_SYSCALL_REGS(ctx); \ _Pragma("GCC diagnostic push") \
@@ -525,7 +525,7 @@ typeof(name(0)) name(struct pt_regs *ctx) \ return ____##name(___bpf_syscall_args(args)); \ _Pragma("GCC diagnostic pop") \ } \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(struct pt_regs *ctx, ##args)#endif
tools/lib/bpf/btf.h +2 -2
@@ -322,8 +322,8 @@ LIBBPF_API struct btf_dump *btf_dump__new_deprecated(const struct btf *btf,*/ #ifndef __cplusplus#define btf_dump__new (a1, a2, a3, a4) __builtin_choose_expr( \ - __builtin_types_compatible_p(typeof(a4), btf_dump_printf_fn_t) || \ - __builtin_types_compatible_p(typeof(a4), void(void *, const char *, va_list)), \ + __builtin_types_compatible_p(__typeof__(a4), btf_dump_printf_fn_t) || \ + __builtin_types_compatible_p(__typeof__(a4), void(void *, const char *, va_list)), \ btf_dump__new_deprecated((void *)a1, (void *)a2, (void *)a3, (void *)a4), \ btf_dump__new((void *)a1, (void *)a2, (void *)a3, (void *)a4))#endif
tools/lib/bpf/libbpf_internal.h +3 -3
@@ -138,7 +138,7 @@ static inline bool str_has_sfx(const char *str, const char *sfx)#define COMPAT_VERSION (internal_name, api_name, version)#define DEFAULT_VERSION (internal_name, api_name, version) \ - extern typeof(internal_name) api_name \ + extern __typeof__(internal_name) api_name \ __attribute__((alias(#internal_name)));#endif
@@ -300,7 +300,7 @@ static inline bool libbpf_validate_opts(const char *opts, type##__last_field), \ (opts)->sz, #type)) #define OPTS_HAS(opts, field) \ - ((opts) && opts->sz >= offsetofend(typeof(*(opts)), field)) + ((opts) && opts->sz >= offsetofend(__typeof__(*(opts)), field)) #define OPTS_GET(opts, field, fallback_value) \ (OPTS_HAS(opts, field) ? (opts)->field : fallback_value)#define OPTS_SET (opts, field, value) \
@@ -311,7 +311,7 @@ static inline bool libbpf_validate_opts(const char *opts,#define OPTS_ZEROED (opts, last_nonzero_field) \ ({ \ - ssize_t __off = offsetofend(typeof(*(opts)), last_nonzero_field); \ + ssize_t __off = offsetofend(__typeof__(*(opts)), last_nonzero_field); \ !(opts) || libbpf_is_mem_zeroed((const void *)opts + __off, \ (opts)->sz - __off); \ })
tools/lib/bpf/usdt.bpf.h +3 -3
@@ -244,16 +244,16 @@ long bpf_usdt_cookie(struct pt_regs *ctx)*/ #define BPF_USDT(name, args...) \ name(struct pt_regs *ctx); \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(struct pt_regs *ctx, ##args); \ -typeof(name(0)) name(struct pt_regs *ctx) \ +__typeof__(name(0)) name(struct pt_regs *ctx) \ { \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wint-conversion\"") \ return ____##name(___bpf_usdt_args(args)); \ _Pragma("GCC diagnostic pop") \ } \ -static __attribute__((always_inline)) typeof(name(0)) \ +static __attribute__((always_inline)) __typeof__(name(0)) \ ____##name(struct pt_regs *ctx, ##args)#endif /* __USDT_BPF_H__ */
tools/lib/bpf/xsk.h +6 -6
@@ -36,8 +36,8 @@ extern "C" {* LIBRARY INTERNAL */ -#define __XSK_READ_ONCE (x) (*(volatile typeof(x) *)&x) -#define __XSK_WRITE_ONCE (x, v) (*(volatile typeof(x) *)&x) = (v) +#define __XSK_READ_ONCE (x) (*(volatile __typeof__(x) *)&x) +#define __XSK_WRITE_ONCE (x, v) (*(volatile __typeof__(x) *)&x) = (v)#if defined(__i386__) || defined(__x86_64__)# define libbpf_smp_store_release (p, v) \
@@ -47,7 +47,7 @@ extern "C" { } while (0)# define libbpf_smp_load_acquire (p) \ ({ \ - typeof(*p) ___p1 = __XSK_READ_ONCE(*p); \ + __typeof__(*p) ___p1 = __XSK_READ_ONCE(*p); \ asm volatile("" : : : "memory"); \ ___p1; \ })
@@ -56,7 +56,7 @@ extern "C" { asm volatile ("stlr %w1, %0" : "=Q" (*p) : "r" (v) : "memory")# define libbpf_smp_load_acquire (p) \ ({ \ - typeof(*p) ___p1; \ + __typeof__(*p) ___p1; \ asm volatile ("ldar %w0, %1" \ : "=r" (___p1) : "Q" (*p) : "memory"); \ ___p1; \
@@ -69,7 +69,7 @@ extern "C" { } while (0)# define libbpf_smp_load_acquire (p) \ ({ \ - typeof(*p) ___p1 = __XSK_READ_ONCE(*p); \ + __typeof__(*p) ___p1 = __XSK_READ_ONCE(*p); \ asm volatile ("fence r,rw" : : : "memory"); \ ___p1; \ })
@@ -86,7 +86,7 @@ extern "C" {#ifndef libbpf_smp_load_acquire#define libbpf_smp_load_acquire (p) \ ({ \ - typeof(*p) ___p1 = __XSK_READ_ONCE(*p); \ + __typeof__(*p) ___p1 = __XSK_READ_ONCE(*p); \ __sync_synchronize(); \ ___p1; \ })
Signature · 1 line
2.25.1
Daniel Borkmann
maintainerHi James,
Quoted 31 lines · James Hilliard
It seems the gcc preprocessor breaks when typeof is used with macros.
Fixes errors like:
error: expected identifier or '(' before '#pragma'
106 |SEC("cgroup/bind6")| ^~~error: expected '=', ',', ';', 'asm' or '
__attribute__' before '#pragma'114 | char _license[] SEC("license") = "GPL"; | ^~~Signed-off-by James Hilliard <[email protected]>---
Changes v1 -> v2:
- replace typeof with__typeof__instead of changing pragma macros--- tools/lib/bpf/bpf_core_read.h | 16 ++++++++-------- tools/lib/bpf/bpf_helpers.h | 4 ++-- tools/lib/bpf/bpf_tracing.h | 24 ++++++++++++------------ tools/lib/bpf/btf.h | 4 ++-- tools/lib/bpf/libbpf_internal.h | 6 +++--- tools/lib/bpf/usdt.bpf.h | 6 +++--- tools/lib/bpf/xsk.h | 12 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-)tools/lib/bpf/bpf_core_read.h +0
-0
tools/lib/bpf/bpf_core_read.h enum bpf_enum_value_kind { · line 117
Quoted 8 lines
tools/lib/bpf/bpf_core_read.h +1
-1@@ -111,7 +111,7 @@ enum bpf_enum_value_kind { })#define ___bpf_field_ref1 (field) (field) -#define ___bpf_field_ref2 (type, field) (((typeof(type) *)0)->field) +#define ___bpf_field_ref2 (type, field) (((__typeof__(type) *)0)->field) #define ___bpf_field_ref(args...) \ ___bpf_apply(___bpf_field_ref, ___bpf_narg(args))(args)
Can't we just add the below?
#ifndef typeof
# define typeof __typeof__ #endif
Thanks,
Daniel
Quoted 46 lines · Daniel Borkmann
Hi James,
Quoted 31 lines · James Hilliard
It seems the gcc preprocessor breaks when typeof is used with macros.
Fixes errors like:
error: expected identifier or '(' before '#pragma'
106 |SEC("cgroup/bind6")| ^~~error: expected '=', ',', ';', 'asm' or '
__attribute__' before '#pragma'114 | char _license[] SEC("license") = "GPL"; | ^~~Signed-off-by James Hilliard <[email protected]>---
Changes v1 -> v2:
- replace typeof with__typeof__instead of changing pragma macros--- tools/lib/bpf/bpf_core_read.h | 16 ++++++++-------- tools/lib/bpf/bpf_helpers.h | 4 ++-- tools/lib/bpf/bpf_tracing.h | 24 ++++++++++++------------ tools/lib/bpf/btf.h | 4 ++-- tools/lib/bpf/libbpf_internal.h | 6 +++--- tools/lib/bpf/usdt.bpf.h | 6 +++--- tools/lib/bpf/xsk.h | 12 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-)tools/lib/bpf/bpf_core_read.h +0
-0tools/lib/bpf/bpf_core_read.h enum bpf_enum_value_kind { · line 117
Quoted 8 lines
tools/lib/bpf/bpf_core_read.h +1
-1@@ -111,7 +111,7 @@ enum bpf_enum_value_kind { })#define ___bpf_field_ref1 (field) (field) -#define ___bpf_field_ref2 (type, field) (((typeof(type) *)0)->field) +#define ___bpf_field_ref2 (type, field) (((__typeof__(type) *)0)->field) #define ___bpf_field_ref(args...) \ ___bpf_apply(___bpf_field_ref, ___bpf_narg(args))(args)Can't we just add the below?
Quoted 3 lines
#ifndef typeof
# define typeof __typeof__ #endif
From what I can tell it's not actually missing, but rather is preprocessed differently
as the errors seem to be macro related.
I did also find this change which seems related:
https://github.com/torvalds/linux/commit/8faf7fc597d59b142af41ddd4a2d59485f75f88a
Quoted 3 lines
Thanks,
Daniel
Daniel Borkmann
maintainerQuoted 44 lines · James Hilliard
Quoted 43 lines · Daniel Borkmann
Quoted 31 lines · James Hilliard
It seems the gcc preprocessor breaks when typeof is used with macros.
Fixes errors like:
error: expected identifier or '(' before '#pragma'106 | SEC("cgroup/bind6") | ^~~error: expected '=', ',', ';', 'asm' or '
__attribute__' before '#pragma'114 | char _license[] SEC("license") = "GPL"; | ^~~Signed-off-by James Hilliard <[email protected]>---
Changes v1 -> v2:
- replace typeof with__typeof__instead of changing pragma macros--- tools/lib/bpf/bpf_core_read.h | 16 ++++++++-------- tools/lib/bpf/bpf_helpers.h | 4 ++-- tools/lib/bpf/bpf_tracing.h | 24 ++++++++++++------------ tools/lib/bpf/btf.h | 4 ++-- tools/lib/bpf/libbpf_internal.h | 6 +++--- tools/lib/bpf/usdt.bpf.h | 6 +++--- tools/lib/bpf/xsk.h | 12 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-)tools/lib/bpf/bpf_core_read.h +0
-0tools/lib/bpf/bpf_core_read.h enum bpf_enum_value_kind { · line 117
Quoted 8 lines
tools/lib/bpf/bpf_core_read.h +1
-1@@ -111,7 +111,7 @@ enum bpf_enum_value_kind { })#define ___bpf_field_ref1 (field) (field) -#define ___bpf_field_ref2 (type, field) (((typeof(type) *)0)->field) +#define ___bpf_field_ref2 (type, field) (((__typeof__(type) *)0)->field) #define ___bpf_field_ref(args...) \ ___bpf_apply(___bpf_field_ref, ___bpf_narg(args))(args)Can't we just add the below?
Quoted 7 lines
Quoted 3 lines
#ifndef typeof
# define typeof __typeof__ #endifFrom what I can tell it's not actually missing, but rather is
preprocessed differently
as the errors seem to be macro related.
Are you saying that the above suggestion wouldn't work? Do you have some more details? I'm mainly wondering if there's a way where we could prevent letting typeof() usage slip through in future given from kernel side people are used to it.
Quoted 6 lines
I did also find this change which seems related:
https://github.com/torvalds/linux/commit/8faf7fc597d59b142af41ddd4a2d59485f75f88aQuoted 3 lines
Thanks,
Daniel
Quoted 46 lines · Daniel Borkmann
Quoted 44 lines · James Hilliard
Quoted 43 lines · Daniel Borkmann
Quoted 31 lines · James Hilliard
It seems the gcc preprocessor breaks when typeof is used with macros.
Fixes errors like:
error: expected identifier or '(' before '#pragma'106 | SEC("cgroup/bind6") | ^~~error: expected '=', ',', ';', 'asm' or '
__attribute__' before '#pragma'114 | char _license[] SEC("license") = "GPL"; | ^~~Signed-off-by James Hilliard <[email protected]>---
Changes v1 -> v2:
- replace typeof with__typeof__instead of changing pragma macros--- tools/lib/bpf/bpf_core_read.h | 16 ++++++++-------- tools/lib/bpf/bpf_helpers.h | 4 ++-- tools/lib/bpf/bpf_tracing.h | 24 ++++++++++++------------ tools/lib/bpf/btf.h | 4 ++-- tools/lib/bpf/libbpf_internal.h | 6 +++--- tools/lib/bpf/usdt.bpf.h | 6 +++--- tools/lib/bpf/xsk.h | 12 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-)tools/lib/bpf/bpf_core_read.h +0
-0tools/lib/bpf/bpf_core_read.h enum bpf_enum_value_kind { · line 117
Quoted 8 lines
tools/lib/bpf/bpf_core_read.h +1
-1@@ -111,7 +111,7 @@ enum bpf_enum_value_kind { })#define ___bpf_field_ref1 (field) (field) -#define ___bpf_field_ref2 (type, field) (((typeof(type) *)0)->field) +#define ___bpf_field_ref2 (type, field) (((__typeof__(type) *)0)->field) #define ___bpf_field_ref(args...) \ ___bpf_apply(___bpf_field_ref, ___bpf_narg(args))(args)Can't we just add the below?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
#ifndef typeof
# define typeof __typeof__ #endif
Ok, looks like this does appear to work, although just switching to __typeof__ may be preferable as it should work everywhere.
Quoted 9 lines
Quoted 4 lines
From what I can tell it's not actually missing, but rather is
preprocessed differently
as the errors seem to be macro related.Are you saying that the above suggestion wouldn't work? Do you have some more details? I'm mainly wondering if there's a way where we could prevent letting
typeof()usage slip through in future given from kernel side people are used to it.
I think my build env was using stale headers, I think I figured out what's going on,
the typeof issue is triggered by building with -std=c17, the macro issue is unrelated
and limited to the SEC macro it would appear.
I suppose running builds with -std=c17 would prevent typeof() usage from slipping through.
Quoted 8 lines
Quoted 7 lines
I did also find this change which seems related:
https://github.com/torvalds/linux/commit/8faf7fc597d59b142af41ddd4a2d59485f75f88aQuoted 3 lines
Thanks,
Daniel