Commit 66fe3324 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

libbpf: Make gen_loader data aligned. 



Align gen_loader data to 8 byte boundary to make sure union bpf_attr,
bpf_insns and other structs are aligned.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210927145941.1383001-9-memxor@gmail.com
parent e31eec77

tools/lib/bpf/gen_loader.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

}