Commit e511e08a authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Specialize handling of host fpsimd state on trap 



In subsequent patches, n/vhe will diverge on saving the host
fpsimd/sve state when taking a guest fpsimd/sve trap. Add a
specialized helper to handle it.

No functional change intended.

Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20240603122852.3923848-5-tabba@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 6d8fb3cb

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

+3 −1
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ static inline void __hyp_sve_restore_guest(struct kvm_vcpu *vcpu) 
	write_sysreg_el1(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR);

}



static void kvm_hyp_save_fpsimd_host(struct kvm_vcpu *vcpu);



/*

 * We trap the first access to the FP/SIMD to save the host context and

 * restore the guest context lazily.
@@ -361,7 +363,7 @@ static bool kvm_hyp_handle_fpsimd(struct kvm_vcpu *vcpu, u64 *exit_code) 


	/* Write out the host state if it's in the registers */

	if (host_owns_fp_regs())

		__fpsimd_save_state(*host_data_ptr(fpsimd_state));

		kvm_hyp_save_fpsimd_host(vcpu);



	/* Restore the guest state */

	if (sve_guest)

arch/arm64/kvm/hyp/nvhe/switch.c

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ static bool kvm_handle_pvm_sys64(struct kvm_vcpu *vcpu, u64 *exit_code) 
		kvm_handle_pvm_sysreg(vcpu, exit_code));

}



static void kvm_hyp_save_fpsimd_host(struct kvm_vcpu *vcpu)

{

	__fpsimd_save_state(*host_data_ptr(fpsimd_state));

}



static const exit_handler_fn hyp_exit_handlers[] = {

	[0 ... ESR_ELx_EC_MAX]		= NULL,

	[ESR_ELx_EC_CP15_32]		= kvm_hyp_handle_cp15_32,

arch/arm64/kvm/hyp/vhe/switch.c

+5 −0
Original line number Diff line number Diff line
@@ -262,6 +262,11 @@ static bool kvm_hyp_handle_eret(struct kvm_vcpu *vcpu, u64 *exit_code) 
	return true;

}



static void kvm_hyp_save_fpsimd_host(struct kvm_vcpu *vcpu)

{

	__fpsimd_save_state(*host_data_ptr(fpsimd_state));

}



static const exit_handler_fn hyp_exit_handlers[] = {

	[0 ... ESR_ELx_EC_MAX]		= NULL,

	[ESR_ELx_EC_CP15_32]		= kvm_hyp_handle_cp15_32,