summaryrefslogtreecommitdiff
path: root/sys/compat/linux32/common/linux32_exec.c
diff options
context:
space:
mode:
authorchs <chs@NetBSD.org>2010-07-07 01:30:32 +0000
committerchs <chs@NetBSD.org>2010-07-07 01:30:32 +0000
commit33fa5ccbbf17bc2390e2d136c34926c6f93ac5d1 (patch)
treec52fdcf81396fba59fce0a9c410d0dcc8c104091 /sys/compat/linux32/common/linux32_exec.c
parent56acc98394a822ba38a843f6385171e0b1aa5e9a (diff)
many changes for COMPAT_LINUX:
- update the linux syscall table for each platform. - support new-style (NPTL) linux pthreads on all platforms. clone() with CLONE_THREAD uses 1 process with many LWPs instead of separate processes. - move the contents of sys__lwp_setprivate() into a new lwp_setprivate() and use that everywhere. - update linux_release[] and linux32_release[] to "2.6.18". - adjust placement of emul fork/exec/exit hooks as needed and adjust other emul code to match. - convert all struct emul definitions to use named initializers. - change the pid allocator to allow multiple pids to refer to the same proc. - remove a few fields from struct proc that are no longer needed. - disable the non-functional "vdso" code in linux32/amd64, glibc works fine without it. - fix a race in the futex code where we could miss a wakeup after a requeue operation. - redo futex locking to be a little more efficient.
Diffstat (limited to 'sys/compat/linux32/common/linux32_exec.c')
-rw-r--r--sys/compat/linux32/common/linux32_exec.c219
1 files changed, 10 insertions, 209 deletions
diff --git a/sys/compat/linux32/common/linux32_exec.c b/sys/compat/linux32/common/linux32_exec.c
index d8240e30a0c..1fcd2d6d453 100644
--- a/sys/compat/linux32/common/linux32_exec.c
+++ b/sys/compat/linux32/common/linux32_exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_exec.c,v 1.19 2009/10/25 01:14:03 rmind Exp $ */
+/* $NetBSD: linux32_exec.c,v 1.20 2010/07/07 01:30:35 chs Exp $ */
/*-
* Copyright (c) 1994-2007 The NetBSD Foundation, Inc.
@@ -31,30 +31,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_exec.c,v 1.19 2009/10/25 01:14:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_exec.c,v 1.20 2010/07/07 01:30:35 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
#include <sys/exec.h>
#include <sys/exec_elf.h>
#include <sys/mman.h>
#include <sys/syscallargs.h>
-#include <sys/ptrace.h> /* For proc_reparent() */
-
-#include <uvm/uvm_extern.h>
-
-#include <sys/cpu.h>
-#include <machine/reg.h>
#include <compat/linux/common/linux_types.h>
-#include <compat/linux/common/linux_emuldata.h>
+#include <compat/linux/common/linux_exec.h>
#include <compat/linux32/common/linux32_exec.h>
#include <compat/linux32/common/linux32_types.h>
@@ -64,24 +54,9 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_exec.c,v 1.19 2009/10/25 01:14:03 rmind Exp
#include <compat/linux32/linux32_syscallargs.h>
#include <compat/linux32/linux32_syscall.h>
-extern char linux32_sigcode[1];
-extern char linux32_rt_sigcode[1];
-extern char linux32_esigcode[1];
-
extern struct sysent linux32_sysent[];
extern const char * const linux32_syscallnames[];
-
-static void linux32_e_proc_exec(struct proc *, struct exec_package *);
-static void linux32_e_proc_fork(struct proc *, struct proc *, int);
-static void linux32_e_proc_exit(struct proc *);
-static void linux32_e_proc_init(struct proc *, struct proc *, int);
-
-#ifdef LINUX32_NPTL
-void linux32_userret(void);
-void linux_nptl_proc_fork(struct proc *, struct proc *, void (*luserret)(void));
-void linux_nptl_proc_exit(struct proc *);
-void linux_nptl_proc_init(struct proc *, struct proc *);
-#endif
+extern char linux32_sigcode[], linux32_esigcode[];
/*
* Emulation switch.
@@ -101,17 +76,17 @@ struct emul emul_linux32 = {
.e_sysent = linux32_sysent,
.e_syscallnames = linux32_syscallnames,
.e_sendsig = linux32_sendsig,
- .e_trapsignal = trapsignal,
+ .e_trapsignal = linux_trapsignal,
.e_tracesig = NULL,
.e_sigcode = linux32_sigcode,
.e_esigcode = linux32_esigcode,
.e_sigobject = &emul_linux32_object,
.e_setregs = linux32_setregs,
- .e_proc_exec = linux32_e_proc_exec,
- .e_proc_fork = linux32_e_proc_fork,
- .e_proc_exit = linux32_e_proc_exit,
- .e_lwp_fork = NULL,
- .e_lwp_exit = NULL,
+ .e_proc_exec = linux_e_proc_exec,
+ .e_proc_fork = linux_e_proc_fork,
+ .e_proc_exit = linux_e_proc_exit,
+ .e_lwp_fork = linux_e_lwp_fork,
+ .e_lwp_exit = linux_e_lwp_exit,
.e_syscall_intern = linux32_syscall_intern,
.e_sysctlovly = NULL,
.e_fault = NULL,
@@ -121,177 +96,3 @@ struct emul emul_linux32 = {
.e_ucsize = 0,
.e_startlwp = NULL
};
-
-static void
-linux32_e_proc_init(struct proc *p, struct proc *parent, int forkflags)
-{
- struct linux_emuldata *e = p->p_emuldata;
- struct linux_emuldata_shared *s;
- struct linux_emuldata *ep = NULL;
-
- if (!e) {
- /* allocate new Linux emuldata */
- e = malloc(sizeof(struct linux_emuldata),
- M_EMULDATA, M_WAITOK);
- } else {
- mutex_enter(proc_lock);
- e->s->refs--;
- if (e->s->refs == 0)
- free(e->s, M_EMULDATA);
- mutex_exit(proc_lock);
- }
-
- memset(e, '\0', sizeof(struct linux_emuldata));
-
- e->proc = p;
-
- if (parent)
- ep = parent->p_emuldata;
-
- if (forkflags & FORK_SHAREVM) {
- mutex_enter(proc_lock);
-#ifdef DIAGNOSTIC
- if (ep == NULL) {
- killproc(p, "FORK_SHAREVM while emuldata is NULL\n");
- mutex_exit(proc_lock);
- return;
- }
-#endif
- s = ep->s;
- s->refs++;
- } else {
- struct vmspace *vm;
-
- s = malloc(sizeof(struct linux_emuldata_shared),
- M_EMULDATA, M_WAITOK);
- s->refs = 1;
-
- /*
- * Set the process idea of the break to the real value.
- * For fork, we use parent's vmspace since our's
- * is not setup at the time of this call and is going
- * to be copy of parent's anyway. For exec, just
- * use our own vmspace.
- */
- vm = (parent) ? parent->p_vmspace : p->p_vmspace;
- s->p_break = (char *)vm->vm_daddr + ctob(vm->vm_dsize);
-
- /*
- * Linux threads are emulated as NetBSD processes (not lwp)
- * We use native PID for Linux TID. The Linux TID is the
- * PID of the first process in the group. It is stored
- * here
- */
- s->group_pid = p->p_pid;
-
- /*
- * Initialize the list of threads in the group
- */
- LIST_INIT(&s->threads);
-
- s->xstat = 0;
- s->flags = 0;
- mutex_enter(proc_lock);
- }
-
- e->s = s;
-
- /*
- * Add this thread in the group thread list
- */
- LIST_INSERT_HEAD(&s->threads, e, threads);
- mutex_exit(proc_lock);
-
-#ifdef LINUX32_NPTL
- linux_nptl_proc_init(p, parent);
-#endif /* LINUX32_NPTL */
-
- p->p_emuldata = e;
-}
-
-/*
- * Allocate new per-process structures. Called when executing Linux
- * process. We can reuse the old emuldata - if it's not null,
- * the executed process is of same emulation as original forked one.
- */
-static void
-linux32_e_proc_exec(struct proc *p, struct exec_package *epp)
-{
- /* exec, use our vmspace */
- linux32_e_proc_init(p, NULL, 0);
-}
-
-/*
- * Emulation per-process exit hook.
- */
-static void
-linux32_e_proc_exit(struct proc *p)
-{
- struct linux_emuldata *e = p->p_emuldata;
-
-#ifdef LINUX32_NPTL
- linux_nptl_proc_exit(p);
-#endif /* LINUX32_NPTL */
-
- /* Remove the thread for the group thread list */
- mutex_enter(proc_lock);
- LIST_REMOVE(e, threads);
-
- /* free Linux emuldata and set the pointer to null */
- e->s->refs--;
- if (e->s->refs == 0)
- free(e->s, M_EMULDATA);
- p->p_emuldata = NULL;
- mutex_exit(proc_lock);
- free(e, M_EMULDATA);
-}
-
-/*
- * Emulation fork hook.
- */
-static void
-linux32_e_proc_fork(struct proc *p, struct proc *parent, int forkflags)
-{
- /*
- * The new process might share some vmspace-related stuff
- * with parent, depending on fork flags (CLONE_VM et.al).
- * Force allocation of new base emuldata, and share the
- * VM-related parts only if necessary.
- */
- p->p_emuldata = NULL;
- linux32_e_proc_init(p, parent, forkflags);
-
-#ifdef LINUX32_NPTL
- linux_nptl_proc_fork(p, parent, linux32_userret);
-#endif
-
- return;
-}
-
-#ifdef LINUX32_NPTL
-void
-linux32_userret(void)
-{
- struct lwp *l = curlwp;
- struct proc *p = l->l_proc;
- struct linux_emuldata *led = p->p_emuldata;
- int error;
-
- /* LINUX_CLONE_CHILD_SETTID: copy child's TID to child's memory */
- if (led->clone_flags & LINUX_CLONE_CHILD_SETTID) {
- if ((error = copyout(&l->l_proc->p_pid,
- led->child_tidptr, sizeof(l->l_proc->p_pid))) != 0)
- printf("linux32_userret: LINUX_CLONE_CHILD_SETTID "
- "failed (led->child_tidptr = %p, p->p_pid = %d)\n",
- led->child_tidptr, p->p_pid);
- }
-
- /* LINUX_CLONE_SETTLS: allocate a new TLS */
- if (led->clone_flags & LINUX_CLONE_SETTLS) {
- if (linux32_set_newtls(l, linux32_get_newtls(l)) != 0)
- printf("linux32_userret: linux32_set_tls failed");
- }
-
- return;
-}
-#endif /* LINUX32_NPTL */