[PATCH v2 00/12] KVM: arm64: Fixes to fine grain traps and pKVM traps

Fuad Tabba
2023-12-06T10:05:47Z

Changes from v1:
- Handle HAFGRTR_EL2 in nested virt
- Update the nested virt FGT tables with the added trap bits (Marc)
- Use the generated value for RES0 (Marc)
- Calculate the value of NMASK based on RES0 and MASK

This patch series has fixes, updates, and code for validating
fine grain trap register masks, as well as some fixes to feature
trapping in pKVM.

New fine grain trap (FGT) bits have been defined in the latest
Arm Architecture System Registers xml specification (2023-09)
[*], so the code is updated to reflect them. Moreover, some of
the already-defined masks overlap with RES0, which this series
fixes.

It also adds FGT register masks that weren't defined earlier,
handling of HAFGRTR_EL2 in nested virt, as well as build time
validation that the bits of the various masks are all accounted
for and without overlap.

Based on 6.7-rc4.

Cheers,
/fuad

[*] https://developer.arm.com/downloads/-/exploration-tools

Fuad Tabba (12):
KVM: Add missing HCRX_EL2 field definitions
KVM: arm64: Add latest HFGxTR_EL2 FGT entries to nested virt
KVM: arm64: Add latest HFGITR_EL2 FGT entries to nested virt
KVM: arm64: Add bit masks for HAFGRTR_EL2
KVM: arm64: Handle HAFGRTR_EL2 trapping in nested virt
KVM: arm64: Update and fix FGT register masks
KVM: arm64: Add build validation for FGT trap mask values
KVM: arm64: Use generated FGT RES0 bits instead of specifying them
KVM: arm64: Generate the HFGWTR-only RES0 bits
KVM: arm64: Define FGT NMASK bits relative to other fields
KVM: arm64: Trap external trace for protected VMs
KVM: arm64: Mark CMOW as allowed for protected VMs

arch/arm64/include/asm/kvm_arm.h | 58 +++++++------
arch/arm64/include/asm/kvm_host.h | 1 +
arch/arm64/include/asm/sysreg.h | 20 +++++
arch/arm64/kvm/emulate-nested.c | 63 ++++++++++++++
arch/arm64/kvm/hyp/include/hyp/switch.h | 29 +++++++
.../arm64/kvm/hyp/include/nvhe/fixed_config.h | 4 +-
arch/arm64/kvm/hyp/nvhe/pkvm.c | 4 +
arch/arm64/kvm/sys_regs.c | 1 +
arch/arm64/tools/sysreg | 82 ++++++++++++++++++-
9 files changed, 231 insertions(+), 31 deletions(-)

base-commit: 33cc938e65a98f1d29d0a18403dbbee050dcad9a
--
2.43.0.rc2.451.g8631bc7472-goog