Skip to content

x86: strict separation of startup code

Ard Biesheuvel linux-efi lkml 7 versions – Applied

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

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest22 patches 25 repliesApplied
  2. v622 patches 14 repliesSuperseded
  3. v522 patches 9 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v424 patches18 repliesSuperseded
v321 patches36 repliesSuperseded
v223 patches25 repliesApplied
v1 RFC11 patches5 repliesSuperseded

Changes in v7 from the cover letter

- Rebase onto latest tip/master which incorporates v6.17-rc1
- Use a descriptor struct instead of two additional function arguments in patch #8
- Clarify in commit log why the latent entropy GCC plugin needs to be disabled for startup code
- Apply Tom's Rb to patch #3

Patches in v7 Applied

#Subject and filesSizeRepliesApplied
1/22x86/sev: Separate MSR and GHCB based snp_cpuid() via a callbackarch/x86/boot/startup/sev-shared.c arch/x86/coco/sev/vc-shared.c arch/x86/include/asm/sev.h+61 -506 replies
2/22x86/sev: Use MSR protocol for remapping SVSM calling areaarch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sev-startup.c+13 -30 replies
3/22x86/sev: Use MSR protocol only for early SVSM PVALIDATE callarch/x86/boot/compressed/sev.c arch/x86/boot/startup/sev-shared.c+6 -230 replies
4/22x86/sev: Run RMPADJUST on SVSM calling area page to test VMPLarch/x86/boot/compressed/sev.c arch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sev-startup.c+5 -40 replies
5/22x86/sev: Move GHCB page based HV communication out of startup codearch/x86/boot/compressed/sev-handle-vc.c arch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sev-startup.c +5 more+190 -18810 replies
6/22x86/sev: Avoid global variable to store virtual address of SVSM areaarch/x86/boot/compressed/sev.c arch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sev-startup.c +4 more+9 -320 replies
7/22x86/sev: Share implementation of MSR-based page state changearch/x86/boot/compressed/sev.c arch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sev-startup.c+39 -650 replies
8/22x86/sev: Pass SVSM calling area down to early page state change APIarch/x86/boot/compressed/sev.c arch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sev-startup.c +3 more+57 -210 replies
9/22x86/sev: Use boot SVSM CA for all startup and init codearch/x86/boot/compressed/sev.c arch/x86/boot/startup/sev-startup.c arch/x86/coco/sev/core.c +1 more+28 -590 replies
10/22x86/boot: Drop redundant RMPADJUST in SEV SVSM presence checkarch/x86/boot/compressed/sev.c+3 -172 replies
11/22x86/boot: Provide PIC aliases for 5-level paging related constantsarch/x86/kernel/head64.c+3 -00 replies
12/22x86/sev: Provide PIC aliases for SEV related data objectsarch/x86/boot/compressed/sev.c arch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sev-startup.c +1 more+37 -283 replies
13/22x86/sev: Move __sev_[get|put]_ghcb() into separate noinstr objectarch/x86/boot/startup/sev-startup.c arch/x86/coco/sev/Makefile arch/x86/coco/sev/noinstr.c+78 -780 replies
14/22x86/sev: Export startup routines for later usearch/x86/boot/startup/exports.h arch/x86/kernel/vmlinux.lds.S+16 -00 replies
15/22objtool: Add action to check for absence of absolute relocationstools/objtool/arch/x86/decode.c tools/objtool/builtin-check.c tools/objtool/check.c +2 more+60 -01 reply
16/22x86/boot: Check startup code for absence of absolute relocationsarch/x86/boot/startup/Makefile+8 -00 replies
17/22x86/boot: Revert "Reject absolute references in .head.text"arch/x86/tools/relocs.c+1 -70 replies
18/22x86/kbuild: Incorporate boot/startup/ via Kbuild makefilearch/x86/Kbuild arch/x86/Makefile+2 -10 replies
19/22x86/boot: Create a confined code area for startup codearch/x86/boot/startup/Makefile arch/x86/boot/startup/sev-shared.c arch/x86/boot/startup/sme.c +7 more+27 -120 replies
20/22efistub/x86: Remap inittext read-execute when neededarch/x86/boot/compressed/Makefile arch/x86/boot/compressed/misc.c arch/x86/include/asm/boot.h +2 more+10 -20 replies
21/22x86/boot: Move startup code out of __head sectionarch/x86/boot/compressed/sev.c arch/x86/boot/startup/gdt_idt.c arch/x86/boot/startup/map_kernel.c +7 more+45 -541 reply
22/22x86/boot: Get rid of the .head.text sectionarch/x86/kernel/vmlinux.lds.S+0 -50 replies

Reviews trailers per patch

5 of 22 patches have a Reviewed-by or Acked-by.

PatchTom LendackyBorislav Petkov (AMD)
1/22R-b
2/22R-b R-b
3/22R-b
4/22R-b
5/22
6/22R-b
7/22
8/22
9/22
10/22
11/22
12/22
13/22
14/22
15/22
16/22
17/22
18/22
19/22
20/22
21/22
22/22

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v7 thread

Cover letter [PATCH v7 00/22] x86: strict separation of startup code

From: Ard Biesheuvel <[email protected]>

This series implements a strict separation between startup code and ordinary code, where startup code is built in a way that tolerates being invoked from the initial 1:1 mapping of memory.

The existing approach of emitting this code into .head.text and checking for absolute relocations in that section is not 100% safe, and produces diagnostics that are sometimes difficult to interpret. [0]

Instead, rely on symbol prefixes, similar to how this is implemented for the EFI stub and for the startup code in the arm64 port. This ensures that startup code can only call other startup code, unless a special symbol alias is emitted that exposes a non-startup routine to the startup code.

This is somewhat intrusive, as there are many data objects that are referenced both by startup code and by ordinary code, and an alias needs to be emitted for each of those. If startup code references anything that has not been made available to it explicitly, a build time link error will occur.

This ultimately allows the .head.text section to be dropped entirely, as it no longer has a special significance. Instead, code that only executes at boot is emitted into .init.text as it should.

The majority of changes is around early SEV code. The main issue is that its use of GHCB pages and SVSM calling areas in code that may run from both the 1:1 mapping and the kernel virtual mapping is problematic as it relies on __pa() to perform VA to PA translations, which are ambiguous in this context. Also, __pa() pulls in non-trivial instrumented code when CONFIG_DEBUG_VIRTUAL=y and so it is better to avoid VA to PA translations altogether in the startup code.

Changes since v6:
- Rebase onto latest tip/master which incorporates v6.17-rc1
- Use a descriptor struct instead of two additional function arguments in patch #8
- Clarify in commit log why the latent entropy GCC plugin needs to be disabled for startup code
- Apply Tom's Rb to patch #3

Changes since v5:
- Some cosmetic touchups to patch #1
- Fix error spotted by Tom in patch #2
- Rejig objtool 'noabs' feature using an arch hook to check for relocations that should be considered absolute, which includes all of R_X86_64_32, R_X86_64_32S and R_X86_64_64 on x86_64

Changes since v4:
- Incorporate feedback from Tom, and add a couple of RBs
- Drop patch that moved the MSR save/restore out of the early page state change helper - this is less efficient but likely negligible in practice
- Drop patch that unified the SEV-SNP hypervisor feature check, which was identified by Nikunj as the one breaking SEV-SNP boot.

Changes since RFT/v3:
- Rebase onto tip/master
- Incorporate Borislav's feedback on v3
- Switch to objtool to check for absolute references in startup code
- Remap inittext R-X when running on EFI implementations that require strict R-X/RW- separation
- Include a kbuild fix to incorporate arch/x86/boot/startup/ in the right manner
- For now, omit the LA57 changes that remove the problematic early 5-level paging checks. We can revisit this once there is agreement on the approach.

Changes since RFT/v2:
- Rebase onto tip/x86/boot and drop the patches from the previous revision that have been applied in the meantime.
- Omit the pgtable_l5_enabled() changes for now, and just expose PIC aliases for the variables in question - this can be sorted later.
- Don't use the boot SVSM calling area in snp_kexec_finish(), but pass down the correct per-CPU one to the early page state API.
- Rename arch/x86/coco/sev/sev-noinstr.o to arch/x86/coco/sev/noinstr.o
- Further reduce the amount of SEV code that needs to be constructed in a special way.

Change since RFC/v1:
- Include a major disentanglement/refactor of the SEV-SNP startup code, so that only code that really needs to run from the 1:1 mapping is included in the startup/ code

- Incorporate some early notes from Ingo

Cc Borislav Petkov <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Kevin Loughlin <[email protected]>
Cc Tom Lendacky <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Nikunj A Dadhania <[email protected]>

[0] https://lore.kernel.org/all/CAHk-=wj7k9nvJn6cpa3-5Ciwn2RGyE605BMkjWE4MqnvC9E92A@mail.gmail.com/

Ard Biesheuvel (22):
x86/sev: Separate MSR and GHCB based snp_cpuid() via a callback x86/sev: Use MSR protocol for remapping SVSM calling area x86/sev: Use MSR protocol only for early SVSM PVALIDATE call x86/sev: Run RMPADJUST on SVSM calling area page to test VMPL x86/sev: Move GHCB page based HV communication out of startup code x86/sev: Avoid global variable to store virtual address of SVSM area x86/sev: Share implementation of MSR-based page state change x86/sev: Pass SVSM calling area down to early page state change API x86/sev: Use boot SVSM CA for all startup and init code x86/boot: Drop redundant RMPADJUST in SEV SVSM presence check x86/boot: Provide PIC aliases for 5-level paging related constants x86/sev: Provide PIC aliases for SEV related data objects x86/sev: Move __sev_[get|put]_ghcb() into separate noinstr object x86/sev: Export startup routines for later use
objtool: Add action to check for absence of absolute relocations x86/boot: Check startup code for absence of absolute relocations x86/boot: Revert "Reject absolute references in .head.text" x86/kbuild: Incorporate boot/startup/ via Kbuild makefile x86/boot: Create a confined code area for startup code efistub/x86: Remap inittext read-execute when needed x86/boot: Move startup code out of __head section x86/boot: Get rid of the .head.text section

 arch/x86/Kbuild                            |   2 +
 arch/x86/Makefile                          |   1 -
 arch/x86/boot/compressed/Makefile          |   2 +-
 arch/x86/boot/compressed/misc.c            |   2 +
 arch/x86/boot/compressed/sev-handle-vc.c   |   3 +
 arch/x86/boot/compressed/sev.c             | 120 ++------
 arch/x86/boot/startup/Makefile             |  22 ++
 arch/x86/boot/startup/exports.h            |  14 +
 arch/x86/boot/startup/gdt_idt.c            |   4 +-
 arch/x86/boot/startup/map_kernel.c         |   4 +-
 arch/x86/boot/startup/sev-shared.c         | 314 ++++++--------------
 arch/x86/boot/startup/sev-startup.c        | 205 ++-----------
 arch/x86/boot/startup/sme.c                |  27 +-
 arch/x86/coco/sev/Makefile                 |   8 +-
 arch/x86/coco/sev/core.c                   | 173 ++++++++---
 arch/x86/coco/sev/{sev-nmi.c => noinstr.c} |  74 +++++
 arch/x86/coco/sev/vc-handle.c              |   2 +
 arch/x86/coco/sev/vc-shared.c              | 143 ++++++++-
 arch/x86/include/asm/boot.h                |   2 +
 arch/x86/include/asm/init.h                |   6 -
 arch/x86/include/asm/setup.h               |   1 +
 arch/x86/include/asm/sev-internal.h        |  26 +-
 arch/x86/include/asm/sev.h                 |  23 +-
 arch/x86/kernel/head64.c                   |   5 +-
 arch/x86/kernel/head_32.S                  |   2 +-
 arch/x86/kernel/head_64.S                  |  10 +-
 arch/x86/kernel/vmlinux.lds.S              |   9 +-
 arch/x86/mm/mem_encrypt_amd.c              |   6 -
 arch/x86/mm/mem_encrypt_boot.S             |   6 +-
 arch/x86/platform/pvh/head.S               |   2 +-
 arch/x86/tools/relocs.c                    |   8 +-
 drivers/firmware/efi/libstub/x86-stub.c    |   4 +-
 tools/objtool/arch/x86/decode.c            |  12 +
 tools/objtool/builtin-check.c              |   2 +
 tools/objtool/check.c                      |  47 ++-
 tools/objtool/include/objtool/arch.h       |   1 +
 tools/objtool/include/objtool/builtin.h    |   1 +
 37 files changed, 671 insertions(+), 622 deletions(-)
 create mode 100644 arch/x86/boot/startup/exports.h
 rename arch/x86/coco/sev/{sev-nmi.c => noinstr.c} (61%)

base-commit: cab48e960d35f35ff799f7aafce7a7bf7c56d8e3

Signature · 1 line
2.51.0.268.g9569e192d0-goog