Commit 069da3ff authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: nv: Load guest hyp's ZCR into EL1 state 



Load the guest hypervisor's ZCR_EL2 into the corresponding EL1 register
when restoring SVE state, as ZCR_EL2 affects the VL in the hypervisor
context.

Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240620164653.1130714-5-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent b3d29a82

arch/arm64/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -868,6 +868,9 @@ struct kvm_vcpu_arch { 


#define vcpu_sve_max_vq(vcpu)	sve_vq_from_vl((vcpu)->arch.sve_max_vl)



#define vcpu_sve_zcr_elx(vcpu)						\

	(unlikely(is_hyp_ctxt(vcpu)) ? ZCR_EL2 : ZCR_EL1)



#define vcpu_sve_state_size(vcpu) ({					\

	size_t __size_ret;						\

	unsigned int __vcpu_vq;						\

arch/arm64/kvm/hyp/include/hyp/switch.h

+2 −1
Original line number Diff line number Diff line
@@ -318,7 +318,8 @@ static inline void __hyp_sve_restore_guest(struct kvm_vcpu *vcpu) 
	__sve_restore_state(vcpu_sve_pffr(vcpu),

			    &vcpu->arch.ctxt.fp_regs.fpsr,

			    true);

	write_sysreg_el1(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR);



	write_sysreg_el1(__vcpu_sys_reg(vcpu, vcpu_sve_zcr_elx(vcpu)), SYS_ZCR);

}



static inline void __hyp_sve_save_host(void)