Skip to content

KVM: arm64: Add support for hypervisor kCFI

Pierre-Clément Tosi kvm kvmarm linux-arm-kernel 5 versions – Applied

Status from this message: Applied to kvmarm/next, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest8 patches 3 repliesApplied
  2. v413 patches 20 repliesSuperseded
  3. v312 patches 13 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v212 patches0 repliesSuperseded
v110 patches8 repliesSuperseded

Changes in v5 from the cover letter

- Dropped the patch making the handlers report the kCFI target & expected type
- Dropped the hypervisor kCFI test module
- Dropped the patch introducing handler for EL2h sync exceptions
- Dropped the patch renaming __guest_exit_panic
- Made invalid_host_el2_vect branch unconditionally to hyp_panic
- Changed SP type in __pkvm_init_switch_pgd signature to unsigned long
- Changed which registers __pkvm_init_switch_pgd used for intermediates
- Fixed typo in commit message about esr_brk_comment()
- Fixed mistake in commit message about context of invalid_host_el2_vect

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/8KVM: arm64: Fix clobbered ELR in sync abort/SErrorarch/arm64/kernel/asm-offsets.c arch/arm64/kvm/hyp/entry.S arch/arm64/kvm/hyp/include/hyp/switch.h+12 -20 replies
2/8KVM: arm64: Fix __pkvm_init_switch_pgd call ABIarch/arm64/include/asm/kvm_hyp.h arch/arm64/kvm/hyp/nvhe/hyp-init.S arch/arm64/kvm/hyp/nvhe/setup.c+17 -151 reply
3/8KVM: arm64: nVHE: Simplify invalid_host_el2_vectarch/arm64/kvm/hyp/nvhe/host.S+0 -61 reply
4/8KVM: arm64: nVHE: gen-hyprel: Skip R_AARCH64_ABS32arch/arm64/kvm/hyp/nvhe/gen-hyprel.c+6 -00 replies
5/8KVM: arm64: VHE: Mark __hyp_call_panic __noreturnarch/arm64/kvm/hyp/vhe/switch.c+1 -20 replies
6/8arm64: Introduce esr_brk_comment, esr_is_cfi_brkarch/arm64/include/asm/esr.h arch/arm64/kernel/debug-monitors.c arch/arm64/kernel/traps.c +1 more+16 -90 replies
7/8KVM: arm64: Introduce print_nvhe_hyp_panic helperarch/arm64/kvm/handle_exit.c+8 -40 replies
8/8KVM: arm64: nVHE: Support CONFIG_CFI_CLANG at EL2arch/arm64/kvm/handle_exit.c arch/arm64/kvm/hyp/nvhe/Makefile arch/arm64/kvm/hyp/nvhe/hyp-init.S+18 -40 replies

Reviews trailers per patch

All 8 patches have a Reviewed-by or Acked-by.

PatchWill Deacon
1/8A-b
2/8A-b
3/8A-b
4/8A-b
5/8A-b
6/8A-b
7/8A-b
8/8A-b

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

Read the v5 thread

Cover letter [PATCH v5 0/8] KVM: arm64: Add support for hypervisor kCFI

CONFIG_CFI_CLANG ("kernel Control Flow Integrity") makes the compiler inject runtime type checks before any indirect function call. On AArch64, it generates a BRK instruction to be executed on type mismatch and encodes the indices of the registers holding the branch target and expected type in the immediate of the instruction. As a result, a synchronous exception gets triggered on kCFI failure and the fault handler can retrieve the immediate (and indices) from ESR_ELx.

This feature has been supported at EL1 ("host") since it was introduced by b26e484b8bb3 ("arm64: Add CFI error handling"), where cfi_handler() decodes ESR_EL1, giving informative panic messages such as

  [   21.885179] CFI failure at lkdtm_indirect_call+0x2c/0x44 [lkdtm]
  (target: lkdtm_increment_int+0x0/0x1c [lkdtm]; expected type: 0x7e0c52a)
  [   21.886593] Internal error: Oops - CFI: 0 [#1] PREEMPT SMP

However, it is not supported at EL2 in nVHE (or pKVM), as CONFIG_CFI_CLANG gets filtered out at build time, preventing the compiler from injecting the checks.

To address this,

- [1/8] fixes an existing bug where the ELR_EL2 was getting clobbered on synchronous exceptions, causing the wrong "PC" to be reported by nvhe_hyp_panic_handler() or __hyp_call_panic(). This is particularly limiting for kCFI, as it would mask the location of the failed type check.
- [2/8] fixes a minor C/asm ABI mismatch which would trigger a kCFI failure
- [3/8]-[7/8] prepare nVHE for CONFIG_CFI_CLANG and [8/8] enables it

Note that kCFI errors remain fatal at EL2, even when CONFIG_CFI_PERMISSIVE=y.

Changes in v5 (addressed Will's comments on v4):
- Dropped the patch making the handlers report the kCFI target & expected type
- Dropped the hypervisor kCFI test module
- Dropped the patch introducing handler for EL2h sync exceptions
- Dropped the patch renaming __guest_exit_panic
- Made invalid_host_el2_vect branch unconditionally to hyp_panic
- Changed SP type in __pkvm_init_switch_pgd signature to unsigned long
- Changed which registers __pkvm_init_switch_pgd used for intermediates
- Fixed typo in commit message about esr_brk_comment()
- Fixed mistake in commit message about context of invalid_host_el2_vect

Pierre-Clément Tosi (8):
KVM: arm64: Fix clobbered ELR in sync abort/SError
KVM: arm64: Fix __pkvm_init_switch_pgd call ABI
KVM: arm64: nVHE: Simplify invalid_host_el2_vect
KVM: arm64: nVHE: gen-hyprel: Skip R_AARCH64_ABS32
KVM: arm64: VHE: Mark __hyp_call_panic __noreturn
arm64: Introduce esr_brk_comment, esr_is_cfi_brk
KVM: arm64: Introduce print_nvhe_hyp_panic helper
KVM: arm64: nVHE: Support CONFIG_CFI_CLANG at EL2

 arch/arm64/include/asm/esr.h            | 11 +++++++++
 arch/arm64/include/asm/kvm_hyp.h        |  4 ++--
 arch/arm64/kernel/asm-offsets.c         |  1 +
 arch/arm64/kernel/debug-monitors.c      |  4 +---
 arch/arm64/kernel/traps.c               |  8 +++----
 arch/arm64/kvm/handle_exit.c            | 24 +++++++++++++++-----
 arch/arm64/kvm/hyp/entry.S              |  8 +++++++
 arch/arm64/kvm/hyp/include/hyp/switch.h |  5 +++--
 arch/arm64/kvm/hyp/nvhe/Makefile        |  6 ++---
 arch/arm64/kvm/hyp/nvhe/gen-hyprel.c    |  6 +++++
 arch/arm64/kvm/hyp/nvhe/host.S          |  6 -----
 arch/arm64/kvm/hyp/nvhe/hyp-init.S      | 30 +++++++++++++++----------
 arch/arm64/kvm/hyp/nvhe/setup.c         |  4 ++--
 arch/arm64/kvm/hyp/vhe/switch.c         |  3 +--
 14 files changed, 78 insertions(+), 42 deletions(-)
Signature · 1 line
2.45.2.505.gda0bf45e8d-goog