bpftool: Align output skeleton ELF code
PATCH 1/1 bpftool: Align output skeleton ELF code
libbpf accesses the ELF data requiring at least 8 byte alignment, however, the data is generated into a C string that doesn't guarantee alignment. Fix this by assigning to an aligned char array, use sizeof on the array, less one for the \0 terminator.
--- tools/bpf/bpftool/gen.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
tools/bpf/bpftool/gen.c +9 -6
@@ -1209,7 +1209,7 @@ static int do_skeleton(int argc, char **argv) codegen("\ \n\ \n\ - s->data = (void *)%2$s__elf_bytes(&s->data_sz); \n\ + s->data = (void *)%1$s__elf_bytes(&s->data_sz); \n\ \n\ obj->skeleton = s; \n\ return 0; \n\
@@ -1218,12 +1218,12 @@ static int do_skeleton(int argc, char **argv) return err; \n\ } \n\ \n\ - static inline const void *%2$s__elf_bytes(size_t *sz) \n\ + static inline const void *%1$s__elf_bytes(size_t *sz) \n\ { \n\ - *sz = %1$d; \n\ - return (const void *)\"\\ \n\ -" - , file_sz, obj_name); + static const char data[] __attribute__((__aligned__(8))) = \"\\\n\ +" , + obj_name + );/* embed contents of BPF object file */ print_hex (obj_data, file_sz);
@@ -1231,6 +1231,9 @@ static int do_skeleton(int argc, char **argv) codegen("\ \n\ \"; \n\ + \n\ + *sz = sizeof(data) - 1; \n\ + return (const void *)data; \n\ } \n\ \n\ #ifdef __cplusplus \n\
Signature · 1 line
2.42.0.582.g8ccd20d70d-goog
Quoted 8 lines · Ian Rogers
libbpf accesses the ELF data requiring at least 8 byte alignment, however, the data is generated into a C string that doesn't guarantee alignment. Fix this by assigning to an aligned char array, use sizeof on the array, less one for the \0 terminator.
Signed-off-by Ian Rogers <[email protected]>---
Perhaps this could have a fixes tag:
load" and "gen skeleton" command.")
The unaligned problem was seen in perf's offcpu code as well as bcc's libbpf_tools. I didn't see problems with map data and opts data, but inspection of the code shows they likely have the same issue. I was testing with -fsanitize=alignment and -fsanitize-undefined-trap-on-error.
Thanks,
Ian
Quoted 47 lines
tools/bpf/bpftool/gen.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)tools/bpf/bpftool/gen.c +9
-7@@ -1209,7 +1209,7 @@ static int do_skeleton(int argc, char **argv) codegen("\ \n\ \n\ - s->data = (void *)%2$s__elf_bytes(&s->data_sz); \n\ + s->data = (void *)%1$s__elf_bytes(&s->data_sz); \n\ \n\ obj->skeleton = s; \n\ return 0; \n\@@ -1218,12 +1218,12 @@ static int do_skeleton(int argc, char **argv) return err; \n\ } \n\ \n\ - static inline const void *%2$s__elf_bytes(size_t *sz) \n\ + static inline const void *%1$s__elf_bytes(size_t *sz) \n\ { \n\ - *sz = %1$d; \n\ - return (const void *)\"\\ \n\ -" - , file_sz, obj_name); + static const char data[] __attribute__((__aligned__(8))) = \"\\\n\ +" , + obj_name + );/* embed contents of BPF object file */ print_hex (obj_data, file_sz);@@ -1231,6 +1231,9 @@ static int do_skeleton(int argc, char **argv) codegen("\ \n\ \"; \n\ + \n\ + *sz = sizeof(data) - 1; \n\ + return (const void *)data; \n\ } \n\ \n\ #ifdef __cplusplus \n\ --2.42.0.582.g8ccd20d70d-goog
Alan Maguire
Reviewed-byQuoted 8 lines · Ian Rogers
Quoted 7 lines · Ian Rogers
libbpf accesses the ELF data requiring at least 8 byte alignment, however, the data is generated into a C string that doesn't guarantee alignment. Fix this by assigning to an aligned char array, use sizeof on the array, less one for the \0 terminator.
Signed-off-by Ian Rogers <[email protected]>
this looks like a great catch to me!
Quoted 6 lines
Quoted 1 line
---
Perhaps this could have a fixes tag:
Fixes d510296d331a ("bpftool: Use syscall/loader program in "progload" and "gen skeleton" command.")
Yep, or perhaps
skeleton's embedded ELF data")
Quoted 57 lines
The unaligned problem was seen in perf's offcpu code as well as bcc's
libbpf_tools. I didn't see problems with map data and opts data, but inspection of the code shows they likely have the same issue. I was testing with -fsanitize=alignment and -fsanitize-undefined-trap-on-error.Thanks,
IanQuoted 47 lines
tools/bpf/bpftool/gen.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)tools/bpf/bpftool/gen.c +9
-7@@ -1209,7 +1209,7 @@ static int do_skeleton(int argc, char **argv) codegen("\ \n\ \n\ - s->data = (void *)%2$s__elf_bytes(&s->data_sz); \n\ + s->data = (void *)%1$s__elf_bytes(&s->data_sz); \n\ \n\ obj->skeleton = s; \n\ return 0; \n\@@ -1218,12 +1218,12 @@ static int do_skeleton(int argc, char **argv) return err; \n\ } \n\ \n\ - static inline const void *%2$s__elf_bytes(size_t *sz) \n\ + static inline const void *%1$s__elf_bytes(size_t *sz) \n\ { \n\ - *sz = %1$d; \n\ - return (const void *)\"\\ \n\ -" - , file_sz, obj_name); + static const char data[] __attribute__((__aligned__(8))) = \"\\\n\ +" , + obj_name + );/* embed contents of BPF object file */ print_hex (obj_data, file_sz);@@ -1231,6 +1231,9 @@ static int do_skeleton(int argc, char **argv) codegen("\ \n\ \"; \n\ + \n\ + *sz = sizeof(data) - 1; \n\ + return (const void *)data; \n\ } \n\ \n\ #ifdef __cplusplus \n\ --2.42.0.582.g8ccd20d70d-goog