Skip to content

efi/x86: Avoid the need to mangle the EFI memory map

Ard Biesheuvel linux-efi lkml 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest17 patches 9 repliesIn review
  2. v219 patches 1 replySuperseded
  3. v1 RFC9 patches 2 repliesSuperseded

Changes in v3 from the cover letter

- Avoid relying on memblock tables after those may have been freed already (spotted by Sashiko). Instead, tweak the ranges_to_free code added recently by Mike so that the array can grow arbitrarily, and carry multiple entries per EFI boot services data region.
- Fix use of the memory attributes table after kexec too, which is now feasible given that memblock_reserve()'ing EFI boot services memory is no longer broken - this supersedes [0]
- Drop memblock changes that were merged into 7.1-rc0 (formerly #1-#2)

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17x86/efi: Omit redundant kernel image overlap checkarch/x86/platform/efi/quirks.c+4 -112 replies
2/17x86/efi: Drop redundant EFI_PARAVIRT checkarch/x86/platform/efi/efi.c+3 -52 replies
3/17x86/efi: Only merge EFI memory map entries on 32-bit systemsarch/x86/include/asm/efi.h arch/x86/platform/efi/efi.c arch/x86/platform/efi/efi_32.c+37 -311 reply
4/17x86/efi: Defer sub-1M check from unmap to free stagearch/x86/platform/efi/quirks.c+12 -161 reply
5/17x86/efi: Simplify real mode trampoline allocation quirkarch/x86/platform/efi/quirks.c+6 -281 reply
6/17x86/efi: Unmap kernel-reserved boot regions from EFI page tablesarch/x86/platform/efi/quirks.c+6 -60 replies
7/17x86/efi: Drop EFI_MEMORY_RUNTIME check from __ioremap_check_other()arch/x86/mm/ioremap.c+5 -30 replies
8/17x86/efi: Allow ranges_to_free array to grow beyond initial sizearch/x86/platform/efi/quirks.c+32 -81 reply
9/17x86/efi: Intersect ranges_to_free with MEMBLOCK_RSRV_KERN regionsarch/x86/platform/efi/quirks.c+33 -111 reply
10/17x86/efi: Do not rely on EFI_MEMORY_RUNTIME bit and avoid entry splittingarch/x86/include/asm/efi.h arch/x86/platform/efi/memmap.c arch/x86/platform/efi/quirks.c+17 -2020 replies
11/17efi: Use nr_map not map_end to find the last valid memory map entryarch/x86/platform/efi/efi.c arch/x86/platform/efi/memmap.c arch/x86/platform/efi/quirks.c +5 more+25 -210 replies
12/17x86/efi: Clean the memory map using iterator and filter APIarch/x86/platform/efi/efi.c+13 -170 replies
13/17x86/efi: Update the runtime map in placearch/x86/platform/efi/efi.c+16 -660 replies
14/17x86/efi: Reuse memory map instead of reallocating itarch/x86/include/asm/efi.h arch/x86/platform/efi/Makefile arch/x86/platform/efi/memmap.c +2 more+7 -1490 replies
15/17x86/efi: Merge two traversals of the memory map when freeing boot regionsarch/x86/platform/efi/quirks.c+27 -310 replies
16/17x86/efi: Avoid EFI_MEMORY_RUNTIME for early EFI boot memory reservationsarch/x86/platform/efi/quirks.c+18 -480 replies
17/17x86/efi: Drop kexec quirk for the EFI memory attributes tablearch/x86/platform/efi/quirks.c+0 -40 replies

Reviews trailers per patch

7 of 17 patches have a Reviewed-by or Acked-by.

PatchMike Rapoport (Microsoft)Gregory Price
1/17R-b R-b
2/17R-b R-b
3/17R-b
4/17A-b
5/17A-b
6/17
7/17
8/17R-b
9/17A-b
10/17
11/17
12/17
13/17
14/17
15/17
16/17
17/17

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 00/17] efi/x86: Avoid the need to mangle the EFI memory map

From: Ard Biesheuvel <[email protected]>

At boot, x86 uses E820 tables (3 different versions!), memblock tables and the EFI memory map to reason about which parts of system RAM are available to the OS, and which are reserved.

While other EFI architectures treat the EFI memory map as immutable, the x86 boot code modifies it to keep track of memory reservations of boot services data regions, in order to distinguish which parts have been memblock_reserve()'d permanently, and which ones have been reserved only temporarily to work around buggy implementations of the EFI runtime service [SetVirtualAddressMap()] that reconfigures the VA space of the runtime services themselves.

This method is mostly fine for marking entire regions as reserved, but it gets complicated when the code decides to split EFI memory map entries in order to mark some of it permanently reserved, and the rest of it temporarily reserved.

Let's clean this up, by
- marking permanent reservations of EFI boot services data memory as MEMBLOCK_RSRV_KERN
- taking this marking into account when deciding whether or not a EFI boot services data region can be freed
- dropping all of the EFI memory map insertion/splitting logic and the allocation/freeing logic, all of which have become redundant.

Changes since v2:
- Avoid relying on memblock tables after those may have been freed already (spotted by Sashiko). Instead, tweak the ranges_to_free code added recently by Mike so that the array can grow arbitrarily, and carry multiple entries per EFI boot services data region.
- Fix use of the memory attributes table after kexec too, which is now feasible given that memblock_reserve()'ing EFI boot services memory is no longer broken - this supersedes [0]
- Drop memblock changes that were merged into 7.1-rc0 (formerly #1-#2)

Changes since v1:
- Also get rid of all reallocation logic, and just reuse the initial allocation throughout, and keep track of the number of valid entries
- Drop abuse of the EFI_MEMORY_RUNTIME flag
- Add acks from Mike to #1-#2

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

Cc Mike Rapoport (Microsoft) <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Dave Young <[email protected]>
Cc Gregory Price <[email protected]>

Ard Biesheuvel (17):
x86/efi: Omit redundant kernel image overlap check x86/efi: Drop redundant EFI_PARAVIRT check
x86/efi: Only merge EFI memory map entries on 32-bit systems x86/efi: Defer sub-1M check from unmap to free stage x86/efi: Simplify real mode trampoline allocation quirk x86/efi: Unmap kernel-reserved boot regions from EFI page tables x86/efi: Drop EFI_MEMORY_RUNTIME check from __ioremap_check_other() x86/efi: Allow ranges_to_free array to grow beyond initial size x86/efi: Intersect ranges_to_free with MEMBLOCK_RSRV_KERN regions x86/efi: Do not rely on EFI_MEMORY_RUNTIME bit and avoid entry
splitting
efi: Use nr_map not map_end to find the last valid memory map entry x86/efi: Clean the memory map using iterator and filter API x86/efi: Update the runtime map in place
x86/efi: Reuse memory map instead of reallocating it x86/efi: Merge two traversals of the memory map when freeing boot
regions
x86/efi: Avoid EFI_MEMORY_RUNTIME for early EFI boot memory
reservations
x86/efi: Drop kexec quirk for the EFI memory attributes table

 arch/x86/include/asm/efi.h           |  15 +-
 arch/x86/mm/ioremap.c                |   8 +-
 arch/x86/platform/efi/Makefile       |   2 +-
 arch/x86/platform/efi/efi.c          | 167 +++--------
 arch/x86/platform/efi/efi_32.c       |  31 +++
 arch/x86/platform/efi/memmap.c       | 247 -----------------
 arch/x86/platform/efi/quirks.c       | 291 +++++++-------------
 arch/x86/platform/efi/runtime-map.c  |   4 +-
 drivers/firmware/efi/arm-runtime.c   |   2 +-
 drivers/firmware/efi/memmap.c        |   8 +-
 drivers/firmware/efi/riscv-runtime.c |   2 +-
 include/linux/efi.h                  |  13 +-
 12 files changed, 197 insertions(+), 593 deletions(-)
 delete mode 100644 arch/x86/platform/efi/memmap.c

base-commit: 2e68039281932e6dc37718a1ea7cbb8e2cda42e6

Signature · 1 line
2.54.0.rc2.544.gc7ae2d5bb8-goog