[PATCH v3 22/32] KVM: arm64: Refactor __populate_fault_info()

[Will Deacon]

On Tue, Mar 02, 2021 at 02:59:52PM +0000, Quentin Perret wrote:
> Refactor __populate_fault_info() to introduce __get_fault_info() which
> will be used once the host is wrapped in a stage 2.
> 
> Signed-off-by: Quentin Perret <qperret at google.com>
> ---
>  arch/arm64/kvm/hyp/include/hyp/switch.h | 37 ++++++++++++++-----------
>  1 file changed, 21 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
> index 6c1f51f25eb3..1f017c9851bb 100644
> --- a/arch/arm64/kvm/hyp/include/hyp/switch.h
> +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
> @@ -160,19 +160,9 @@ static inline bool __translate_far_to_hpfar(u64 far, u64 *hpfar)
>  	return true;
>  }
>  
> -static inline bool __populate_fault_info(struct kvm_vcpu *vcpu)
> +static inline bool __get_fault_info(u64 esr, struct kvm_vcpu_fault_info *fault)
>  {
> -	u8 ec;
> -	u64 esr;
> -	u64 hpfar, far;
> -
> -	esr = vcpu->arch.fault.esr_el2;
> -	ec = ESR_ELx_EC(esr);
> -
> -	if (ec != ESR_ELx_EC_DABT_LOW && ec != ESR_ELx_EC_IABT_LOW)
> -		return true;
> -
> -	far = read_sysreg_el2(SYS_FAR);
> +	fault->far_el2 = read_sysreg_el2(SYS_FAR);
>  
>  	/*
>  	 * The HPFAR can be invalid if the stage 2 fault did not
> @@ -188,14 +178,29 @@ static inline bool __populate_fault_info(struct kvm_vcpu *vcpu)
>  	if (!(esr & ESR_ELx_S1PTW) &&
>  	    (cpus_have_final_cap(ARM64_WORKAROUND_834220) ||
>  	     (esr & ESR_ELx_FSC_TYPE) == FSC_PERM)) {
> -		if (!__translate_far_to_hpfar(far, &hpfar))
> +		if (!__translate_far_to_hpfar(fault->far_el2, &fault->hpfar_el2))
>  			return false;
>  	} else {
> -		hpfar = read_sysreg(hpfar_el2);
> +		fault->hpfar_el2 = read_sysreg(hpfar_el2);
>  	}
>  
> -	vcpu->arch.fault.far_el2 = far;
> -	vcpu->arch.fault.hpfar_el2 = hpfar;
> +	return true;
> +}
> +
> +static inline bool __populate_fault_info(struct kvm_vcpu *vcpu)
> +{
> +	u8 ec;
> +	u64 esr;
> +
> +	esr = vcpu->arch.fault.esr_el2;
> +	ec = ESR_ELx_EC(esr);
> +
> +	if (ec != ESR_ELx_EC_DABT_LOW && ec != ESR_ELx_EC_IABT_LOW)
> +		return true;
> +
> +	if (!__get_fault_info(esr, &vcpu->arch.fault))
> +		return false;
> +
>  	return true;

Just return __get_fault_info(esr, &vcpu->arch.fault); here.

With that:

Acked-by: Will Deacon <will at kernel.org>

Will