On Tue, Jan 26, 2021 at 10:31:04PM +1300, Kai Huang wrote:
> From: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
>
> Add a helper to extract the fault indicator from an encoded ENCLS return
> value. SGX virtualization will also need to detect ENCLS faults.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
> Acked-by: Dave Hansen <dave.hansen@xxxxxxxxx>
> Signed-off-by: Kai Huang <kai.huang@xxxxxxxxx>
Acked-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
/Jarkko
> ---
> v2->v3:
>
> - Changed commenting style for return value, per Jarkko.
>
> ---
> arch/x86/kernel/cpu/sgx/encls.h | 15 ++++++++++++++-
> arch/x86/kernel/cpu/sgx/ioctl.c | 2 +-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/sgx/encls.h b/arch/x86/kernel/cpu/sgx/encls.h
> index be5c49689980..3219d011ee28 100644
> --- a/arch/x86/kernel/cpu/sgx/encls.h
> +++ b/arch/x86/kernel/cpu/sgx/encls.h
> @@ -40,6 +40,19 @@
> } while (0); \
> }
>
> +/*
> + * encls_faulted() - Check if an ENCLS leaf faulted given an error code
> + * @ret the return value of an ENCLS leaf function call
> + *
> + * Return:
> + * - true: ENCLS leaf faulted.
> + * - false: Otherwise.
> + */
> +static inline bool encls_faulted(int ret)
> +{
> + return ret & ENCLS_FAULT_FLAG;
> +}
> +
> /**
> * encls_failed() - Check if an ENCLS function failed
> * @ret: the return value of an ENCLS function call
> @@ -50,7 +63,7 @@
> */
> static inline bool encls_failed(int ret)
> {
> - if (ret & ENCLS_FAULT_FLAG)
> + if (encls_faulted(ret))
> return ENCLS_TRAPNR(ret) != X86_TRAP_PF;
>
> return !!ret;
> diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
> index 90a5caf76939..e5977752c7be 100644
> --- a/arch/x86/kernel/cpu/sgx/ioctl.c
> +++ b/arch/x86/kernel/cpu/sgx/ioctl.c
> @@ -568,7 +568,7 @@ static int sgx_encl_init(struct sgx_encl *encl, struct sgx_sigstruct *sigstruct,
> }
> }
>
> - if (ret & ENCLS_FAULT_FLAG) {
> + if (encls_faulted(ret)) {
> if (encls_failed(ret))
> ENCLS_WARN(ret, "EINIT");
>
> --
> 2.29.2
>
>
