History

tools/libbpf: handle issues with bpf ELF objects containing .eh_frames

V3: More generic skipping of relo-section (suggested by Daniel) If clang >= 4.0.1 is missing the option '-target bpf', it will cause llc/llvm to create two ELF sections for "Exception Frames", with section names '.eh_frame' and '.rel.eh_frame'. The BPF ELF loader library libbpf fails when loading files with these sections. The other in-kernel BPF ELF loader in samples/bpf/bpf_load.c, handle this gracefully. And iproute2 loader also seems to work with these "eh" sections. The issue in libbpf is caused by bpf_object__elf_collect() skipping some sections, and later when performing relocation it will be pointing to a skipped section, as these sections cannot be found by bpf_object__find_prog_by_idx() in bpf_object__collect_reloc(). This is a general issue that also occurs for other sections, like debug sections which are also skipped and can have relo section. As suggested by Daniel. To avoid keeping state about all skipped sections, instead perform a direct qlookup in the ELF object. Lookup the section that the relo-section points to and check if it contains executable machine instructions (denoted by the sh_flags SHF_EXECINSTR). Use this check to also skip irrelevant relo-sections. Note, for samples/bpf/ the '-target bpf' parameter to clang cannot be used due to incompatibility with asm embedded headers, that some of the samples include. This is explained in more details by Yonghong Song in bpf_devel_QA.

Jesper Dangaard Brouer committed 8 years ago

Commit e3d91b01 parent f09b2e31 file · +26 −0Browse files

Unified · Split

tools/lib/bpf/libbpf.c+26−0
@@ -742,6 +742,24 @@ bpf_object__init_maps(struct bpf_object *obj) · 741 unmodified lines
742 return 0;742 return 0;
743}743}
744 744
745static bool section_have_execinstr(struct bpf_object *obj, int idx)
746{
747 Elf_Scn *scn;
748 GElf_Shdr sh;
749
750 scn = elf_getscn(obj->efile.elf, idx);
751 if (!scn)
752 return false;
753
754 if (gelf_getshdr(scn, &sh) != &sh)
755 return false;
756
757 if (sh.sh_flags & SHF_EXECINSTR)
758 return true;
759
760 return false;
761}
762
745static int bpf_object__elf_collect(struct bpf_object *obj)763static int bpf_object__elf_collect(struct bpf_object *obj)
746{764{
747 Elf *elf = obj->efile.elf;765 Elf *elf = obj->efile.elf;
@@ -825,6 +843,14 @@ static int bpf_object__elf_collect(struct bpf_object *obj) · 77 unmodified lines
825 } else if (sh.sh_type == SHT_REL) {843 } else if (sh.sh_type == SHT_REL) {
826 void *reloc = obj->efile.reloc;844 void *reloc = obj->efile.reloc;
827 int nr_reloc = obj->efile.nr_reloc + 1;845 int nr_reloc = obj->efile.nr_reloc + 1;
846 int sec = sh.sh_info; /* points to other section */
847
848 /* Only do relo for section with exec instructions */
849 if (!section_have_execinstr(obj, sec)) {
850 pr_debug("skip relo %s(%d) for section(%d)\n",
851 name, idx, sec);
852 continue;
853 }
828 854
829 reloc = realloc(reloc,855 reloc = realloc(reloc,
830 sizeof(*obj->efile.reloc) * nr_reloc);856 sizeof(*obj->efile.reloc) * nr_reloc);