mbox series

[v5,0/6] x86: Refactor and consolidate startup code

Message ID 20250418141253.2601348-8-ardb+git@google.com
Headers show
Series x86: Refactor and consolidate startup code | expand

Message

Ard Biesheuvel April 18, 2025, 2:12 p.m. UTC
From: Ard Biesheuvel <ardb@kernel.org>

Reorganize C code that is used during early boot, either in the
decompressor/EFI stub or the kernel proper, but before the kernel
virtual mapping is up.

v5:
- add new patches #1 and #2 to address issues that were reported by Ingo
  for v4
- drop another couple of patches that have been queued up after v4
- rebase onto today's tip/x86/boot

v4:
- drop patches that were queued up
- fix address space error in patch #1
- add patches for SEV-SNP boot code - these cannot be applied yet, but
  are included for completeness

v3:
- keep rip_rel_ptr() around in PIC code - sadly, it is still needed in
  some cases
- remove RIP_REL_REF() uses in separate patches
- keep __head annotations for now, they will all be removed later
- disable objtool validation for library objects (i.e., pieces that are
  not linked into vmlinux)

I will follow up with a series that gets rid of .head.text altogether,
as it will no longer be needed at all once the startup code is checked
for absolute relocations.

Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Dionna Amalie Glaze <dionnaglaze@google.com>
Cc: Kevin Loughlin <kevinloughlin@google.com>

Ard Biesheuvel (6):
  vmlinux.lds: Include .data.rel[.local] into .data section
  x86/sev: Move noinstr NMI handling code into separate source file
  x86/sev: Split off startup code from core code
  x86/boot: Move SEV startup code into startup/
  x86/boot: Drop RIP_REL_REF() uses from early SEV code
  x86/asm: Retire RIP_REL_REF()

 arch/x86/boot/compressed/sev.c                            |    4 +-
 arch/x86/boot/startup/Makefile                            |    2 +-
 arch/x86/{coco/sev/shared.c => boot/startup/sev-shared.c} |  307 +---
 arch/x86/boot/startup/sev-startup.c                       | 1390 +++++++++++++++++
 arch/x86/coco/sev/Makefile                                |   23 +-
 arch/x86/coco/sev/core.c                                  | 1620 +++-----------------
 arch/x86/coco/sev/sev-nmi.c                               |  108 ++
 arch/x86/include/asm/asm.h                                |    5 -
 arch/x86/include/asm/sev-internal.h                       |   18 +-
 include/asm-generic/vmlinux.lds.h                         |    4 +-
 10 files changed, 1757 insertions(+), 1724 deletions(-)
 rename arch/x86/{coco/sev/shared.c => boot/startup/sev-shared.c} (81%)
 create mode 100644 arch/x86/boot/startup/sev-startup.c
 create mode 100644 arch/x86/coco/sev/sev-nmi.c


base-commit: 433bf33adc6605f3798cbf2b2c42d0b499233c7b