[PATCH] tools/lib/bpf: add pr_warn() to more -EINVAL cases

From: Sergei Trofimovich
Date: Thu Dec 07 2023 - 13:09:37 EST


Before the change on `i686-linux` `systemd` build failed as:

$ bpftool gen object src/core/bpf/socket_bind/socket-bind.bpf.o src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o
Error: failed to link 'src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o': Invalid argument (22)

After the change it fails as:

$ bpftool gen object src/core/bpf/socket_bind/socket-bind.bpf.o src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o
libbpf: ELF section #9 has inconsistent alignment in src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o
Error: failed to link 'src/core/bpf/socket_bind/socket-bind.bpf.unstripped.o': Invalid argument (22)

Now it's slightly easier to figure out what is wrong with an ELF file.

CC: Alexei Starovoitov <ast@xxxxxxxxxx>
CC: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
CC: Andrii Nakryiko <andrii@xxxxxxxxxx>
CC: Martin KaFai Lau <martin.lau@xxxxxxxxx>
CC: Song Liu <song@xxxxxxxxxx>
CC: Yonghong Song <yonghong.song@xxxxxxxxx>
CC: John Fastabend <john.fastabend@xxxxxxxxx>
CC: KP Singh <kpsingh@xxxxxxxxxx>
CC: Stanislav Fomichev <sdf@xxxxxxxxxx>
CC: Hao Luo <haoluo@xxxxxxxxxx>
CC: Jiri Olsa <jolsa@xxxxxxxxxx>
CC: bpf@xxxxxxxxxxxxxxx
Signed-off-by: Sergei Trofimovich <slyich@xxxxxxxxx>
---
tools/lib/bpf/linker.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c
index 5ced96d99f8c..71bb4916b762 100644
--- a/tools/lib/bpf/linker.c
+++ b/tools/lib/bpf/linker.c
@@ -719,13 +719,22 @@ static int linker_sanity_check_elf(struct src_obj *obj)
return -EINVAL;
}

- if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign))
+ if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign)) {
+ pr_warn("ELF section #%zu alignment is non pow-of-2 alignment in %s\n",
+ sec->sec_idx, obj->filename);
return -EINVAL;
- if (sec->shdr->sh_addralign != sec->data->d_align)
+ }
+ if (sec->shdr->sh_addralign != sec->data->d_align) {
+ pr_warn("ELF section #%zu has inconsistent alignment in %s\n",
+ sec->sec_idx, obj->filename);
return -EINVAL;
+ }

- if (sec->shdr->sh_size != sec->data->d_size)
+ if (sec->shdr->sh_size != sec->data->d_size) {
+ pr_warn("ELF section #%zu has inconsistent section size in %s\n",
+ sec->sec_idx, obj->filename);
return -EINVAL;
+ }

switch (sec->shdr->sh_type) {
case SHT_SYMTAB:
--
2.42.0