Index: qemu.bkp/linux-user/main.c =================================================================== --- qemu.bkp.orig/linux-user/main.c +++ qemu.bkp/linux-user/main.c @@ -156,7 +156,7 @@ static void set_gate(void *ptr, unsigned p[1] = tswapl(e2); } -uint64_t gdt_table[6]; +uint64_t gdt_table[9]; uint64_t idt_table[256]; /* only dpl matters as we do only user space emulation */ Index: qemu.bkp/linux-user/syscall.c =================================================================== --- qemu.bkp.orig/linux-user/syscall.c +++ qemu.bkp/linux-user/syscall.c @@ -145,6 +145,7 @@ type name (type1 arg1,type2 arg2,type3 a #define __NR_sys_rt_sigqueueinfo __NR_rt_sigqueueinfo #define __NR_sys_syslog __NR_syslog #define __NR_sys_tgkill __NR_tgkill +#define __NR_sys_clone __NR_clone #if defined(__alpha__) || defined (__ia64__) || defined(__x86_64__) #define __NR__llseek __NR_lseek @@ -166,6 +167,7 @@ _syscall5(int, _llseek, uint, fd, ulon _syscall3(int,sys_rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,uinfo) _syscall3(int,sys_syslog,int,type,char*,bufp,int,len) _syscall3(int,sys_tgkill,int,tgid,int,pid,int,sig) +_syscall5(int,sys_clone, int, flags, void *, child_stack, int *, parent_tidptr, void *, newtls, int *, child_tidptr) #ifdef __NR_exit_group _syscall1(int,exit_group,int,error_code) #endif @@ -2115,29 +2117,107 @@ int do_modify_ldt(CPUX86State *env, int return ret; } +int do_set_thread_area(CPUX86State *env, target_ulong ptr) +{ + uint64_t *gdt_table = g2h(env->gdt.base); + struct target_modify_ldt_ldt_s ldt_info; + struct target_modify_ldt_ldt_s *target_ldt_info; + int seg_32bit, contents, read_exec_only, limit_in_pages; + int seg_not_present, useable; + uint32_t *lp, entry_1, entry_2; + int i; + + lock_user_struct(target_ldt_info, ptr, 1); + ldt_info.entry_number = tswap32(target_ldt_info->entry_number); + ldt_info.base_addr = tswapl(target_ldt_info->base_addr); + ldt_info.limit = tswap32(target_ldt_info->limit); + ldt_info.flags = tswap32(target_ldt_info->flags); + if (ldt_info.entry_number == -1) { + for (i=6; i<8; i++) + if (gdt_table[i] == 0) { + ldt_info.entry_number = i; + target_ldt_info->entry_number = tswap32(i); + break; + } + } + unlock_user_struct(target_ldt_info, ptr, 0); + + if (ldt_info.entry_number < 6 || ldt_info.entry_number > 8) + return -EINVAL; + seg_32bit = ldt_info.flags & 1; + contents = (ldt_info.flags >> 1) & 3; + read_exec_only = (ldt_info.flags >> 3) & 1; + limit_in_pages = (ldt_info.flags >> 4) & 1; + seg_not_present = (ldt_info.flags >> 5) & 1; + useable = (ldt_info.flags >> 6) & 1; + + if (contents == 3) { + if (seg_not_present == 0) + return -EINVAL; + } + + /* NOTE: same code as Linux kernel */ + /* Allow LDTs to be cleared by the user. */ + if (ldt_info.base_addr == 0 && ldt_info.limit == 0) { + if ((contents == 0 && + read_exec_only == 1 && + seg_32bit == 0 && + limit_in_pages == 0 && + seg_not_present == 1 && + useable == 0 )) { + entry_1 = 0; + entry_2 = 0; + goto install; + } + } + + entry_1 = ((ldt_info.base_addr & 0x0000ffff) << 16) | + (ldt_info.limit & 0x0ffff); + entry_2 = (ldt_info.base_addr & 0xff000000) | + ((ldt_info.base_addr & 0x00ff0000) >> 16) | + (ldt_info.limit & 0xf0000) | + ((read_exec_only ^ 1) << 9) | + (contents << 10) | + ((seg_not_present ^ 1) << 15) | + (seg_32bit << 22) | + (limit_in_pages << 23) | + (useable << 20) | + 0x7000; + + /* Install the new entry ... */ +install: + lp = (uint32_t *)(gdt_table + ldt_info.entry_number); + lp[0] = tswap32(entry_1); + lp[1] = tswap32(entry_2); + return 0; +} #endif /* defined(TARGET_I386) */ /* this stack is the equivalent of the kernel stack associated with a thread/process */ #define NEW_STACK_SIZE 8192 -static int clone_func(void *arg) +static int clone_func(void *cloneenv) { - CPUState *env = arg; - cpu_loop(env); + cpu_loop((CPUState *)cloneenv); /* never exits */ return 0; } -int do_fork(CPUState *env, unsigned int flags, unsigned long newsp) +int do_fork(CPUState *env, unsigned int flags, target_ulong newsp, target_ulong parent_tidptr, target_ulong newtls, target_ulong child_tidptr) { int ret; + unsigned long parent_tid=gettid(); TaskState *ts; uint8_t *new_stack; CPUState *new_env; - +#if defined(TARGET_I386) + uint64_t *new_gdt_table; +#endif if (flags & CLONE_VM) { ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE); + if (!ts) + return -ENOMEM; memset(ts, 0, sizeof(TaskState)); new_stack = ts->stack; ts->used = 1; @@ -2149,6 +2229,27 @@ int do_fork(CPUState *env, unsigned int #if defined(TARGET_I386) if (!newsp) newsp = env->regs[R_ESP]; + new_gdt_table = malloc(9 * 8); + if (!new_gdt_table) { + free(new_env); + return -ENOMEM; + } + /* Copy main GDT table from parent, but clear TLS entries */ + memcpy(new_gdt_table, g2h(env->gdt.base), 6 * 8); + memset(&new_gdt_table[6], 0, 3 * 8); + new_env->gdt.base = h2g(new_gdt_table); + if (flags & CLONE_SETTLS) { + ret = do_set_thread_area(new_env, newtls); + if (ret) { + free(new_gdt_table); + free(new_env); + return ret; + } + } + + cpu_x86_load_seg(new_env, R_FS, new_env->segs[R_FS].selector); + cpu_x86_load_seg(new_env, R_GS, new_env->segs[R_GS].selector); + new_env->regs[R_ESP] = newsp; new_env->regs[R_EAX] = 0; #elif defined(TARGET_ARM) @@ -2202,15 +2303,27 @@ int do_fork(CPUState *env, unsigned int #endif new_env->opaque = ts; #ifdef __ia64__ - ret = __clone2(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env); + ret = __clone2(clone_func, new_stack + NEW_STACK_SIZE, flags & ~(CLONE_SETTLS|CLONE_PARENT_SETTID|CLONE_CHILD_CLEARTID), new_env); #else - ret = clone(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env); + ret = clone(clone_func, new_stack + NEW_STACK_SIZE, flags & ~(CLONE_SETTLS|CLONE_PARENT_SETTID|CLONE_CHILD_CLEARTID), new_env); #endif } else { /* if no CLONE_VM, we consider it is a fork */ - if ((flags & ~CSIGNAL) != 0) - return -EINVAL; - ret = fork(); + ret = sys_clone(flags & ~(CLONE_SETTLS|CLONE_PARENT_SETTID|CLONE_CHILD_CLEARTID), 0, g2h(parent_tidptr), NULL, g2h(child_tidptr)); + } + /* Store child thread ID at location parent_tidptr in parent and child memory. + Currently this is only done in client memory */ + if(flags & CLONE_PARENT_SETTID) { + tput32(parent_tidptr, parent_tid); + } + + /* Store child thread ID at location child_tidptr in child memory. */ + if(flags & CLONE_CHILD_SETTID) { + if(ret==0) { /* only in client memory for fork() */ + tput32(child_tidptr, gettid()); + } else if(flags & CLONE_VM) { /* real threads need it too */ + tput32(child_tidptr, ret); + } } return ret; } @@ -2458,7 +2571,7 @@ long do_syscall(void *cpu_env, int num, _mcleanup(); #endif gdb_exit(cpu_env, arg1); - /* XXX: should free thread stack and CPU env */ + /* XXX: should free thread stack, GDT and CPU env */ _exit(arg1); ret = 0; /* avoid warning */ break; @@ -2487,7 +2600,7 @@ long do_syscall(void *cpu_env, int num, ret = do_brk(arg1); break; case TARGET_NR_fork: - ret = get_errno(do_fork(cpu_env, SIGCHLD, 0)); + ret = get_errno(do_fork(cpu_env, SIGCHLD, 0, 0,0,0)); break; #ifdef TARGET_NR_waitpid case TARGET_NR_waitpid: @@ -3651,7 +3764,7 @@ long do_syscall(void *cpu_env, int num, ret = get_errno(fsync(arg1)); break; case TARGET_NR_clone: - ret = get_errno(do_fork(cpu_env, arg1, arg2)); + ret = get_errno(do_fork(cpu_env, arg1, arg2,arg3,arg4,arg5)); break; #ifdef __NR_exit_group /* new thread calls */ @@ -4039,7 +4152,7 @@ long do_syscall(void *cpu_env, int num, #endif #ifdef TARGET_NR_vfork case TARGET_NR_vfork: - ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0)); + ret = get_errno(do_fork(cpu_env, CLONE_VFORK | CLONE_VM | SIGCHLD, 0, 0,0,0)); break; #endif #ifdef TARGET_NR_ugetrlimit @@ -4561,12 +4674,12 @@ long do_syscall(void *cpu_env, int num, #ifdef TARGET_NR_set_thread_area case TARGET_NR_set_thread_area: #ifdef TARGET_MIPS - ((CPUMIPSState *) cpu_env)->tls_value = arg1; - ret = 0; - break; + ((CPUMIPSState *) cpu_env)->tls_value = arg1; + ret = 0; #else - goto unimplemented_nowarn; + ret = get_errno(do_set_thread_area(cpu_env, arg1)); #endif + break; #endif #ifdef TARGET_NR_get_thread_area case TARGET_NR_get_thread_area: