This patchset is based upon, and can be applied cleanly on SGX1 patch v20
(https://lkml.org/lkml/2019/4/17/344) by Jarkko Sakkinen.
The current proposed __vdso_sgx_enter_enclave() requires enclaves to preserve
%rsp, which prohibits enclaves from allocating space on the untrusted stack.
However, there are existing enclaves (e.g. those built with current Intel SGX
SDK libraries) relying on the untrusted stack for passing parameters to
untrusted functions (aka. o-calls), which requires allocating space on the
untrusted stack by enclaves. After all, passing data via untrusted stack is
very easy to implement (by enclaves), with essentially no overhead, therefore
is very suitable for exchanging data in small amounts, so could be desirable by
future SGX applications as well.
This patchset introduces a new ABI for __vdso_sgx_enter_enclave() to anchor its
stack frame on %rbp (instead of %rsp), so as to allow enclaves to "push" onto
the untrusted stack by decrementing the untrusted %rsp. And in order to service
o-calls and to preserve the untrusted stack upon exceptions, the new vDSO API
takes one more optional parameter - "callback", which if supplied, will be
invoked on all enclave exits (including normal and asynchronous exits). Ample
details regarding the new ABI have been documented as comments inside the
source code located in arch/x86/entry/vsgx_enter_enclave.S
Please note that there was a lengthy discussion on what is the "best" approach
for passing parameters for trusted/untrusted calls. Unfortunately there's no
single "best" approach that fits all use cases, hence this new ABI has been
designed intentionally to accommodate varieties. Therefore, to those not
interested in using the untrusted stack, whatever worked with the old ABI
proposed by Sean will continue to work with this new ABI.
The SGX selftest has been augmented by two new tests. One exercises the new
callback interface, and serves as a simple example to showcase how to use it;
while the other validates the hand-crafted CFI directives in
__vdso_sgx_enter_enclave() by single-stepping through it and unwinding call
stack at every instruction.
Changelog:
· This is version 4 of this patch series with the following changes.
- Removed unrelated cosmetic changes.
- Rewrote and reformatted comments in
arch/x86/entry/vdso/vsgx_enter_enclave.S to follow kernel-doc
conventions. New comments now can be converted to nice looking man pages.
- Fixed minor issues in the unwinding selftest and now it can run to
completion successfully with Sean's fix in vDSO fixup code
(https://patchwork.kernel.org/patch/11040801/). Comments have also been
added to describe the tests done.
· v3 - https://patchwork.kernel.org/cover/11039263/
· v2 - https://patchwork.kernel.org/cover/10914161/
· v1 - https://patchwork.kernel.org/cover/10911615/
Cedric Xing (3):
selftests/x86/sgx: Fix Makefile for SGX selftest
x86/vdso: Modify __vdso_sgx_enter_enclave() to allow parameter passing
on untrusted stack
selftests/x86/sgx: Augment SGX selftest to test vDSO API
arch/x86/entry/vdso/vsgx_enter_enclave.S | 310 ++++++++++++++-----
arch/x86/include/uapi/asm/sgx.h | 14 +-
tools/testing/selftests/x86/sgx/Makefile | 49 ++-
tools/testing/selftests/x86/sgx/main.c | 344 ++++++++++++++++++---
tools/testing/selftests/x86/sgx/sgx_call.S | 40 ++-
5 files changed, 600 insertions(+), 157 deletions(-)
--
2.17.1