Morello: Stop using caprelocs for static binaries #2286
Merged
+167
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
bsdjhb
commented
Jan 8, 2025
bsdjhb
commented
- csu: Add support for ELF relocations to init caps for static binaries
- morello: Support R_MORELLO_RELATIVE relocations in static binaries
- rtld: Workaround Morello LLVM lld bug with local-caprelocs=elf
- Enable --local-caprelocs=elf for Morello
|
I have a request to fix the bug in Morello lld at https://git.morello-project.org/morello/llvm-project/-/merge_requests/307, but it may be a while before we can assume it is fixed. The workaround should let us work with existing lld for now and we can eventually drop it. |
jrtc27
reviewed
Jan 8, 2025
bsdjhb
force-pushed
the
morello_static_rela
branch
2 times, most recently
from
ee51273 to
c9c2b04
Compare
|
Ping? |
jrtc27
reviewed
Jan 29, 2025
This is to support the --local-caprelocs=elf flag to lld. When this
is specified, an ELF relocation table is emitted. The table is
identified by the hidden symbols __rela_dyn_start and __rela_dyn_end.
If an architecture defines CHERI_INIT_RELA, then crt_init_globals()
will look for this table. For each relocation found, an MD function
provided by the architecture is called to handle the relocation. The
function's signature is:
elf_reloc(const Elf_Rela *, void * __capability data_cap,
const void * __capability code_cap, Elf_Addr relocbase)
In addition, an architecture must define a RODATA_PTR helper macro
which accepts a symbol name as its sole argument and returns a
readable pointer. For hybrid this can just use the normal address-of
operator, but for purecap this has to avoid depending on an ELF
relocation and instead derive the pointer from an existing capability
such as PCC.
A shared header containing the implementation of elf_reloc is used to avoid duplicating code between hybrid and purecap. The init_cap_from_fragment function is copied directly from rtld (might be nice to move that function to a shared header).
bsdjhb
force-pushed
the
morello_static_rela
branch
from
c9c2b04 to
d518dc2
Compare
Morello LLVM's lld originally emitted PLT-related .dynamic entries when ELF local caprelocs are used even if the PLT is empty. This confuses rtld which tries to treat the start of the binary as a GOT PLT. In particular, rtld itself ends up with an empty PLT and so rtld tries to write to its ELF header which crashes since the page is mapped read-only. Workaround this by ignoring DT_JMPREL and DT_PLTGOT entries whose value is 0. The PLT GOT and PLT relocation table can never be at the start of a valid binary. NB: lld has been fixed in Morello LLVM comit 7e10a9b5b3919d10a5310cb9fe981e79f07b36d1.
This is done in bsd.{lib,prog}.mk instead of bsd.cpu.mk as it can't be
turned off for the lib32 build otherwise.
bsdjhb
force-pushed
the
morello_static_rela
branch
from
d518dc2 to
86f30bf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.