Merge branch kvm-arm64/el2-kcfi into kvmarm/next
authorOliver Upton <oliver.upton@linux.dev>
Sun, 14 Jul 2024 00:23:32 +0000 (00:23 +0000)
committerOliver Upton <oliver.upton@linux.dev>
Sun, 14 Jul 2024 00:23:32 +0000 (00:23 +0000)
* kvm-arm64/el2-kcfi:
  : kCFI support in the EL2 hypervisor, courtesy of Pierre-ClĂ©ment Tosi
  :
  : Enable the usage fo CONFIG_CFI_CLANG (kCFI) for hardening indirect
  : branches in the EL2 hypervisor. Unlike kernel support for the feature,
  : CFI failures at EL2 are always fatal.
  KVM: arm64: nVHE: Support CONFIG_CFI_CLANG at EL2
  KVM: arm64: Introduce print_nvhe_hyp_panic helper
  arm64: Introduce esr_brk_comment, esr_is_cfi_brk
  KVM: arm64: VHE: Mark __hyp_call_panic __noreturn
  KVM: arm64: nVHE: gen-hyprel: Skip R_AARCH64_ABS32
  KVM: arm64: nVHE: Simplify invalid_host_el2_vect
  KVM: arm64: Fix __pkvm_init_switch_pgd call ABI
  KVM: arm64: Fix clobbered ELR in sync abort/SError

Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
1  2 
arch/arm64/include/asm/esr.h
arch/arm64/kvm/hyp/vhe/switch.c

Simple merge
Simple merge