Avoid size mismatches in skeletons
v3 cover Avoid size mismatches in skeletons
As reported in [0], kernel and userspace can sometimes disagree on the size of a type. This leads to trouble when userspace maps the memory of a bpf program and reads/writes to it assuming a different memory layout.
With this change, the skeletons now contain size asserts to ensure the types in userspace are compatible in size with the types in the bpf program. In particular, we emit asserts for all top-level fields in the data/rodata/bss/etc structs, but not recursively for the individual members inside - this strikes a compromise between diagnostics precision and still catching all possible size mismatches.
The generated asserts are contained within a skeleton__type_asserts function at the end of the (l)skel.h like so:
#ifdef __cplusplus
#define _Static_assert static_assert
#endif
__attribute__((unused)) static void
atomics_lskel__type_asserts(struct atomics_lskel *s)
{
_Static_assert(sizeof(s->data->skip_tests) == 1, "unexpected size of 'skip_tests'");
_Static_assert(sizeof(s->data->add64_value) == 8, "unexpected size of 'add64_value'");
...
}
#ifdef __cplusplus
#undef _Static_assert
#endifv2 -> v3:
- group all static asserts in one function at the end of the file
- only use macros in C++ mode
v1 -> v2:
- drop the stdint approach in favor of static asserts right after the structs
Delyan Kratunov (1):
bpftool: bpf skeletons assert type sizes
tools/bpf/bpftool/gen.c | 134 +++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 22 deletions(-)
--
2.34.1
PATCH v3 1/1 bpftool: bpf skeletons assert type sizes
When emitting type declarations in skeletons, bpftool will now also emit static assertions on the size of the data/bss/rodata/etc fields. This ensures that in situations where userspace and kernel types have the same name but differ in size we do not silently produce incorrect results but instead break the build.
This was reported in [1] and as expected the repro in [2] fails to build on the new size assert after this change.
[1]: Closes: https://github.com/libbpf/libbpf/issues/433
[2]: https://github.com/fuweid/iovisor-bcc-pr-3777
--- tools/bpf/bpftool/gen.c | 134 +++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 22 deletions(-)
tools/bpf/bpftool/gen.c +112 -22
@@ -208,15 +208,38 @@ static int codegen_datasec_def(struct bpf_object *obj,return 0 ; } +static const struct btf_type *find_type_for_map (struct bpf_object *obj, +const char *map_ident) +{ +struct btf *btf =bpf_object__btf (obj); +int n =btf__type_cnt (btf), i; +char sec_ident[256 ]; + +for (i =1 ; i < n; i++) { +const struct btf_type *t =btf__type_by_id (btf, i); +const char *name; + +if (!btf_is_datasec (t)) +continue ; + + name =btf__str_by_offset (btf, t->name_off); +if (!get_datasec_ident (name, sec_ident,sizeof (sec_ident))) +continue ; + +if (strcmp (sec_ident, map_ident) ==0 ) +return t; + } +return NULL ; +} +static int codegen_datasecs (struct bpf_object *obj,const char *obj_name) {struct btf *btf =bpf_object__btf (obj); -int n =btf__type_cnt (btf);struct btf_dump *d;struct bpf_map *map;const struct btf_type *sec; -char sec_ident[256 ], map_ident[256 ]; -int i, err =0 ; +char map_ident[256 ]; +int err =0 ; d =btf_dump__new (btf, codegen_btf_dump_printf,NULL ,NULL ); err =libbpf_get_error (d);
@@ -233,23 +256,7 @@ static int codegen_datasecs(struct bpf_object *obj, const char *obj_name)if (!get_map_ident (map, map_ident,sizeof (map_ident)))continue ; - sec =NULL ; -for (i =1 ; i < n; i++) { -const struct btf_type *t =btf__type_by_id (btf, i); -const char *name; - -if (!btf_is_datasec (t)) -continue ; - - name =btf__str_by_offset (btf, t->name_off); -if (!get_datasec_ident (name, sec_ident,sizeof (sec_ident))) -continue ; - -if (strcmp (sec_ident, map_ident) ==0 ) { - sec = t; -break ; - } - } + sec =find_type_for_map (obj, map_ident);/* In some cases (e.g., sections like .rodata.cst16 containing * compiler allocated string constants only) there will be
@@ -362,6 +369,81 @@ static size_t bpf_map_mmap_sz(const struct bpf_map *map)return map_sz; } +/* Emit type size asserts for all top-level fields in memory-mapped internal maps. +*/ +static void codegen_asserts (struct bpf_object *obj,const char *obj_name) +{ +struct btf *btf =bpf_object__btf (obj); +struct bpf_map *map; +struct btf_var_secinfo *sec_var; +int i, vlen; +const struct btf_type *sec; +char map_ident[256 ], var_ident[256 ]; + +codegen ("\ +\n\ +\n\ +#ifdef __cplusplus \n\ +#define _Static_assert static_assert \n\ +#endif \n\ +\n\ +__attribute__((unused)) static void \n\ +%1$s__type_asserts(struct %1$s *s) \n\ +{ \n\ +" , obj_name); + +bpf_object__for_each_map (map, obj) { +if (!bpf_map__is_internal (map)) +continue ; +if (!(bpf_map__map_flags (map) &BPF_F_MMAPABLE )) +continue ; +if (!get_map_ident (map, map_ident,sizeof (map_ident))) +continue ; + + sec =find_type_for_map (obj, map_ident); + +if (!sec) { +/* best effort, couldn't find the type for this map */ +continue ; + } + + sec_var =btf_var_secinfos (sec); + vlen =btf_vlen (sec); + +for (i =0 ; i < vlen; i++, sec_var++) { +const struct btf_type *var =btf__type_by_id (btf, sec_var->type); +const char *var_name =btf__name_by_offset (btf, var->name_off); +__u32 var_type_id = var->type; +__s64 var_size =btf__resolve_size (btf, var_type_id); + +if (var_size <0 ) +continue ; + +/* static variables are not exposed through BPF skeleton */ +if (btf_var (var)->linkage ==BTF_VAR_STATIC ) +continue ; + + var_ident[0 ] ='\0' ; +strncat (var_ident, var_name,sizeof (var_ident) -1 ); +sanitize_identifier (var_ident); + +printf ("\t_Static_assert(" ); +printf ("sizeof(s->%1$s->%2$s) == %3$lld, " , + map_ident, var_ident, var_size); +printf ("\"unexpected size of '%1$s'\");\n" , var_ident); + } + } +codegen ("\ +\n\ +} \n\ +\n\ +#ifdef __cplusplus \n\ +#undef _Static_assert \n\ +#endif \n\ +" ); +} + +static void codegen_attach_detach (struct bpf_object *obj,const char *obj_name) {struct bpf_program *prog;
@@ -640,6 +722,8 @@ static int gen_trace(struct bpf_object *obj, const char *obj_name, const char *h } \n\ ", obj_name); + codegen_asserts(obj, obj_name); + codegen("\ \n\ \n\
@@ -1024,8 +1108,14 @@ static int do_skeleton(int argc, char **argv) \n\ \"; \n\} \n\ -\n\ -#endif /* %s */ \n\ + "); + +codegen_asserts (obj, obj_name); + +codegen ("\ +\n\ +\n\ +#endif /* %s */ \n\ " , header_guard); err =0 ;
Signature · 1 line
2.34.1
Re: [PATCH bpf-next v3 1/1] bpftool: bpf skeletons assert type sizes
Quoted 7 lines · Delyan Kratunov
When emitting type declarations in skeletons, bpftool will now also emit static assertions on the size of the data/bss/rodata/etc fields. This ensures that in situations where userspace and kernel types have the same name but differ in size we do not silently produce incorrect results but instead break the build.
Quoted 8 lines
This was reported in [1] and as expected the repro in [2] fails to build on the new size assert after this change.
[1]: Closes: https://github.com/libbpf/libbpf/issues/433
[2]: https://github.com/fuweid/iovisor-bcc-pr-3777Signed-off-by Delyan Kratunov <[email protected]>---
LGTM with a trivial styling nits. But this doesn't apply cleanly to bpf-next (see [0]). Can you please rebase and resend. Also for single-patch submissions we don't require cover letter, to please just put all the description into one patch without cover letter.
[0] https://github.com/kernel-patches/bpf/pull/2563#issuecomment-1040929960
Quoted 2 lines
tools/bpf/bpftool/gen.c | 134 +++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 22 deletions(-)
[...]
tools/bpf/bpftool/gen.c static size_t bpf_map_mmap_sz(const struct bpf_map *map) · line 404
Quoted 11 lines
tools/bpf/bpftool/gen.c +11
-0+ +bpf_object__for_each_map (map, obj) { +if (!bpf_map__is_internal (map)) +continue ; +if (!(bpf_map__map_flags (map) &BPF_F_MMAPABLE )) +continue ; +if (!get_map_ident (map, map_ident,sizeof (map_ident))) +continue ; + + sec =find_type_for_map (obj, map_ident); +
nit: unnecessary empty line between assignment and "error checking"
Quoted 19 lines
tools/bpf/bpftool/gen.c +19
-0+if (!sec) { +/* best effort, couldn't find the type for this map */ +continue ; + } + + sec_var =btf_var_secinfos (sec); + vlen =btf_vlen (sec); + +for (i =0 ; i < vlen; i++, sec_var++) { +const struct btf_type *var =btf__type_by_id (btf, sec_var->type); +const char *var_name =btf__name_by_offset (btf, var->name_off); +__u32 var_type_id = var->type; +__s64 var_size =btf__resolve_size (btf, var_type_id); + +if (var_size <0 ) +continue ; + +/* static variables are not exposed through BPF skeleton */ +if (btf_var (var)->linkage ==BTF_VAR_STATIC )
tools/bpf/bpftool/gen.c static size_t bpf_map_mmap_sz(const struct bpf_map *map) · line 433
Quoted 10 lines
tools/bpf/bpftool/gen.c +10
-0+continue ; + + var_ident[0 ] ='\0' ; +strncat (var_ident, var_name,sizeof (var_ident) -1 ); +sanitize_identifier (var_ident); + +printf ("\t_Static_assert(" ); +printf ("sizeof(s->%1$s->%2$s) == %3$lld, " , + map_ident, var_ident, var_size); +printf ("\"unexpected size of '%1$s'\");\n" , var_ident);
nit: I'd keep this as one printf, it makes it a bit easier to follow.
Quoted 2 lines
(quoted diff) +2
-0+ } + }
[...]
Re: [PATCH bpf-next v3 1/1] bpftool: bpf skeletons assert type sizes
Quoted 75 lines · Andrii Nakryiko
Quoted 7 lines · Delyan Kratunov
When emitting type declarations in skeletons, bpftool will now also emit static assertions on the size of the data/bss/rodata/etc fields. This ensures that in situations where userspace and kernel types have the same name but differ in size we do not silently produce incorrect results but instead break the build.
Quoted 8 lines
This was reported in [1] and as expected the repro in [2] fails to build on the new size assert after this change.
[1]: Closes: https://github.com/libbpf/libbpf/issues/433
[2]: https://github.com/fuweid/iovisor-bcc-pr-3777Signed-off-by Delyan Kratunov <[email protected]>---
LGTM with a trivial styling nits. But this doesn't apply cleanly to bpf-next (see [0]). Can you please rebase and resend. Also for single-patch submissions we don't require cover letter, to please just put all the description into one patch without cover letter.
[0] https://github.com/kernel-patches/bpf/pull/2563#issuecomment-1040929960
Quoted 2 lines
tools/bpf/bpftool/gen.c | 134 +++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 22 deletions(-)[...]
tools/bpf/bpftool/gen.c static size_t bpf_map_mmap_sz(const struct bpf_map *map) · line 404
Quoted 11 lines
tools/bpf/bpftool/gen.c +11
-0+ +bpf_object__for_each_map (map, obj) { +if (!bpf_map__is_internal (map)) +continue ; +if (!(bpf_map__map_flags (map) &BPF_F_MMAPABLE )) +continue ; +if (!get_map_ident (map, map_ident,sizeof (map_ident))) +continue ; + + sec =find_type_for_map (obj, map_ident); +nit: unnecessary empty line between assignment and "error checking"
Quoted 19 lines
tools/bpf/bpftool/gen.c +19
-0+if (!sec) { +/* best effort, couldn't find the type for this map */ +continue ; + } + + sec_var =btf_var_secinfos (sec); + vlen =btf_vlen (sec); + +for (i =0 ; i < vlen; i++, sec_var++) { +const struct btf_type *var =btf__type_by_id (btf, sec_var->type); +const char *var_name =btf__name_by_offset (btf, var->name_off); +__u32 var_type_id = var->type; +__s64 var_size =btf__resolve_size (btf, var_type_id); + +if (var_size <0 ) +continue ; + +/* static variables are not exposed through BPF skeleton */ +if (btf_var (var)->linkage ==BTF_VAR_STATIC )tools/bpf/bpftool/gen.c static size_t bpf_map_mmap_sz(const struct bpf_map *map) · line 433
Quoted 10 lines
tools/bpf/bpftool/gen.c +10
-0+continue ; + + var_ident[0 ] ='\0' ; +strncat (var_ident, var_name,sizeof (var_ident) -1 ); +sanitize_identifier (var_ident); + +printf ("\t_Static_assert(" ); +printf ("sizeof(s->%1$s->%2$s) == %3$lld, " , + map_ident, var_ident, var_size); +printf ("\"unexpected size of '%1$s'\");\n" , var_ident);nit: I'd keep this as one printf, it makes it a bit easier to follow.
Quoted 4 lines
Quoted 2 lines
(quoted diff) +2
-0+ } + }[...]
Feel free to add: