Skip to content

x86/boot: fix relying on link order

Alexander Lobakin lkml 3 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. v3 Latest2 patches 1 replyApplied
  2. v22 patches 10 repliesSuperseded
  3. v12 patches 7 repliesSuperseded

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/2x86/boot: robustify calling startup_{32,64}() from the decompressor codearch/x86/boot/compressed/head_32.S arch/x86/boot/compressed/head_64.S arch/x86/boot/compressed/misc.c+13 -90 replies
2/2scripts/head-object-list: remove x86 from the listscripts/head-object-list.txt+0 -60 replies

Reviews trailers per patch

None of the 2 patches has a Reviewed-by or Acked-by.

PatchJiri Slaby
1/2T-b
2/2T-b

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

Read the v3 thread

Cover letter [PATCH v3 0/2] x86/boot: fix relying on link order

Currently, the x86 decompressor code expects the kernel entry point to be exactly at the beginning of the kernel image. It's always been true, but is hacky in multiple ways: special .head.text section and linking certain object files first to have them at the beginning.
Make the code independent from the link order and then kill the latter. The former is to be resolved a bit later.

I didn't put any "Fixes:" tag since it's not linear. The lines changed with 0001 came from the initial x86 KASLR series, but that unconditional jump to the kernel beginning already was there. It goes at least from the set that brought relocatable kernel support to x86, but this is quite prehistoric already and might not look really relatable.

Alexander Lobakin (2):
x86/boot: robustify calling startup_{32,64}() from the decompressor
code
scripts/head-object-list: remove x86 from the list

 arch/x86/boot/compressed/head_32.S |  2 +-
 arch/x86/boot/compressed/head_64.S |  2 +-
 arch/x86/boot/compressed/misc.c    | 18 +++++++++++-------
 scripts/head-object-list.txt       |  6 ------
 4 files changed, 13 insertions(+), 15 deletions(-)

---
From v2[0]:
* rebase on top of 6.2;
* prettify debug entry point print.

From v1[1]:
* collect the Tested-by tags (Jiri);
* don't add pathetic returns after noreturn error() (Jiri);
* debug-print the entry point offset via debug_putaddr() before booting (Jiri);
* always have an empty line before return statements (Jiri).

[0] https://lore.kernel.org/all/[email protected]
[1] https://lore.kernel.org/all/[email protected]

Signature · 1 line
2.39.0