@@ -53,12 +53,12 @@
* -EFAULT if ENCL or the enclave faults or non-positive value is returned
* from the callback.
*/
-typedef int (*sgx_callback)(long rdi, long rsi, long rdx, int ret,
- long r8, long r9, void *tcs, long ursp,
- struct sgx_enclave_exception *e);
+typedef int (*sgx_enclave_exit_handler_t)(long rdi, long rsi, long rdx, int ret,
+ long r8, long r9, void *tcs, long ursp,
+ struct sgx_enclave_exception *e);
int __vdso_sgx_enter_enclave(int leaf, void *tcs,
struct sgx_enclave_exception *e,
- sgx_callback callback);
+ sgx_enclave_exit_handler_t handler);
#endif
ENTRY(__vdso_sgx_enter_enclave)
/* Prolog */
@@ -86,17 +86,17 @@ ENTRY(__vdso_sgx_enter_enclave)
xor %eax, %eax
3: mov %eax, %ecx
- /* Call *callback if supplied */
+ /* Call the exit handler if supplied */
mov 0x20(%rbp), %rax
test %rax, %rax
jz 7f
/* Align stack per x86_64 ABI. The original %rsp is saved in %rbx to be
- * restored after *callback returns. */
+ * restored after the exit handler returns. */
mov %rsp, %rbx
and $-0x10, %rsp
/* Clear RFLAGS.DF per x86_64 ABI */
cld
- /* Parameters for *callback */
+ /* Parameters for the exit handler */
push 0x18(%rbp)
push %rbx
push 0x10(%rbp)
@@ -105,9 +105,9 @@ ENTRY(__vdso_sgx_enter_enclave)
/* Restore %rsp to its original value left off by the enclave from last
* exit */
mov %rbx, %rsp
- /* Positive return value from *callback will be interpreted as an ENCLU
- * leaf, while a non-positive value will be interpreted as the return
- * value to be passed back to the caller. */
+ /* Positive return value from the exit handler will be interpreted as
+ * an ENCLU leaf, while a non-positive value will be interpreted as the
+ * return value to be passed back to the caller. */
jmp 1b
40: /* retpoline */
call 42f
Rename the exit handler callback to sgx_enclave_exit_handler_t so that the name itself describes the purpose of the function to some extent. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/entry/vdso/vsgx_enter_enclave.S | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)