KVM: arm64: pKVM host hypercall and GICv5 CPU interface fixes
Fuad Tabba
reviewerv3 cover KVM: arm64: pKVM host hypercall and GICv5 CPU interface fixes
Hi folks,
Changes since v2 [1]:
- Patch 4 now allows only GICv2 from EL1 and requires VHE for every other CPU interface, instead of adding GICv5 to the VHE list. Same behaviour; I kept Sascha's Reviewed-by. (Marc)
- Added Suzuki's Reviewed-by on patches 1-3.
Thanks Suzuki for the reviews.
Patches 1 and 2 move the GICv5 CPU interface save/restore and the stage-2 flushes into the band the dispatcher rejects once pKVM has finalised, since the host has no use for them in protected mode. Patch 3 validates the vgic model EL2 copies from the host. Patch 4 stops nVHE from accessing the GICv5 CPU interface from EL1, and patch 5 fixes two stale comments.
The GICv5 residency and VDPEND hypercalls in kvmarm/next still check for pKVM in each handler. I'll move them into the same band once this lands.
Based on Linux 7.3-rc3 (fd73f4a665989). On kvmarm/next, patches 1 and 2 have a minor conflict: new hypercall IDs sit next to the ones they move.
Cheers,
/fuad
[1] https://lore.kernel.org/all/[email protected]/
Fuad Tabba (5):
KVM: arm64: Reject the GICv5 CPU interface hypercalls under pKVM
KVM: arm64: Reject the stage-2 flush hypercalls under pKVM
KVM: arm64: Validate the host-provided vgic model in pKVM
KVM: arm64: vgic: Do not access the GICv5 CPU interface from EL1
KVM: arm64: Fix stale VGICv3 comments in the nVHE world switch
arch/arm64/include/asm/kvm_asm.h | 16 ++++++++-------- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 15 ++++++++------- arch/arm64/kvm/hyp/nvhe/pkvm.c | 10 ++++++++-- arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++-- arch/arm64/kvm/vgic/vgic.c | 7 +++---- 5 files changed, 29 insertions(+), 23 deletions(-)
base-commit: fd73f4a6659897191fa0d40695fe370925dd3780
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 1/5 KVM: arm64: Reject the GICv5 CPU interface hypercalls under pKVM
__vgic_v5_save_apr() and __vgic_v5_restore_vmcr_apr() remain callable once pKVM has finalised. pKVM never registers a GICv5 vgic, so neither has a valid caller in protected mode, and on a GICv3 machine both reach a register that is UNDEFINED at EL2 and panic the hypervisor.
Move both into the band the dispatcher rejects once pKVM has finalised.
--- arch/arm64/include/asm/kvm_asm.h | 4 ++-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/include/asm/kvm_asm.h +2 -2
@@ -62,6 +62,8 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs, __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs, __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config, + __KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr, + __KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr, MARKER(__KVM_HOST_SMCCC_FUNC_MIN_PKVM),
@@ -87,8 +89,6 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_write_event, __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs, __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs, - __KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr, - __KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr, MARKER(__KVM_HOST_SMCCC_FUNC_PKVM_ONLY),
arch/arm64/kvm/hyp/nvhe/hyp-main.c +2 -2
@@ -911,6 +911,8 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__kvm_enable_ssbs),HANDLE_FUNC (__vgic_v3_init_lrs),HANDLE_FUNC (__vgic_v3_get_gic_config), +HANDLE_FUNC (__vgic_v5_save_apr), +HANDLE_FUNC (__vgic_v5_restore_vmcr_apr),HANDLE_FUNC (__pkvm_prot_finalize), HANDLE_FUNC(__kvm_adjust_pc),
@@ -932,8 +934,6 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__tracing_write_event),HANDLE_FUNC (__vgic_v3_save_aprs),HANDLE_FUNC (__vgic_v3_restore_vmcr_aprs), -HANDLE_FUNC (__vgic_v5_save_apr), -HANDLE_FUNC (__vgic_v5_restore_vmcr_apr),HANDLE_FUNC (__pkvm_host_share_hyp), HANDLE_FUNC(__pkvm_host_unshare_hyp),
Signature · 1 line
2.39.5
Marc Zyngier
maintainerRe: [PATCH v3 1/5] KVM: arm64: Reject the GICv5 CPU interface hypercalls under pKVM
Quoted 52 lines · Fuad Tabba
__vgic_v5_save_apr()and__vgic_v5_restore_vmcr_apr()remain callable once pKVM has finalised. pKVM never registers a GICv5 vgic, so neither has a valid caller in protected mode, and on a GICv3 machine both reach a register that is UNDEFINED at EL2 and panic the hypervisor.Move both into the band the dispatcher rejects once pKVM has finalised.
Fixes af325e87af5da ("KVM: arm64: gic-v5: Add vgic-v5 save/restore hyp interface")Reviewed-by Suzuki K Poulose <[email protected]>Signed-off-by Fuad Tabba <[email protected]>--- arch/arm64/include/asm/kvm_asm.h | 4 ++-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)arch/arm64/include/asm/kvm_asm.h +2
-2@@ -62,6 +62,8 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs, __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs, __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config, + __KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr, + __KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr, MARKER(__KVM_HOST_SMCCC_FUNC_MIN_PKVM),@@ -87,8 +89,6 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_write_event, __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs, __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs, - __KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr, - __KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr, MARKER(__KVM_HOST_SMCCC_FUNC_PKVM_ONLY),arch/arm64/kvm/hyp/nvhe/hyp-main.c +2
-0@@ -911,6 +911,8 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__kvm_enable_ssbs),HANDLE_FUNC (__vgic_v3_init_lrs),HANDLE_FUNC (__vgic_v3_get_gic_config), +HANDLE_FUNC (__vgic_v5_save_apr), +HANDLE_FUNC (__vgic_v5_restore_vmcr_apr),HANDLE_FUNC (__pkvm_prot_finalize), HANDLE_FUNC(__kvm_adjust_pc),
arch/arm64/kvm/hyp/nvhe/hyp-main.c static const hcall_t host_hcall[] = { · line 939
Quoted 8 lines
arch/arm64/kvm/hyp/nvhe/hyp-main.c +0
-2@@ -932,8 +934,6 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__tracing_write_event),HANDLE_FUNC (__vgic_v3_save_aprs),HANDLE_FUNC (__vgic_v3_restore_vmcr_aprs), -HANDLE_FUNC (__vgic_v5_save_apr), -HANDLE_FUNC (__vgic_v5_restore_vmcr_apr),HANDLE_FUNC (__pkvm_host_share_hyp), HANDLE_FUNC(__pkvm_host_unshare_hyp),
In order to minimise the number of conflicts while merging this, I've dropped the last two hunks that only serve a cosmetic purpose. Same thing for the following patch.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Fuad Tabba
reviewerPATCH v3 2/5 KVM: arm64: Reject the stage-2 flush hypercalls under pKVM
In reply to Fuad TabbaThe stage-2 TLB and context flush hypercalls remain callable once pKVM has finalised, and five of the six dereference a host-supplied struct kvm_s2_mmu pointer. Under pKVM none has a valid caller: the host walks no guest stage-2, its TLB flushes go through the handle-based __pkvm_tlb_flush_vmid, and kvm_arch_vcpu_load() skips both the VMID update and the CPU context flush.
Move them into the band the dispatcher rejects once pKVM has finalised.
--- arch/arm64/include/asm/kvm_asm.h | 12 ++++++------ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-)
arch/arm64/include/asm/kvm_asm.h +6 -6
@@ -64,6 +64,12 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config, __KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr, __KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr, + __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context, + __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa, + __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa_nsh, + __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid, + __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_range, + __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context, MARKER(__KVM_HOST_SMCCC_FUNC_MIN_PKVM),
@@ -72,12 +78,6 @@ enum __kvm_host_smccc_func {/* Hypercalls that are always available and common to [nh]VHE/pKVM. */ __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc, __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run, - __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context, - __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa, - __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa_nsh, - __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid, - __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_range, - __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context, __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff, __KVM_HOST_SMCCC_FUNC___tracing_load, __KVM_HOST_SMCCC_FUNC___tracing_unload,
arch/arm64/kvm/hyp/nvhe/hyp-main.c +6 -5
@@ -913,16 +913,16 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__vgic_v3_get_gic_config),HANDLE_FUNC (__vgic_v5_save_apr),HANDLE_FUNC (__vgic_v5_restore_vmcr_apr), -HANDLE_FUNC (__pkvm_prot_finalize), - -HANDLE_FUNC (__kvm_adjust_pc), -HANDLE_FUNC (__kvm_vcpu_run),HANDLE_FUNC (__kvm_flush_vm_context),HANDLE_FUNC (__kvm_tlb_flush_vmid_ipa),HANDLE_FUNC (__kvm_tlb_flush_vmid_ipa_nsh),HANDLE_FUNC (__kvm_tlb_flush_vmid),HANDLE_FUNC (__kvm_tlb_flush_vmid_range),HANDLE_FUNC (__kvm_flush_cpu_context), +HANDLE_FUNC (__pkvm_prot_finalize), + +HANDLE_FUNC (__kvm_adjust_pc), +HANDLE_FUNC (__kvm_vcpu_run),HANDLE_FUNC (__kvm_timer_set_cntvoff),HANDLE_FUNC (__tracing_load), HANDLE_FUNC(__tracing_unload),
@@ -969,7 +969,8 @@ static void handle_host_hcall(struct kvm_cpu_context *host_ctxt)/* * If pKVM has been initialised then reject any calls to the -* early "privileged" hypercalls. Note that we cannot reject +* early "privileged" hypercalls, and to the ones the host has no +* use for in protected mode. Note that we cannot reject * calls to __pkvm_prot_finalize for two reasons: (1) The static * key used to determine initialisation must be toggled prior to * finalisation and (2) finalisation is performed on a per-CPU
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 3/5 KVM: arm64: Validate the host-provided vgic model in pKVM
In reply to Fuad TabbaEL2 copies vgic_model from the host's struct kvm unchecked, and the nVHE world switch dispatches on it with no cpucap guard. A host writing KVM_DEV_TYPE_ARM_VGIC_V5 makes EL2 access GICv5 CPU interface registers that are UNDEFINED without FEAT_GCIE, and panics the hypervisor on any GICv3 machine.
Accept only GICv3, the one model pKVM supports, and force anything else to 0, as for a VM with no in-kernel irqchip. EL2 reads the model only to pick the GICv5 world switch and to emulate GICv3 CPU interface accesses, and the host's own copy is left alone.
--- arch/arm64/kvm/hyp/nvhe/pkvm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/arm64/kvm/hyp/nvhe/pkvm.c +8 -2
@@ -340,13 +340,19 @@ static void pkvm_init_features_from_host(struct pkvm_hyp_vm *hyp_vm, const struc {struct kvm *kvm = &hyp_vm->kvm;unsigned long host_arch_flags =READ_ONCE (host_kvm->arch.flags); +u32 vgic_model =READ_ONCE (host_kvm->arch.vgic.vgic_model);DECLARE_BITMAP (allowed_features,KVM_VCPU_MAX_FEATURES );/* CTR_EL0 is always under host control, even for protected VMs. */ hyp_vm->kvm.arch.ctr_el0 = host_kvm->arch.ctr_el0; -/* Preserve the vgic model so that GICv3 emulation works */ - hyp_vm->kvm.arch.vgic.vgic_model = host_kvm->arch.vgic.vgic_model; +/* +* pKVM runs only GICv3. Anything else becomes 0, the model of a VM +* with no in-kernel irqchip, which keeps EL2 off the GICv5 registers. +*/ +if (vgic_model !=KVM_DEV_TYPE_ARM_VGIC_V3 ) + vgic_model =0 ; + hyp_vm->kvm.arch.vgic.vgic_model = vgic_model;/* No restrictions for non-protected VMs. */ if (!kvm_vm_is_protected (kvm)) {
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 4/5 KVM: arm64: vgic: Do not access the GICv5 CPU interface from EL1
In reply to Fuad Tabbacan_access_vgic_from_kernel() requires VHE only for the GICv3 system register interface, so on a native GICv5 system without FEAT_GCIE_LEGACY it returns true under nVHE. The kernel then saves and restores the CPU interface from EL1, where ICH_VMCR_EL2 and the ICH_PPI_* registers are UNDEFINED, and running a vCPU oopses the host. The nVHE world switch already does that work at EL2.
Anything that requires EL2 system registers or instructions is out of reach of a kernel running at EL1, which leaves GICv2, the one memory-mapped CPU interface. Allow GICv2 from EL1 and require VHE for everything else.
--- arch/arm64/kvm/vgic/vgic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm64/kvm/vgic/vgic.c +3 -4
@@ -1045,11 +1045,10 @@ static void vgic_flush_lr_state(struct kvm_vcpu *vcpu)static inline bool can_access_vgic_from_kernel (void ) {/* -* GICv2 can always be accessed from the kernel because it is -* memory-mapped, and VHE systems can access GICv3 EL2 system -* registers. +* GICv2 is memory-mapped. Every other CPU interface uses EL2 system +* registers, which only VHE can access from the kernel. */ -return !static_branch_unlikely (&kvm_vgic_global_state.gicv3_cpuif) ||has_vhe (); +return has_vhe () || kvm_vgic_global_state.type ==VGIC_V2 ; }static inline void vgic_save_state (struct kvm_vcpu *vcpu)
Signature · 1 line
2.39.5
Fuad Tabba
reviewerPATCH v3 5/5 KVM: arm64: Fix stale VGICv3 comments in the nVHE world switch
In reply to Fuad Tabba__hyp_vgic_save_state() and __hyp_vgic_restore_state() handle GICv5 as well as GICv3, but their comments name VGICv3 only.
--- arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kvm/hyp/nvhe/switch.c +2 -2
@@ -110,7 +110,7 @@ static void __deactivate_traps(struct kvm_vcpu *vcpu)write_sysreg (__kvm_hyp_host_vector, vbar_el2); } -/* Save VGICv3 state on non-VHE systems */ +/* Save vgic state on non-VHE systems */ static void __hyp_vgic_save_state (struct kvm_vcpu *vcpu) {if (vgic_is_v5 (kern_hyp_va (vcpu->kvm))) {
@@ -125,7 +125,7 @@ static void __hyp_vgic_save_state(struct kvm_vcpu *vcpu) } } -/* Restore VGICv3 state on non-VHE systems */ +/* Restore vgic state on non-VHE systems */ static void __hyp_vgic_restore_state (struct kvm_vcpu *vcpu) {if (vgic_is_v5 (kern_hyp_va (vcpu->kvm))) {
Signature · 1 line
2.39.5
Quoted 9 lines · Fuad Tabba
Changes since v2 [1]:
- Patch 4 now allows only GICv2 from EL1 and requires VHE for every other CPU interface, instead of adding GICv5 to the VHE list. Same behaviour; I kept Sascha's Reviewed-by. (Marc)
- Added Suzuki's Reviewed-by on patches 1-3.Thanks Suzuki for the reviews.
[...]
Applied to fixes, thanks!
[1/5] KVM: arm64: Reject the GICv5 CPU interface hypercalls under pKVM
commit: ecb6b43cd22245296d910cb392594c9e33691b87
[2/5] KVM: arm64: Reject the stage-2 flush hypercalls under pKVM
commit: 121d74bee8cd81ce9212837db98ceaef2e530637
[3/5] KVM: arm64: Validate the host-provided vgic model in pKVM
commit: fb77bb2a0ff253e6c370ec7dc1afa45b2ecd8d2e
[4/5] KVM: arm64: vgic: Do not access the GICv5 CPU interface from EL1
commit: cd38c10e191eb2c37b9904a6ffc3b6bf4d9c0c48
[5/5] KVM: arm64: Fix stale VGICv3 comments in the nVHE world switch
commit: 7ad25ad110608320348669488297e06ea8c72f85Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.