This is an archive of the discontinued LLVM Phabricator instance.

Differential D37369

[ELF] Set p_memsz to p_filesz when aligning the last segment to page boundary
ClosedPublic

Authored by phosek on Aug 31 2017, 7:33 PM.

Details

Reviewers
ruiu
Commits
rG7ab9f7be0ccb: [ELF] Set p_memsz to p_filesz when aligning the last segment to page boundary
rLLD312384: [ELF] Set p_memsz to p_filesz when aligning the last segment to page boundary
rL312384: [ELF] Set p_memsz to p_filesz when aligning the last segment to page boundary
Summary

p_filesz different from p_memsz is confusing some tools.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek created this revision.Aug 31 2017, 7:33 PM
Herald added subscribers: fedor.sergeev, javed.absar, emaste, jyknight. · View Herald TranscriptAug 31 2017, 7:33 PM
grimar added a subscriber: grimar.Sep 1 2017, 12:42 AM

Looks good. Minor nit.

ELF/Writer.cpp
1935

Looks unformatted.

grimar added inline comments.Sep 1 2017, 1:18 AM
ELF/Writer.cpp
1935

It is formatted. Sorry for noise,

ruiu accepted this revision.Sep 1 2017, 1:53 PM

LGTM

This revision is now accepted and ready to land.Sep 1 2017, 1:53 PM
Closed by commit rL312384: [ELF] Set p_memsz to p_filesz when aligning the last segment to page boundary (authored by phosek). · Explain WhySep 1 2017, 2:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
3 lines
test/
ELF/
2 lines
2 lines
2 lines
2 lines
2 lines
6 lines
2 lines

Diff 113504

ELF/Writer.cpp

Show First 20 Lines • Show All 1,925 Lines • ▼ Show 20 Lines for (PhdrEntry *P : Phdrs) {
if (P->p_type != PT_LOAD) if (P->p_type != PT_LOAD)
continue; continue;
if (P->p_flags & PF_X) if (P->p_flags & PF_X)
LastRX = P; LastRX = P;
else else
LastRX = nullptr; LastRX = nullptr;
} }
if (LastRX) if (LastRX)
LastRX->p_filesz = alignTo(LastRX->p_filesz, Target->PageSize); LastRX->p_memsz = LastRX->p_filesz =
alignTo(LastRX->p_filesz, Target->PageSize);
grimarUnsubmitted
Not Done
ReplyInline Actions

Looks unformatted.

grimar: Looks unformatted.
grimarUnsubmitted
Not Done
ReplyInline Actions

It is formatted. Sorry for noise,

grimar: It is formatted. Sorry for noise,
} }
// Write section contents to a mmap'ed file. // Write section contents to a mmap'ed file.
template <class ELFT> void Writer<ELFT>::writeSections() { template <class ELFT> void Writer<ELFT>::writeSections() {
uint8_t *Buf = Buffer->getBufferStart(); uint8_t *Buf = Buffer->getBufferStart();
// PPC64 needs to process relocations in the .opd section // PPC64 needs to process relocations in the .opd section
// before processing relocations in code-containing sections. // before processing relocations in code-containing sections.
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines

test/ELF/avoid-empty-program-headers.s

Show All 37 Lines
// CHECK-NEXT: Alignment: 4096 // CHECK-NEXT: Alignment: 4096
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK-NEXT: ProgramHeader { // CHECK-NEXT: ProgramHeader {
// CHECK-NEXT: Type: PT_LOAD (0x1) // CHECK-NEXT: Type: PT_LOAD (0x1)
// CHECK-NEXT: Offset: 0x1000 // CHECK-NEXT: Offset: 0x1000
// CHECK-NEXT: VirtualAddress: 0x201000 // CHECK-NEXT: VirtualAddress: 0x201000
// CHECK-NEXT: PhysicalAddress: 0x201000 // CHECK-NEXT: PhysicalAddress: 0x201000
// CHECK-NEXT: FileSize: 4096 // CHECK-NEXT: FileSize: 4096
// CHECK-NEXT: MemSize: 1 // CHECK-NEXT: MemSize: 4096
// CHECK-NEXT: Flags [ (0x5) // CHECK-NEXT: Flags [ (0x5)
// CHECK-NEXT: PF_R (0x4) // CHECK-NEXT: PF_R (0x4)
// CHECK-NEXT: PF_X (0x1) // CHECK-NEXT: PF_X (0x1)
// CHECK-NEXT: ] // CHECK-NEXT: ]
// CHECK-NEXT: Alignment: 4096 // CHECK-NEXT: Alignment: 4096
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK-NEXT: ProgramHeader { // CHECK-NEXT: ProgramHeader {
// CHECK-NEXT: Type: PT_TLS (0x7) // CHECK-NEXT: Type: PT_TLS (0x7)
Show All 24 Lines

test/ELF/basic-aarch64.s

Show First 20 Lines • Show All 180 Lines • ▼ Show 20 Lines
# CHECK-NEXT: Alignment: 65536 # CHECK-NEXT: Alignment: 65536
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Type: PT_LOAD (0x1)
# CHECK-NEXT: Offset: 0x1000 # CHECK-NEXT: Offset: 0x1000
# CHECK-NEXT: VirtualAddress: 0x20000 # CHECK-NEXT: VirtualAddress: 0x20000
# CHECK-NEXT: PhysicalAddress: 0x20000 # CHECK-NEXT: PhysicalAddress: 0x20000
# CHECK-NEXT: FileSize: 4096 # CHECK-NEXT: FileSize: 4096
# CHECK-NEXT: MemSize: 12 # CHECK-NEXT: MemSize: 4096
# CHECK-NEXT: Flags [ (0x5) # CHECK-NEXT: Flags [ (0x5)
# CHECK-NEXT: PF_R (0x4) # CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: PF_X (0x1) # CHECK-NEXT: PF_X (0x1)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 65536 # CHECK-NEXT: Alignment: 65536
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_GNU_STACK # CHECK-NEXT: Type: PT_GNU_STACK
Show All 12 Lines

test/ELF/basic-sparcv9.s

Show First 20 Lines • Show All 171 Lines • ▼ Show 20 Lines
# CHECK-NEXT: Alignment: 1048576 # CHECK-NEXT: Alignment: 1048576
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Type: PT_LOAD (0x1)
# CHECK-NEXT: Offset: 0x100000 # CHECK-NEXT: Offset: 0x100000
# CHECK-NEXT: VirtualAddress: 0x200000 # CHECK-NEXT: VirtualAddress: 0x200000
# CHECK-NEXT: PhysicalAddress: 0x200000 # CHECK-NEXT: PhysicalAddress: 0x200000
# CHECK-NEXT: FileSize: 8192 # CHECK-NEXT: FileSize: 8192
# CHECK-NEXT: MemSize: 12 # CHECK-NEXT: MemSize: 8192
# CHECK-NEXT: Flags [ (0x5) # CHECK-NEXT: Flags [ (0x5)
# CHECK-NEXT: PF_R (0x4) # CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: PF_X (0x1) # CHECK-NEXT: PF_X (0x1)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 1048576 # CHECK-NEXT: Alignment: 1048576
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_GNU_STACK # CHECK-NEXT: Type: PT_GNU_STACK
Show All 12 Lines

test/ELF/basic.s

Show First 20 Lines • Show All 173 Lines • ▼ Show 20 Lines
# CHECK-NEXT: Alignment: 4096 # CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Type: PT_LOAD (0x1)
# CHECK-NEXT: Offset: 0x1000 # CHECK-NEXT: Offset: 0x1000
# CHECK-NEXT: VirtualAddress: 0x201000 # CHECK-NEXT: VirtualAddress: 0x201000
# CHECK-NEXT: PhysicalAddress: 0x201000 # CHECK-NEXT: PhysicalAddress: 0x201000
# CHECK-NEXT: FileSize: 4096 # CHECK-NEXT: FileSize: 4096
# CHECK-NEXT: MemSize: 16 # CHECK-NEXT: MemSize: 4096
# CHECK-NEXT: Flags [ (0x5) # CHECK-NEXT: Flags [ (0x5)
# CHECK-NEXT: PF_R (0x4) # CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: PF_X (0x1) # CHECK-NEXT: PF_X (0x1)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 4096 # CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_GNU_STACK # CHECK-NEXT: Type: PT_GNU_STACK
▲ Show 20 Lines • Show All 64 Lines • Show Last 20 Lines

test/ELF/basic32.s

Show First 20 Lines • Show All 150 Lines • ▼ Show 20 Lines
# CHECK-NEXT: Alignment: 4096 # CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Type: PT_LOAD (0x1)
# CHECK-NEXT: Offset: 0x1000 # CHECK-NEXT: Offset: 0x1000
# CHECK-NEXT: VirtualAddress: 0x11000 # CHECK-NEXT: VirtualAddress: 0x11000
# CHECK-NEXT: PhysicalAddress: 0x11000 # CHECK-NEXT: PhysicalAddress: 0x11000
# CHECK-NEXT: FileSize: 4096 # CHECK-NEXT: FileSize: 4096
# CHECK-NEXT: MemSize: 12 # CHECK-NEXT: MemSize: 4096
# CHECK-NEXT: Flags [ (0x5) # CHECK-NEXT: Flags [ (0x5)
# CHECK-NEXT: PF_R (0x4) # CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: PF_X (0x1) # CHECK-NEXT: PF_X (0x1)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 4096 # CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_GNU_STACK # CHECK-NEXT: Type: PT_GNU_STACK
Show All 12 Lines

test/ELF/build-id.s

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines_start:
nop nop
.section .note.test, "a", @note .section .note.test, "a", @note
.quad 42 .quad 42
# DEFAULT: Contents of section .note.test: # DEFAULT: Contents of section .note.test:
# DEFAULT: Contents of section .note.gnu.build-id: # DEFAULT: Contents of section .note.gnu.build-id:
# DEFAULT-NEXT: 04000000 08000000 03000000 474e5500 ............GNU. # DEFAULT-NEXT: 04000000 08000000 03000000 474e5500 ............GNU.
# DEFAULT-NEXT: b0148597 ba5eb7e9 # DEFAULT-NEXT: bc208f98 7f8e4770
# MD5: Contents of section .note.gnu.build-id: # MD5: Contents of section .note.gnu.build-id:
# MD5-NEXT: 04000000 10000000 03000000 474e5500 ............GNU. # MD5-NEXT: 04000000 10000000 03000000 474e5500 ............GNU.
# MD5-NEXT: dce3bcaf 5219454c e89a1fc7 86ab17bd # MD5-NEXT: 8e13f077 f9c94068 9d63c715 6c952cd3
# SHA1: Contents of section .note.gnu.build-id: # SHA1: Contents of section .note.gnu.build-id:
# SHA1-NEXT: 04000000 14000000 03000000 474e5500 ............GNU. # SHA1-NEXT: 04000000 14000000 03000000 474e5500 ............GNU.
# SHA1-NEXT: 2f716666 fe3668fe 370a02a1 579c3eb2 # SHA1-NEXT: 754ac1ea 0a2e5144 0f4642b9 3f096bbb
# UUID: Contents of section .note.gnu.build-id: # UUID: Contents of section .note.gnu.build-id:
# UUID-NEXT: 04000000 10000000 03000000 474e5500 ............GNU. # UUID-NEXT: 04000000 10000000 03000000 474e5500 ............GNU.
# HEX: Contents of section .note.gnu.build-id: # HEX: Contents of section .note.gnu.build-id:
# HEX-NEXT: 04000000 04000000 03000000 474e5500 ............GNU. # HEX-NEXT: 04000000 04000000 03000000 474e5500 ............GNU.
# HEX-NEXT: 12345678 # HEX-NEXT: 12345678
# NONE-NOT: Contents of section .note.gnu.build-id: # NONE-NOT: Contents of section .note.gnu.build-id:

test/ELF/image-base.s

Show All 39 Lines
# CHECK-NEXT: Alignment: 4096 # CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Type: PT_LOAD (0x1)
# CHECK-NEXT: Offset: 0x1000 # CHECK-NEXT: Offset: 0x1000
# CHECK-NEXT: VirtualAddress: 0x1001000 # CHECK-NEXT: VirtualAddress: 0x1001000
# CHECK-NEXT: PhysicalAddress: 0x1001000 # CHECK-NEXT: PhysicalAddress: 0x1001000
# CHECK-NEXT: FileSize: 4096 # CHECK-NEXT: FileSize: 4096
# CHECK-NEXT: MemSize: 1 # CHECK-NEXT: MemSize: 4096
# CHECK-NEXT: Flags [ (0x5) # CHECK-NEXT: Flags [ (0x5)
# CHECK-NEXT: PF_R (0x4) # CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: PF_X (0x1) # CHECK-NEXT: PF_X (0x1)
# CHECK-NEXT: ] # CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 4096 # CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader { # CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_GNU_STACK (0x6474E551) # CHECK-NEXT: Type: PT_GNU_STACK (0x6474E551)
Show All 11 Lines