Skip to content

x86: Rid .head.text of all abs references

Ard Biesheuvel linux-toolchains lkml llvm oe-kbuild-all 5 versions – Applied

Status from this message: The following commit has been merged into the x86/boot branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest7 patches 8 repliesApplied
  2. v3 posting 2/26 patches 0 repliesSuperseded
  3. v3 posting 1/24 patches 2 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v24 patches0 repliesSuperseded
v1 RFC4 patches1 replySuperseded

Changes in v4 from the cover letter

- add patch to disable UBSAN in .head.text C code
- rebase onto v6.13-rc1

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/7x86/sev: Avoid WARN()s and panic()s in early boot codearch/x86/coco/sev/core.c arch/x86/coco/sev/shared.c+10 -141 reply
2/7x86/boot/64: Determine VA/PA offset before entering C codearch/x86/include/asm/setup.h arch/x86/kernel/head64.c arch/x86/kernel/head_64.S+15 -70 replies
3/7x86/boot/64: Avoid intentional absolute symbol references in .head.textarch/x86/kernel/head64.c+18 -120 replies
4/7x86/boot: Disable UBSAN in early boot codearch/x86/coco/sev/shared.c arch/x86/include/asm/init.h+5 -40 replies
5/7x86/kernel: Move ENTRY_TEXT to the start of the imagearch/x86/kernel/vmlinux.lds.S+13 -130 replies
6/7x86/boot: Move .head.text into its own output sectionarch/x86/kernel/vmlinux.lds.S+5 -20 replies
7/7x86/boot: Reject absolute references in .head.textarch/x86/tools/relocs.c+7 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH v4 0/7] x86: Rid .head.text of all abs references

From: Ard Biesheuvel <[email protected]>

This series removes the last remaining absolute symbol references from .head.text. Doing so is necessary because code in this section may be called from a 1:1 mapping of memory, which deviates from the mapping this code was linked and/or relocated to run at. This is not something that the toolchains support: even PIC/PIE code is still assumed to execute from the same mapping that it was relocated to run from by the startup code or dynamic loader. This means we are basically on our own here, and need to add measures to ensure the code works as expected in this manner.

Given that the startup code needs to create the kernel virtual mapping in the page tables, early references to some kernel virtual addresses are valid even if they cannot be dereferenced yet. To avoid having to make this distinction at build time, patches #2 and #3 replace such valid references with RIP-relative references with an offset applied.

Patch #1 removes some absolute references from .head.text that don't need to be there in the first place.

Changes since v3:
- add patch to disable UBSAN in .head.text C code
- rebase onto v6.13-rc1

Changes since v2:
- drop Xen changes, which have been merged in the meantime
- update patch #1 with feedback from Tom
- reorganize the .text section and emit .head.text into a separate output section for easier diagnostics
- update the 'relocs' tool to reject absolute ELF relocations in .head.text

Changes since v1/RFC:
- rename va_offset to p2v_offset
- take PA of _text in C code directly

Cc Tom Lendacky <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Kees Cook <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Kevin Loughlin <[email protected]>

Ard Biesheuvel (7):
x86/sev: Avoid WARN()s and panic()s in early boot code x86/boot/64: Determine VA/PA offset before entering C code x86/boot/64: Avoid intentional absolute symbol references in
.head.text
x86/boot: Disable UBSAN in early boot code x86/kernel: Move ENTRY_TEXT to the start of the image x86/boot: Move .head.text into its own output section x86/boot: Reject absolute references in .head.text

 arch/x86/coco/sev/core.c      | 15 +++-----
 arch/x86/coco/sev/shared.c    | 16 +++++----
 arch/x86/include/asm/init.h   |  2 +-
 arch/x86/include/asm/setup.h  |  2 +-
 arch/x86/kernel/head64.c      | 38 ++++++++++++--------
 arch/x86/kernel/head_64.S     | 12 +++++--
 arch/x86/kernel/vmlinux.lds.S | 29 ++++++++-------
 arch/x86/tools/relocs.c       |  8 ++++-
 8 files changed, 71 insertions(+), 51 deletions(-)
Signature · 1 line
2.47.0.338.g60cca15819-goog