Thread (19 messages) 19 messages, 3 authors, 2021-09-30

Re: [PATCH bpf-next v5 08/12] libbpf: Make gen_loader data aligned.

flat view

From: Alexei Starovoitov <hidden>
Date: 2021-09-29 20:51:07
Also in: bpf

On Mon, Sep 27, 2021 at 8:00 AM Kumar Kartikeya Dwivedi
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help