Skip to content

Clean up x86_64 boot code

David Woodhouse xen-devel 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest5 patches 13 repliesIn review
  2. v2 posting 2/20 of 6 patches 0 repliesSuperseded
  3. v2 RFC posting 1/27 patches 1 replySuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v1 RFC7 patches9 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5x86/boot: Only jump into low trampoline code for real-mode bootxen/arch/x86/boot/head.S xen/arch/x86/boot/trampoline.S+10 -42 replies
2/5x86/boot: Split bootsym() into four types of relocationsxen/arch/x86/boot/edd.S xen/arch/x86/boot/head.S xen/arch/x86/boot/mem.S +5 more+124 -563 replies
3/5x86/boot: Rename trampoline_{start, end} to boot_trampoline_{start, end}xen/arch/x86/boot/head.S xen/arch/x86/boot/trampoline.S xen/arch/x86/boot/video.S +6 more+27 -270 replies
4/5x86/boot: Copy 16-bit boot variables back up to Xen imagexen/arch/x86/boot/edd.S xen/arch/x86/boot/head.S xen/arch/x86/boot/mem.S +6 more+94 -397 replies
5/5x86/boot: Do not use trampoline for no-real-mode boot pathsxen/arch/x86/acpi/power.c xen/arch/x86/boot/head.S xen/arch/x86/boot/trampoline.S +9 more+122 -921 reply

Reviews trailers per patch

1 of 5 patches has a Reviewed-by or Acked-by.

PatchJan Beulich
1/5A-b
2/5
3/5
4/5
5/5

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

Read the v3 thread

Cover letter [Xen-devel] [PATCH v3 0/5] Clean up x86_64 boot code

Some cleanups for the boot path, originally inspired by an attempt to avoid scribbling on arbitrarily-chosen low memory.

In the no-real-mode case we don't need to bounce through low memory at all; we can run the 32-bit trampoline in-place in the Xen image.

The variables containing information which is optionally discovered by the real-mode boot code can be put back in place in the Xen image and we can dispense with the bootsym() pointer gymnastics in C code which access them in low memory.

I haven't yet got to reloc(), which I think exists only to ensure that the various breadcrumbs left all over the place by the Multiboot bootloader aren't scribbled on when we copy the 16-bit boot trampoline into low memory. I'd quite like to kill reloc() and pass the original pointer up to 64-bit code to be handled in C.

That would require finding a *safe* location to put the 16-bit boot trampoline though, which doesn't already contain anything that the bootloader created for us.

In fact, isn't there already a chance that head.S will choose a location for the trampoline which is already part of a module or contains one of the Multiboot breadcrumbs?

https://xenbits.xen.org/gitweb/?p=people/dwmw2/xen.git;a=shortlog;h=refs/heads/bootcleanup

v2: Patch #1 of the first series is already merged.
Fold in minor fixup from Andrew to what is now patch #1. Verbally agree to overcome Jan's objections to patch #1, in Chicago.

v3: Another patch merged from v2 posting. And then there were five.
Update to staging branch, especially commit c3cfa5b30 ("x86: Restore
IA32_MISC_ENABLE on wakeup").
Minor bikeshedding and commit comment improvements.
Ignore Andy's conflicting cleanups except to use them as an excuse for
not making the GDT sizing automatic as discussed.

David Woodhouse (5):
x86/boot: Only jump into low trampoline code for real-mode boot x86/boot: Split bootsym() into four types of relocations x86/boot: Rename trampoline_{start,end} to boot_trampoline_{start,end} x86/boot: Copy 16-bit boot variables back up to Xen image x86/boot: Do not use trampoline for no-real-mode boot paths

 xen/arch/x86/acpi/power.c         |   6 +++---
 xen/arch/x86/boot/edd.S           |  18 ++++++++++--------
 xen/arch/x86/boot/head.S          |  89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
 xen/arch/x86/boot/mem.S           |  14 ++++++++------
 xen/arch/x86/boot/trampoline.S    | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
 xen/arch/x86/boot/video.S         |  36 +++++++++++++++++++-----------------
 xen/arch/x86/boot/wakeup.S        |  16 ++++++++--------
 xen/arch/x86/cpu/common.c         |   2 +-
 xen/arch/x86/cpu/intel.c          |   2 +-
 xen/arch/x86/efi/efi-boot.h       |  31 +++----------------------------
 xen/arch/x86/platform_hypercall.c |  18 +++++++++---------
 xen/arch/x86/setup.c              |  68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 xen/arch/x86/smpboot.c            |   6 +++---
 xen/arch/x86/tboot.c              |   6 +++---
 xen/arch/x86/x86_64/mm.c          |   2 +-
 xen/arch/x86/xen.lds.S            |  28 +++++++++++++++++++++-------
 xen/include/asm-x86/acpi.h        |   2 +-
 xen/include/asm-x86/config.h      |  12 ++++++------
 xen/include/asm-x86/edd.h         |   1 -
 19 files changed, 331 insertions(+), 172 deletions(-)

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel