| Message ID | 20210927145941.1383001-9-memxor@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | Support kernel module function calls from eBPF | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for bpf-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 2 maintainers not CCed: kpsingh@kernel.org john.fastabend@gmail.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 25 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| bpf/vmtest-bpf-next | success | VM_Test |
| bpf/vmtest-bpf-next-PR | success | PR summary |
On Mon, Sep 27, 2021 at 8:00 AM Kumar Kartikeya Dwivedi <memxor@gmail.com> wrote: > > From: Alexei Starovoitov <ast@kernel.org> > > Align gen_loader data to 8 byte boundary to make sure union bpf_attr, > bpf_insns and other structs are aligned. > > Signed-off-by: Alexei Starovoitov <ast@kernel.org> > --- > tools/lib/bpf/gen_loader.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tools/lib/bpf/gen_loader.c b/tools/lib/bpf/gen_loader.c > index 8df718a6b142..80087b13877f 100644 > --- a/tools/lib/bpf/gen_loader.c > +++ b/tools/lib/bpf/gen_loader.c > @@ -5,6 +5,7 @@ > #include <string.h> > #include <errno.h> > #include <linux/filter.h> > +#include <sys/param.h> > #include "btf.h" > #include "bpf.h" > #include "libbpf.h" > @@ -135,13 +136,17 @@ void bpf_gen__init(struct bpf_gen *gen, int log_level) > > static int add_data(struct bpf_gen *gen, const void *data, __u32 size) > { > + __u32 size8 = roundup(size, 8); > + __u64 zero = 0; > void *prev; > > - if (realloc_data_buf(gen, size)) > + if (realloc_data_buf(gen, size8)) > return 0; > prev = gen->data_cur; > memcpy(gen->data_cur, data, size); > gen->data_cur += size; > + memcpy(gen->data_cur, &zero, size8 - size); > + gen->data_cur += size8 - size; Since we both need this patch, I pushed it to bpf-next to simplify rebasing.
diff --git a/tools/lib/bpf/gen_loader.c b/tools/lib/bpf/gen_loader.c index 8df718a6b142..80087b13877f 100644 --- a/tools/lib/bpf/gen_loader.c +++ b/tools/lib/bpf/gen_loader.c @@ -5,6 +5,7 @@ #include <string.h> #include <errno.h> #include <linux/filter.h> +#include <sys/param.h> #include "btf.h" #include "bpf.h" #include "libbpf.h" @@ -135,13 +136,17 @@ void bpf_gen__init(struct bpf_gen *gen, int log_level) static int add_data(struct bpf_gen *gen, const void *data, __u32 size) { + __u32 size8 = roundup(size, 8); + __u64 zero = 0; void *prev; - if (realloc_data_buf(gen, size)) + if (realloc_data_buf(gen, size8)) return 0; prev = gen->data_cur; memcpy(gen->data_cur, data, size); gen->data_cur += size; + memcpy(gen->data_cur, &zero, size8 - size); + gen->data_cur += size8 - size; return prev - gen->data_start; }