[RFC PATCH v2 00/18] arm64: efi: leave MMU and caches on at boot
Ard Biesheuvel
ardb at kernel.org
Wed Mar 30 08:41:47 PDT 2022
This is a followup to a previous series of mine [0], and it aims to
streamline the boot flow with respect to cache maintenance and redundant
copying of data in memory.
Combined with my proof-of-concept firmware for QEMU/arm64 [1], this
results in a boot where both the kernel and the initrd are loaded
straight to their final locations in memory, while the physical
placement of the kernel image is still randomized by the loader. It also
removes all memory accesses performed with the MMU and caches off
(except for instruction fetches) that are done from the moment the VM
comes out of reset.
On the kernel side, this comes down to:
- increasing the ID map to cover the entire kernel image, so we can
build the kernel page tables with the MMU and caches enabled;
- deal with the MMU already being on at boot, and keep it on while
building the ID map;
- ensure all stores to memory that are now done with the MMU and caches
on are not negated by the subsequent cache invalidation.
Additionally, this series removes the little dance we do to create a
kernel mapping, relocate the kernel, run the KASLR init code, tear down
the old mapping and creat a new one, relocate the kernel again, and
finally enter the kernel proper. Instead, it invokes a minimal C
function 'kaslr_early_init()' while running from the ID map with a
temporary mapping of the FDT in TTBR1. This change represents a
substantial of the diffstat, as it requires some work to instantiate
code that can run safely from the wrong address. It is also the most
likely to raise objections, so it can be dropped from this series if
desired (patch #9 is the meat, and #8 is a prerequisite patch that could
be dropped in that case as well)
Changes since v1:
- Remove the dodgy handling of the KASLR seed, which was necessary to
avoid doing two iterations of the setup/teardown of the page tables.
This is now dealt with by creating the TTBR1 page tables while
executing from TTBR0, and so all memory manipulations are still done
with the MMU and caches on. (This is also the reason patch #9 is
optional now)
- Only boot from EFI with the MMU and caches on if the image was not
moved around in memory. Otherwise, we cannot rely on the firmware's ID
map to have created an executable mapping for the copied code.
[0] https://lore.kernel.org/all/20220304175657.2744400-1-ardb@kernel.org/
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ardb/efilite.git/
Cc: Marc Zyngier <maz at kernel.org>
Cc: Will Deacon <will at kernel.org>
Ard Biesheuvel (18):
arm64: head: drop idmap_ptrs_per_pgd
arm64: head: split off idmap creation code
arm64: kernel: drop unnecessary PoC cache clean+invalidate
arm64: head: cover entire kernel image in ID map
arm64: head: factor out TTBR1 assignment into a macro
arm64: head: populate kernel page tables with MMU and caches on
arm64: kaslr: deal with init called with VA randomization enabled
arm64: setup: defer R/O remapping of FDT
arm64: head: relocate kernel only a single time if KASLR is enabled
arm64: head: record the MMU state at primary entry
arm64: mm: make vabits_actual a build time constant if possible
arm64: head: avoid cache invalidation when entering with the MMU on
arm64: head: record CPU boot mode after enabling the MMU
arm64: head: clean the ID map page to the PoC
arm64: lds: move idmap_pg_dir out of .rodata
efi: libstub: pass image handle to handle_kernel_image()
efi/arm64: libstub: run image in place if randomized by the loader
arm64: efi/libstub: enter with the MMU on if executing in place
arch/arm64/include/asm/kernel-pgtable.h | 2 +-
arch/arm64/include/asm/memory.h | 6 +
arch/arm64/include/asm/mmu_context.h | 1 -
arch/arm64/kernel/Makefile | 2 +-
arch/arm64/kernel/efi-entry.S | 4 +
arch/arm64/kernel/head.S | 276 +++++++++++---------
arch/arm64/kernel/kaslr.c | 86 +-----
arch/arm64/kernel/pi/Makefile | 33 +++
arch/arm64/kernel/pi/kaslr_early.c | 128 +++++++++
arch/arm64/kernel/setup.c | 8 +-
arch/arm64/kernel/vmlinux.lds.S | 9 +-
arch/arm64/mm/mmu.c | 15 +-
drivers/firmware/efi/libstub/arm32-stub.c | 3 +-
drivers/firmware/efi/libstub/arm64-stub.c | 15 +-
drivers/firmware/efi/libstub/efi-stub.c | 2 +-
drivers/firmware/efi/libstub/efistub.h | 3 +-
drivers/firmware/efi/libstub/riscv-stub.c | 3 +-
include/linux/efi.h | 11 +
18 files changed, 380 insertions(+), 227 deletions(-)
create mode 100644 arch/arm64/kernel/pi/Makefile
create mode 100644 arch/arm64/kernel/pi/kaslr_early.c
--
2.30.2
More information about the linux-arm-kernel
mailing list