[PATCH v5 00/37] KVM: arm64: Add EL2 support to FEAT_S1PIE/S1POE

Marc Zyngier
2024-10-23T14:53:51Z

This series serves a few purposes:

- Complete the S1PIE/S1POE support to include EL2
- Sneak in the EL2 system register world switch

As mentioned in few of the patches, this implementation relies on a
very recent fix to the architecture (D22677 in [0]).

Patches on top of v6.12-rc1.

* From v4 [4]:

- Reordered the series to reduce the churn

- Fixed an embarassing bug where we would check for S1PIE instead of S1POE

- Move VPIDR_EL2 reset to vcpu_put()

- Fixed typos and stuff

* From v3 [3]:

- Added a few extra patches to deal with S1POE at EL2, including AT

- Fix CPTR_EL2.E0POE non-sensical trap entry

- Make sure that TVM and TRVM are handling the EL1 PIE/POE traps

- Simplify some of the visibility cruft

- Rebased on v6.12-rc1

* From v2 [2]:

- Correctly reprogram the context for AT in the fast path when S1PIE
is in use

- Generalised sysreg RES0/RES1 masking, and added TCR2_EL2 RES0/RES1
bit handling

- Fix TCR2_EL1, PIR_EL1, PIRE0_EL1 access with VHE

- Add a bunch of missing registers to get_el2_to_el1_mapping()

- Correctly map {TCR2,PIR,PIRE0}_EL2 to their EL1 equivalent on NV

- Disable hierarchical permissions when S1PIE is enabled

- Make EL2 world switch directly act on the vcpu rather than an
arbitrary context

- Remove SKL{0,1} from the TCR2_EL2 description

* From the initial posting [1]:

- Rebased on top of the AT support branch, which is currently sitting
in kvmarm/next

- Add handling for S1 indirect permission in AT, which I'm sure will
give Alexandru another king-sized headache

- Picked Mark Brown's series dealing with TCRX and S1PIE
visibility, and slapped an extra fix on top for good measure

- Picked up RBs from Joey, with thanks.

[0] https://developer.arm.com/documentation/102105/ka-04/
[1] https://lore.kernel.org/r/20240813144738.2048302-1-maz@kernel.org
[2] https://lore.kernel.org/r/20240903153834.1909472-1-maz@kernel.org
[3] https://lore.kernel.org/r/20240911135151.401193-1-maz@kernel.org
[4] https://lore.kernel.org/r/20241009190019.3222687-1-maz@kernel.org

Marc Zyngier (34):
arm64: Drop SKL0/SKL1 from TCR2_EL2
arm64: Remove VNCR definition for PIRE0_EL2
arm64: Add encoding for PIRE0_EL2
KVM: arm64: Drop useless struct s2_mmu in __kvm_at_s1e2()
KVM: arm64: nv: Add missing EL2->EL1 mappings in
get_el2_to_el1_mapping()
KVM: arm64: nv: Handle CNTHCTL_EL2 specially
KVM: arm64: nv: Save/Restore vEL2 sysregs
KVM: arm64: Correctly access TCR2_EL1, PIR_EL1, PIRE0_EL1 with VHE
KVM: arm64: Extend masking facility to arbitrary registers
arm64: Define ID_AA64MMFR1_EL1.HAFDBS advertising FEAT_HAFT
KVM: arm64: Add TCR2_EL2 to the sysreg arrays
KVM: arm64: Sanitise TCR2_EL2
KVM: arm64: Add save/restore for TCR2_EL2
KVM: arm64: Add PIR{,E0}_EL2 to the sysreg arrays
KVM: arm64: Add save/restore for PIR{,E0}_EL2
KVM: arm64: Handle PIR{,E0}_EL2 traps
KVM: arm64: Sanitise ID_AA64MMFR3_EL1
KVM: arm64: Add AT fast-path support for S1PIE
KVM: arm64: Split S1 permission evaluation into direct and
hierarchical parts
KVM: arm64: Disable hierarchical permissions when S1PIE is enabled
KVM: arm64: Implement AT S1PIE support
KVM: arm64: Add a composite EL2 visibility helper
KVM: arm64: Rely on visibility to let PIR*_ELx/TCR2_ELx UNDEF
arm64: Add encoding for POR_EL2
KVM: arm64: Drop bogus CPTR_EL2.E0POE trap routing
KVM: arm64: Subject S1PIE/S1POE registers to HCR_EL2.{TVM,TRVM}
KVM: arm64: Add kvm_has_s1poe() helper
KVM: arm64: Add basic support for POR_EL2
KVM: arm64: Add save/restore support for POR_EL2
KVM: arm64: Add POE save/restore for AT emulation fast-path
KVM: arm64: Disable hierarchical permissions when POE is enabled
KVM: arm64: Make PAN conditions part of the S1 walk context
KVM: arm64: Handle stage-1 permission overlays
KVM: arm64: Handle WXN attribute

Mark Brown (3):
KVM: arm64: Define helper for EL2 registers with custom visibility
KVM: arm64: Hide TCR2_EL1 from userspace when disabled for guests
KVM: arm64: Hide S1PIE registers from userspace when disabled for
guests

arch/arm64/include/asm/kvm_host.h | 40 +-
arch/arm64/include/asm/vncr_mapping.h | 1 -
arch/arm64/kvm/at.c | 470 ++++++++++++++++++---
arch/arm64/kvm/emulate-nested.c | 12 +-
arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 11 +-
arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 2 +-
arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 160 ++++++-
arch/arm64/kvm/nested.c | 40 +-
arch/arm64/kvm/sys_regs.c | 145 ++++++-
arch/arm64/tools/sysreg | 12 +-
include/kvm/arm_arch_timer.h | 3 +
11 files changed, 776 insertions(+), 120 deletions(-)

--
2.39.2