On Wed, Mar 11, 2020 at 1:38 PM Jethro Beekman <jethro@xxxxxxxxxxxx> wrote: > > On 2020-03-11 18:30, Nathaniel McCallum wrote: > > On Tue, Mar 3, 2020 at 6:40 PM Jarkko Sakkinen > > <jarkko.sakkinen@xxxxxxxxxxxxxxx> wrote: > >> > >> From: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > >> > >> An SGX runtime must be aware of the exceptions, which happen inside an > >> enclave. Introduce a vDSO call that wraps EENTER/ERESUME cycle and returns > >> the CPU exception back to the caller exactly when it happens. > >> > >> Kernel fixups the exception information to RDI, RSI and RDX. The SGX call > >> vDSO handler fills this information to the user provided buffer or > >> alternatively trigger user provided callback at the time of the exception. > >> > >> The calling convention is custom and does not follow System V x86-64 ABI. > >> > >> Suggested-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx> > >> Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > >> Co-developed-by: Cedric Xing <cedric.xing@xxxxxxxxx> > >> Signed-off-by: Cedric Xing <cedric.xing@xxxxxxxxx> > >> Tested-by: Jethro Beekman <jethro@xxxxxxxxxxxx> > >> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> > >> --- > >> arch/x86/entry/vdso/Makefile | 2 + > >> arch/x86/entry/vdso/vdso.lds.S | 1 + > >> arch/x86/entry/vdso/vsgx_enter_enclave.S | 187 +++++++++++++++++++++++ > >> arch/x86/include/uapi/asm/sgx.h | 37 +++++ > >> 4 files changed, 227 insertions(+) > >> create mode 100644 arch/x86/entry/vdso/vsgx_enter_enclave.S > >> > >> diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile > >> index 657e01d34d02..fa50c76a17a8 100644 > >> --- a/arch/x86/entry/vdso/Makefile > >> +++ b/arch/x86/entry/vdso/Makefile > >> @@ -24,6 +24,7 @@ VDSO32-$(CONFIG_IA32_EMULATION) := y > >> > >> # files to link into the vdso > >> vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o > >> +vobjs-$(VDSO64-y) += vsgx_enter_enclave.o > >> > >> # files to link into kernel > >> obj-y += vma.o extable.o > >> @@ -90,6 +91,7 @@ $(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS > >> CFLAGS_REMOVE_vclock_gettime.o = -pg > >> CFLAGS_REMOVE_vdso32/vclock_gettime.o = -pg > >> CFLAGS_REMOVE_vgetcpu.o = -pg > >> +CFLAGS_REMOVE_vsgx_enter_enclave.o = -pg > >> > >> # > >> # X32 processes use x32 vDSO to access 64bit kernel data. > >> diff --git a/arch/x86/entry/vdso/vdso.lds.S b/arch/x86/entry/vdso/vdso.lds.S > >> index 36b644e16272..4bf48462fca7 100644 > >> --- a/arch/x86/entry/vdso/vdso.lds.S > >> +++ b/arch/x86/entry/vdso/vdso.lds.S > >> @@ -27,6 +27,7 @@ VERSION { > >> __vdso_time; > >> clock_getres; > >> __vdso_clock_getres; > >> + __vdso_sgx_enter_enclave; > >> local: *; > >> }; > >> } > >> diff --git a/arch/x86/entry/vdso/vsgx_enter_enclave.S b/arch/x86/entry/vdso/vsgx_enter_enclave.S > >> new file mode 100644 > >> index 000000000000..94a8e5f99961 > >> --- /dev/null > >> +++ b/arch/x86/entry/vdso/vsgx_enter_enclave.S > >> @@ -0,0 +1,187 @@ > >> +/* SPDX-License-Identifier: GPL-2.0 */ > >> + > >> +#include <linux/linkage.h> > >> +#include <asm/export.h> > >> +#include <asm/errno.h> > >> + > >> +#include "extable.h" > >> + > >> +#define EX_LEAF 0*8 > >> +#define EX_TRAPNR 0*8+4 > >> +#define EX_ERROR_CODE 0*8+6 > >> +#define EX_ADDRESS 1*8 > >> + > >> +.code64 > >> +.section .text, "ax" > >> + > >> +/** > >> + * __vdso_sgx_enter_enclave() - Enter an SGX enclave > >> + * @leaf: ENCLU leaf, must be EENTER or ERESUME > >> + * @tcs: TCS, must be non-NULL > >> + * @e: Optional struct sgx_enclave_exception instance > >> + * @handler: Optional enclave exit handler > >> + * > >> + * **Important!** __vdso_sgx_enter_enclave() is **NOT** compliant with the > >> + * x86-64 ABI, i.e. cannot be called from standard C code. > >> + * > >> + * Input ABI: > >> + * @leaf %eax > >> + * @tcs 8(%rsp) > >> + * @e 0x10(%rsp) > >> + * @handler 0x18(%rsp) > >> + * > >> + * Output ABI: > >> + * @ret %eax > >> + * > >> + * All general purpose registers except RAX, RBX and RCX are passed as-is to > >> + * the enclave. RAX, RBX and RCX are consumed by EENTER and ERESUME and are > >> + * loaded with @leaf, asynchronous exit pointer, and @tcs respectively. > >> + * > >> + * RBP and the stack are used to anchor __vdso_sgx_enter_enclave() to the > >> + * pre-enclave state, e.g. to retrieve @e and @handler after an enclave exit. > >> + * All other registers are available for use by the enclave and its runtime, > >> + * e.g. an enclave can push additional data onto the stack (and modify RSP) to > >> + * pass information to the optional exit handler (see below). > >> + * > >> + * Most exceptions reported on ENCLU, including those that occur within the > >> + * enclave, are fixed up and reported synchronously instead of being delivered > >> + * via a standard signal. Debug Exceptions (#DB) and Breakpoints (#BP) are > >> + * never fixed up and are always delivered via standard signals. On synchrously > >> + * reported exceptions, -EFAULT is returned and details about the exception are > >> + * recorded in @e, the optional sgx_enclave_exception struct. > >> + > >> + * If an exit handler is provided, the handler will be invoked on synchronous > >> + * exits from the enclave and for all synchronously reported exceptions. In > >> + * latter case, @e is filled prior to invoking the handler. > >> + * > >> + * The exit handler's return value is interpreted as follows: > >> + * >0: continue, restart __vdso_sgx_enter_enclave() with @ret as @leaf > >> + * 0: success, return @ret to the caller > >> + * <0: error, return @ret to the caller > >> + * > >> + * The userspace exit handler is responsible for unwinding the stack, e.g. to > >> + * pop @e, u_rsp and @tcs, prior to returning to __vdso_sgx_enter_enclave(). > >> + * The exit handler may also transfer control, e.g. via longjmp() or a C++ > >> + * exception, without returning to __vdso_sgx_enter_enclave(). > >> + * > >> + * Return: > >> + * 0 on success, > >> + * -EINVAL if ENCLU leaf is not allowed, > >> + * -EFAULT if an exception occurs on ENCLU or within the enclave > >> + * -errno for all other negative values returned by the userspace exit handler > >> + */ > >> +#ifdef SGX_KERNEL_DOC > >> +/* C-style function prototype to coerce kernel-doc into parsing the comment. */ > >> +int __vdso_sgx_enter_enclave(int leaf, void *tcs, > >> + struct sgx_enclave_exception *e, > >> + sgx_enclave_exit_handler_t handler); > >> +#endif > >> +SYM_FUNC_START(__vdso_sgx_enter_enclave) > > > > Currently, the selftest has a wrapper around > > __vdso_sgx_enter_enclave() which preserves all x86-64 ABI callee-saved > > registers (CSRs), though it uses none of them. Then it calls this > > function which uses %rbx but preserves none of the CSRs. Then it jumps > > into an enclave which zeroes all these registers before returning. > > Thus: > > > > 1. wrapper saves all CSRs > > 2. wrapper repositions stack arguments > > 3. __vdso_sgx_enter_enclave() modifies, but does not save %rbx > > 4. selftest zeros all CSRs > > 5. wrapper loads all CSRs > > > > I'd like to propose instead that the enclave be responsible for saving > > and restoring CSRs. So instead of the above we have: > > 1. __vdso_sgx_enter_enclave() saves %rbx > > 2. enclave saves CSRs > > 3. enclave loads CSRs > > 4. __vdso_sgx_enter_enclave() loads %rbx > > > > I know that lots of other stuff happens during enclave transitions, > > but at the very least we could reduce the number of instructions > > through this critical path. > > The current calling convention for __vdso_sgx_enter_enclave has been carefully designed to mimic just calling ENCLU[EENTER] as closely as possible. That seems like a reasonable contract. Thanks!