[ELF] Treat dynamic tag values as virtual addresses instead of offsets

[wolfgangp]

Summary

Fixes PR41832.
The ELF gABI requires the tag values of DT_REL, DT_RELA and DT_JMPREL to be treated as virtual addresses (d_ptr). They were treated as offsets.

[jhenderson]

test/tools/llvm-objdump/X86/elf-dynamic-relocs.test

1 ↗

(On Diff #203414)

Move this line to immediately before the rest of the YAML.

2–4 ↗

(On Diff #203414)

In many of the newer tests in the llvm tools, we've been using '##' to distinguish comments from RUN/CHECK commands. It might be nice if you added those.

9 ↗

(On Diff #203414)

As this is the first and only test for --dynamic-relocs, could you check the full output here (including relevant headers etc if any), please.

Also, you should make your checks CHECK-NEXT, and add something to show that there are no other relocations printed (in case later lines produce garbage or similar). This might be most easily achieved by doing an --implicit-check-not=R_X86 or similar.

11 ↗

(On Diff #203414)

RELATIVE + symbol doesn't make sense. Probably just change the type to something else (e.g. R_X86_64_NONE).

27 ↗

(On Diff #203414)

Nit, this is formatted differently to [SHF_ALLOC] above (i.e. spacing is different). Please could you make it consistent.

29 ↗

(On Diff #203414)

I'm not sure an AddressAlign of 0x1000 makes sense if the address is only aligned to 0x100. Not sure it matters that much, but it might be nice to avoid surprises. Same comment applies in other places later on.

47 ↗

(On Diff #203414)

See above re. formatting.

50 ↗

(On Diff #203414)

Nit: double-space between '2' and '#'

[wolfgangp]

Addressed review comments as suggested.

[jhenderson]

LGTM.

llvm/trunk/include/llvm/Object/ELFObjectFile.h

for (const Elf_Shdr &Sec : *SectionsOrErr) {
     for (; Dynamic->d_tag != ELF::DT_NULL; Dynamic++) {
       if (Dynamic->d_tag == ELF::DT_REL || Dynamic->d_tag == ELF::DT_RELA ||
           Dynamic->d_tag == ELF::DT_JMPREL) {
         Offsets.push_back(Dynamic->d_un.d_val);
       }
     }
   }
   for (const Elf_Shdr &Sec : *SectionsOrErr) {
-    if (is_contained(Offsets, Sec.sh_offset))
+    if (is_contained(Offsets, Sec.sh_addr))
       Res.emplace_back(toDRI(&Sec), this);
   }
   return Res;
 }
 
 template <class ELFT>
 bool ELFObjectFile<ELFT>::isSectionVirtual(DataRefImpl Sec) const {
   return getSection(Sec)->sh_type == ELF::SHT_NOBITS;

llvm/trunk/test/tools/llvm-objdump/X86/elf-dynamic-relocs.test

+## Show that llvm-objdump can dump dynamic relocations.
+## Specifically, we are checking that the tags DT_RELA, DT_REL and DT_JMPREL
+## properly identify relocation tables.
+
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-objdump --dynamic-reloc %t | FileCheck --implicit-check-not=R_X86 %s
+
+# CHECK:      file format ELF64-x86-64
+# CHECK:      DYNAMIC RELOCATION RECORDS
+# CHECK-NEXT: 0000000000000000 R_X86_64_RELATIVE *ABS*
+# CHECK-NEXT: 0000000000000000 R_X86_64_JUMP_SLOT bar
+# CHECK-NEXT: 0000000000000008 R_X86_64_NONE foo
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64
+Sections:
+  - Name:         .foo
+    Type:         SHT_PROGBITS
+    Size:         16
+    Flags:        [SHF_ALLOC]
+    Address:      0x100000
+    AddressAlign: 0x100
+  - Name:         .got.plt
+    Type:         SHT_PROGBITS
+    Flags:        [SHF_WRITE, SHF_ALLOC]
+    Address:      0x100100
+    AddressAlign: 0x1000
+  - Name:         .rela.dyn
+    Type:         SHT_RELA
+    Address:      0x100200
+    AddressAlign: 0x100
+    Info:         .foo
+    Link:         .dynsym
+    Flags:        [SHF_ALLOC]
+    Relocations:
+      - Offset: 0
+        Type:   R_X86_64_RELATIVE
+        Addend: 0
+  - Name:         .rela.plt
+    Type:         SHT_RELA
+    Address:      0x100300
+    AddressAlign: 0x100
+    Info:         .got.plt
+    Link:         .dynsym
+    Flags:        [SHF_ALLOC]
+    Relocations:
+      - Offset: 0
+        Symbol: 2 # bar
+        Type:   R_X86_64_JUMP_SLOT
+  - Name:         .rel.dyn
+    Type:         SHT_REL
+    Address:      0x100400
+    AddressAlign: 0x100
+    Info:         .foo
+    Link:         .dynsym
+    Flags:        [SHF_ALLOC]
+    Relocations:
+      - Offset: 8
+        Symbol: 1 # foo
+        Type:   R_X86_64_NONE
+  - Name:         .dynamic
+    Type:         SHT_DYNAMIC
+    Address:      0x100500
+    AddressAlign: 0x100
+    Link:         .dynstr
+    Flags:        [SHF_ALLOC]
+    Entries:
+      - Tag: DT_RELA
+        Value: 0x100200
+      - Tag: DT_RELASZ
+        Value: 24
+      - Tag: DT_RELAENT
+        Value: 24
+      - Tag: DT_JMPREL
+        Value: 0x100300
+      - Tag: DT_PLTREL
+        Value: 7
+      - Tag: DT_PLTRELSZ
+        Value: 24
+      - Tag: DT_REL
+        Value: 0x100400
+      - Tag: DT_RELSZ
+        Value: 16
+      - Tag: DT_RELENT
+        Value: 16
+      - Tag: DT_NULL
+        Value: 0
+ProgramHeaders:
+  - Type:     PT_LOAD
+    VAddr:    0x100000
+    Align:    0x100
+    Sections:
+      - Section: .foo
+      - Section: .rela.dyn
+      - Section: .rela.plt
+      - Section: .rel.dyn
+      - Section: .dynamic
+  - Type:     PT_DYNAMIC
+    VAddr:    0x100500
+    Align:    0x100
+    Sections:
+      - Section: .dynamic
+DynamicSymbols:
+  - Name:    foo
+    Section: .foo
+    Binding: STB_GLOBAL
+  - Name:    bar
+    Type:    STT_FUNC
+    Binding: STB_GLOBAL