Commit a67136b4 authored by Sean Christopherson's avatar Sean Christopherson Committed by Borislav Petkov
Browse files

x86/sgx: Add encls_faulted() helper 



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: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarKai Huang <kai.huang@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Acked-by: default avatarDave Hansen <dave.hansen@intel.com>
Link: https://lkml.kernel.org/r/c1f955898110de2f669da536fc6cf62e003dff88.1616136308.git.kai.huang@intel.com
parent 32ddda8e

arch/x86/kernel/cpu/sgx/encls.h

+14 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/cpu/sgx/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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");