From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Nathaniel McCallum <npmccallum@redhat.com>,
Cedric Xing <cedric.xing@intel.com>,
Jethro Beekman <jethro@fortanix.com>,
Andy Lutomirski <luto@amacapital.net>,
linux-sgx@vger.kernel.org
Subject: [PATCH for_v29 3/8] x86/sgx: vdso: Make __vdso_sgx_enter_enclave() callable from C code
Date: Wed, 18 Mar 2020 18:11:25 -0700 [thread overview]
Message-ID: <20200319011130.8556-4-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20200319011130.8556-1-sean.j.christopherson@intel.com>
Make __vdso_sgx_enter_enclave() callable from C by preserving %rbx
and taking @leaf in %rcx instead of %rax. Being able to invoke the vDSO
from C reduces the overhead of runtimes that are tightly coupled with
their enclaves, e.g. that can rely on the enclave to save and restore
non-volatile registers, as the runtime doesn't need an assembly wrapper
to preserve non-volatile registers and/or shuffle stack arguments.
Note, both %rcx and %rbx are consumed by EENTER/ERESUME, i.e. consuming
them doesn't violate the primary tenet of __vdso_sgx_enter_enclave()
that "thou shalt not restrict how information is exchanged between an
enclave and its host process".
Suggested-by: Nathaniel McCallum <npmccallum@redhat.com>
Cc: Cedric Xing <cedric.xing@intel.com>
Cc: Jethro Beekman <jethro@fortanix.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: linux-sgx@vger.kernel.org
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
Cedric, please go to town on this, you're much better at the userspace
stack and debugging interactions, e.g. I don't think the CFA directives
need updating, but my knowledge of that stuff is skeeetchy.
Note, if the previous patch to make the %rsp restoration relative is
dropped, then %rbx should be restored relative to %rbp instead of %rsp.
arch/x86/entry/vdso/vsgx_enter_enclave.S | 33 ++++++++++++++----------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/arch/x86/entry/vdso/vsgx_enter_enclave.S b/arch/x86/entry/vdso/vsgx_enter_enclave.S
index 14f07d5e47ae..7a0565476a29 100644
--- a/arch/x86/entry/vdso/vsgx_enter_enclave.S
+++ b/arch/x86/entry/vdso/vsgx_enter_enclave.S
@@ -16,25 +16,25 @@
/**
* __vdso_sgx_enter_enclave() - Enter an SGX enclave
+ * @rdi: Pass-through value for RDI
+ * @rsi: Pass-through value for RSI
+ * @rdx: Pass-through value for RDX
* @leaf: ENCLU leaf, must be EENTER or ERESUME
+ * @r8: Pass-through value for R8
+ * @r9: Pass-through value for R9
* @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
+ * **Important!** __vdso_sgx_enter_enclave() does not ensure full compliance
+ * with the x86-64 ABI, e.g. doesn't explicitly clear EFLAGS.DF after EEXIT.
+ * Except for non-volatile general purpose registers, preserving/setting state
+ * in accordance with the x86-64 ABI is the responsibility of the enclave and
+ * its runtime, i.e. __vdso_sgx_enter_enclave() cannot be called from C code
+ * without careful consideration by both the enclave and its runtime.
*
* 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
+ * 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
@@ -70,9 +70,11 @@
*/
#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,
+int __vdso_sgx_enter_enclave(unsigned long rdi, unsigned long rsi,
+ unsigned long rdx, unsigned int leaf,
+ unsigned long r8, unsigned long r9, void *tcs,
struct sgx_enclave_exception *e,
- sgx_enclave_exit_handler_t handler);
+ sgx_enclave_exit_handler_t handler)
#endif
SYM_FUNC_START(__vdso_sgx_enter_enclave)
/* Prolog */
@@ -82,7 +84,9 @@ SYM_FUNC_START(__vdso_sgx_enter_enclave)
.cfi_rel_offset %rbp, 0
mov %rsp, %rbp
.cfi_def_cfa_register %rbp
+ push %rbx
+ mov %ecx, %eax
.Lenter_enclave:
/* EENTER <= leaf <= ERESUME */
cmp $0x2, %eax
@@ -108,6 +112,7 @@ SYM_FUNC_START(__vdso_sgx_enter_enclave)
jne .Linvoke_userspace_handler
.Lout:
+ pop %rbx
leave
.cfi_def_cfa %rsp, 8
ret
--
2.24.1
next prev parent reply other threads:[~2020-03-19 1:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 1:11 [PATCH for_v29 0/8] x86/sgx: Make vDSO callable from C Sean Christopherson
2020-03-19 1:11 ` [PATCH for_v29 1/8] x86/sgx: vdso: Remove an incorrect statement the enter enclave comment Sean Christopherson
2020-03-19 20:49 ` Jarkko Sakkinen
2020-03-19 1:11 ` [PATCH for_v29 2/8] x86/sgx: vdso: Make the %rsp fixup on return from handler relative Sean Christopherson
2020-03-20 2:39 ` Jarkko Sakkinen
2020-03-20 2:42 ` Jarkko Sakkinen
2020-03-19 1:11 ` Sean Christopherson [this message]
2020-03-19 20:03 ` [PATCH for_v29 3/8] x86/sgx: vdso: Make __vdso_sgx_enter_enclave() callable from C code Xing, Cedric
2020-03-19 20:11 ` Sean Christopherson
2020-03-20 3:07 ` Jarkko Sakkinen
2020-03-20 23:26 ` Sean Christopherson
2020-03-21 0:57 ` Jarkko Sakkinen
2020-03-19 1:11 ` [PATCH for_v29 4/8] x86/sgx: vdso: Define a typedef for __vdso_sgx_enter_enclave Sean Christopherson
2020-03-19 1:11 ` [PATCH for_v29 5/8] selftests/x86: sgx: Zero out @result before invoking vDSO sub-test Sean Christopherson
2020-03-19 1:11 ` [PATCH for_v29 6/8] selftests/x86: sgx: Pass EENTER to vDSO wrapper instead of hardcoding Sean Christopherson
2020-03-19 1:11 ` [PATCH for_v29 7/8] selftests/x86: sgx: Stop clobbering non-volatile registers Sean Christopherson
2020-03-19 1:11 ` [PATCH for_v29 8/8] selftests/x86: Add selftest to invoke __vsgx_enter_enclave() from C Sean Christopherson
2020-03-20 0:57 ` [PATCH for_v29 0/8] x86/sgx: Make vDSO callable " Jarkko Sakkinen
2020-03-20 23:25 ` Sean Christopherson
2020-03-21 0:55 ` Jarkko Sakkinen
2020-03-21 20:11 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200319011130.8556-4-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=cedric.xing@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jethro@fortanix.com \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=npmccallum@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).