clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-10-04 16:08:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[LibOS] Make clone ABI match kernel and update glibc patch

Browse Source 
glibc: remove unnecessary pushq/popq so that shim_clone can run without segv.
This is a preparation for later patch to clean up shim_clone() to
remove glibc modification.
libos: Currently child thread ret ip is taken from new child stack.
But it can be retrieved from parent's thread context, so such a hack
isn't needed.
Now the modification to clone.S is not needed anymore. So remove it.
This commit is contained in:
Isaku Yamahata
2019-05-08 02:04:33 +02:00
committed by Michał Kowalczyk
parent 4ae620f87b
commit b7907fa83d
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibOS/glibc-2.19.patch
+2 -28
View File
@@ -1368,36 +1368,14 @@ diff --git a/sysdeps/unix/sysv/linux/x86_64/clone.S b/sysdeps/unix/sysv/linux/x8
index 0508730..e1b35ec 100644
--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
+++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
@@ -59,11 +59,15 @@ ENTRY (__clone)
jz SYSCALL_ERROR_LABEL
/* Insert the argument onto the new stack. */
- subq $16,%rsi
- movq %rcx,8(%rsi)
+ subq $24,%rsi
+ movq %rcx,16(%rsi)
/* Save the function pointer. It will be popped off in the
child in the ebx frobbing below. */
+ movq %rdi,8(%rsi)
+
+ /* Push an additional pointer as return address into the stack */
+ leaq L(clone_return)(%rip),%rdi
movq %rdi,0(%rsi)
/* Do the system call. */
@@ -76,8 +80,9 @@ ENTRY (__clone)
@@ -76,5 +80,5 @@ ENTRY (__clone)
/* End FDE now, because in the child the unwind info will be
wrong. */
cfi_endproc;
- syscall
+ SYSCALLDB
+L(clone_return):
testq %rax,%rax
jl SYSCALL_ERROR_LABEL
jz L(thread_start)
@@ -99,13 +104,14 @@ L(thread_start):
@@ -99,10 +104,10 @@ L(thread_start):
movl $-1, %eax
jne 2f
movl $SYS_ify(getpid), %eax
@@ -1409,10 +1387,6 @@ index 0508730..e1b35ec 100644
#endif
/* Set up arguments for the function call. */
+ addq $8,%rsp /* Skip the return address */
popq %rax /* Function to call. */
popq %rdi /* Argument. */
call *%rax
diff --git a/sysdeps/unix/sysv/linux/x86_64/getcontext.S b/sysdeps/unix/sysv/linux/x86_64/getcontext.S
index 140db03..6967f10 100644
--- a/sysdeps/unix/sysv/linux/x86_64/getcontext.S
LibOS/shim/src/sys/shim_clone.c
+2 -2
View File
@@ -270,7 +270,7 @@ int shim_do_clone (int flags, void * user_stack_addr, int * parent_tidptr,
thread->stack_top = vma.addr + vma.length;
thread->stack_red = thread->stack = vma.addr;
tcb->shim_tcb.context.sp = user_stack_addr;
tcb->shim_tcb.context.ret_ip = *(void **) user_stack_addr;
tcb->shim_tcb.context.ret_ip = shim_get_tls()->context.ret_ip;
}
thread->is_alive = true;
@@ -318,7 +318,7 @@ int shim_do_clone (int flags, void * user_stack_addr, int * parent_tidptr,
new_args.thread = thread;
new_args.parent = self;
new_args.stack = user_stack_addr;
new_args.return_pc = *(void **) user_stack_addr;
new_args.return_pc = shim_get_tls()->context.ret_ip;
// Invoke DkThreadCreate to spawn off a child process using the actual
// "clone" system call. DkThreadCreate allocates a stack for the child