1995-06-25 17:32:43 +00:00
|
|
|
|
/*-
|
|
|
|
|
* Copyright (c) 1994-1995 S<EFBFBD>ren Schmidt
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
|
* are met:
|
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
* notice, this list of conditions and the following disclaimer
|
1995-06-25 17:32:43 +00:00
|
|
|
|
* in this position and unchanged.
|
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
|
* 3. The name of the author may not be used to endorse or promote products
|
2002-06-02 20:05:59 +00:00
|
|
|
|
* derived from this software without specific prior written permission
|
1995-06-25 17:32:43 +00:00
|
|
|
|
*
|
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
*
|
1999-08-28 01:08:13 +00:00
|
|
|
|
* $FreeBSD$
|
1995-06-25 17:32:43 +00:00
|
|
|
|
*/
|
|
|
|
|
|
1999-08-15 13:28:35 +00:00
|
|
|
|
#include "opt_compat.h"
|
|
|
|
|
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
#include <sys/systm.h>
|
1997-03-23 03:37:54 +00:00
|
|
|
|
#include <sys/fcntl.h>
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#include <sys/imgact_aout.h>
|
2002-02-27 15:06:33 +00:00
|
|
|
|
#include <sys/jail.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/kernel.h>
|
|
|
|
|
#include <sys/lock.h>
|
|
|
|
|
#include <sys/mman.h>
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#include <sys/mount.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/mutex.h>
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#include <sys/namei.h>
|
2001-09-08 19:07:04 +00:00
|
|
|
|
#include <sys/poll.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/proc.h>
|
2001-07-23 06:22:10 +00:00
|
|
|
|
#include <sys/blist.h>
|
2001-02-16 14:42:11 +00:00
|
|
|
|
#include <sys/reboot.h>
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#include <sys/resourcevar.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/signalvar.h>
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#include <sys/stat.h>
|
1995-11-22 07:43:53 +00:00
|
|
|
|
#include <sys/sysctl.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/sysproto.h>
|
|
|
|
|
#include <sys/time.h>
|
1998-12-19 02:55:34 +00:00
|
|
|
|
#include <sys/unistd.h>
|
2001-07-23 06:22:10 +00:00
|
|
|
|
#include <sys/vmmeter.h>
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#include <sys/vnode.h>
|
|
|
|
|
#include <sys/wait.h>
|
|
|
|
|
|
1995-12-06 19:14:16 +00:00
|
|
|
|
#include <vm/vm.h>
|
1995-12-09 08:17:24 +00:00
|
|
|
|
#include <vm/pmap.h>
|
1995-11-22 07:43:53 +00:00
|
|
|
|
#include <vm/vm_kern.h>
|
1995-12-09 08:17:24 +00:00
|
|
|
|
#include <vm/vm_map.h>
|
1995-12-14 22:35:45 +00:00
|
|
|
|
#include <vm/vm_extern.h>
|
2001-07-23 06:22:10 +00:00
|
|
|
|
#include <vm/vm_object.h>
|
|
|
|
|
#include <vm/swap_pager.h>
|
1995-11-22 07:43:53 +00:00
|
|
|
|
|
2000-08-26 05:08:10 +00:00
|
|
|
|
#include <machine/limits.h>
|
1997-10-29 08:17:14 +00:00
|
|
|
|
|
1999-08-15 17:28:40 +00:00
|
|
|
|
#include <posix4/sched.h>
|
|
|
|
|
|
2000-08-22 01:46:50 +00:00
|
|
|
|
#include <machine/../linux/linux.h>
|
2000-11-10 21:30:19 +00:00
|
|
|
|
#include <machine/../linux/linux_proto.h>
|
2000-08-22 01:46:50 +00:00
|
|
|
|
#include <compat/linux/linux_mib.h>
|
|
|
|
|
#include <compat/linux/linux_util.h>
|
|
|
|
|
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifdef __alpha__
|
|
|
|
|
#define BSD_TO_LINUX_SIGNAL(sig) (sig)
|
|
|
|
|
#else
|
1999-09-29 15:12:18 +00:00
|
|
|
|
#define BSD_TO_LINUX_SIGNAL(sig) \
|
|
|
|
|
(((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig)
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif
|
1999-09-29 15:12:18 +00:00
|
|
|
|
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifndef __alpha__
|
2001-09-08 19:07:04 +00:00
|
|
|
|
static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = {
|
|
|
|
|
RLIMIT_CPU, RLIMIT_FSIZE, RLIMIT_DATA, RLIMIT_STACK,
|
|
|
|
|
RLIMIT_CORE, RLIMIT_RSS, RLIMIT_NPROC, RLIMIT_NOFILE,
|
|
|
|
|
RLIMIT_MEMLOCK, -1
|
1999-08-11 13:34:31 +00:00
|
|
|
|
};
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif /*!__alpha__*/
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct l_sysinfo {
|
|
|
|
|
l_long uptime; /* Seconds since boot */
|
|
|
|
|
l_ulong loads[3]; /* 1, 5, and 15 minute load averages */
|
|
|
|
|
l_ulong totalram; /* Total usable main memory size */
|
|
|
|
|
l_ulong freeram; /* Available memory size */
|
|
|
|
|
l_ulong sharedram; /* Amount of shared memory */
|
|
|
|
|
l_ulong bufferram; /* Memory used by buffers */
|
|
|
|
|
l_ulong totalswap; /* Total swap space size */
|
|
|
|
|
l_ulong freeswap; /* swap space still available */
|
|
|
|
|
l_ushort procs; /* Number of current processes */
|
|
|
|
|
char _f[22]; /* Pads structure to 64 bytes */
|
2001-07-23 06:22:10 +00:00
|
|
|
|
};
|
|
|
|
|
#ifndef __alpha__
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args)
|
2001-07-23 06:22:10 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct l_sysinfo sysinfo;
|
|
|
|
|
vm_object_t object;
|
|
|
|
|
int i;
|
|
|
|
|
struct timespec ts;
|
|
|
|
|
|
|
|
|
|
/* Uptime is copied out of print_uptime() in kern_shutdown.c */
|
|
|
|
|
getnanouptime(&ts);
|
|
|
|
|
i = 0;
|
|
|
|
|
if (ts.tv_sec >= 86400) {
|
|
|
|
|
ts.tv_sec %= 86400;
|
|
|
|
|
i = 1;
|
|
|
|
|
}
|
|
|
|
|
if (i || ts.tv_sec >= 3600) {
|
|
|
|
|
ts.tv_sec %= 3600;
|
|
|
|
|
i = 1;
|
|
|
|
|
}
|
|
|
|
|
if (i || ts.tv_sec >= 60) {
|
|
|
|
|
ts.tv_sec %= 60;
|
|
|
|
|
i = 1;
|
|
|
|
|
}
|
|
|
|
|
sysinfo.uptime=ts.tv_sec;
|
|
|
|
|
|
|
|
|
|
/* Use the information from the mib to get our load averages */
|
|
|
|
|
for (i = 0; i < 3; i++)
|
|
|
|
|
sysinfo.loads[i] = averunnable.ldavg[i];
|
|
|
|
|
|
|
|
|
|
sysinfo.totalram = physmem * PAGE_SIZE;
|
|
|
|
|
sysinfo.freeram = sysinfo.totalram - cnt.v_wire_count * PAGE_SIZE;
|
|
|
|
|
|
|
|
|
|
sysinfo.sharedram = 0;
|
|
|
|
|
for (object = TAILQ_FIRST(&vm_object_list); object != NULL;
|
|
|
|
|
object = TAILQ_NEXT(object, object_list))
|
|
|
|
|
if (object->shadow_count > 1)
|
|
|
|
|
sysinfo.sharedram += object->resident_page_count;
|
|
|
|
|
|
|
|
|
|
sysinfo.sharedram *= PAGE_SIZE;
|
|
|
|
|
sysinfo.bufferram = 0;
|
|
|
|
|
|
|
|
|
|
if (swapblist == NULL) {
|
|
|
|
|
sysinfo.totalswap= 0;
|
|
|
|
|
sysinfo.freeswap = 0;
|
|
|
|
|
} else {
|
|
|
|
|
sysinfo.totalswap = swapblist->bl_blocks * 1024;
|
|
|
|
|
sysinfo.freeswap = swapblist->bl_root->u.bmu_avail * PAGE_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sysinfo.procs = 20; /* Hack */
|
|
|
|
|
|
|
|
|
|
return copyout(&sysinfo, (caddr_t)args->info, sizeof(sysinfo));
|
2001-07-23 06:22:10 +00:00
|
|
|
|
}
|
|
|
|
|
#endif /*!__alpha__*/
|
|
|
|
|
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifndef __alpha__
|
1995-06-25 17:32:43 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_alarm(struct thread *td, struct linux_alarm_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct itimerval it, old_it;
|
|
|
|
|
struct timeval tv;
|
|
|
|
|
int s;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(alarm))
|
|
|
|
|
printf(ARGS(alarm, "%u"), args->secs);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
if (args->secs > 100000000)
|
|
|
|
|
return EINVAL;
|
|
|
|
|
|
|
|
|
|
it.it_value.tv_sec = (long)args->secs;
|
|
|
|
|
it.it_value.tv_usec = 0;
|
|
|
|
|
it.it_interval.tv_sec = 0;
|
|
|
|
|
it.it_interval.tv_usec = 0;
|
|
|
|
|
s = splsoftclock();
|
2001-09-12 08:38:13 +00:00
|
|
|
|
old_it = td->td_proc->p_realtimer;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
getmicrouptime(&tv);
|
|
|
|
|
if (timevalisset(&old_it.it_value))
|
2001-09-12 08:38:13 +00:00
|
|
|
|
callout_stop(&td->td_proc->p_itcallout);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (it.it_value.tv_sec != 0) {
|
2001-09-12 08:38:13 +00:00
|
|
|
|
callout_reset(&td->td_proc->p_itcallout, tvtohz(&it.it_value),
|
2001-11-24 14:09:50 +00:00
|
|
|
|
realitexpire, td->td_proc);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
timevaladd(&it.it_value, &tv);
|
|
|
|
|
}
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_proc->p_realtimer = it;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
splx(s);
|
|
|
|
|
if (timevalcmp(&old_it.it_value, &tv, >)) {
|
|
|
|
|
timevalsub(&old_it.it_value, &tv);
|
|
|
|
|
if (old_it.it_value.tv_usec != 0)
|
|
|
|
|
old_it.it_value.tv_sec++;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = old_it.it_value.tv_sec;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif /*!__alpha__*/
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_brk(struct thread *td, struct linux_brk_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-12 08:38:13 +00:00
|
|
|
|
struct vmspace *vm = td->td_proc->p_vmspace;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
vm_offset_t new, old;
|
|
|
|
|
struct obreak_args /* {
|
|
|
|
|
char * nsize;
|
|
|
|
|
} */ tmp;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(brk))
|
|
|
|
|
printf(ARGS(brk, "%p"), (void *)args->dsend);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
old = (vm_offset_t)vm->vm_daddr + ctob(vm->vm_dsize);
|
|
|
|
|
new = (vm_offset_t)args->dsend;
|
|
|
|
|
tmp.nsize = (char *) new;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
if (((caddr_t)new > vm->vm_daddr) && !obreak(td, &tmp))
|
|
|
|
|
td->td_retval[0] = (long)new;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
else
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = (long)old;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_uselib(struct thread *td, struct linux_uselib_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct nameidata ni;
|
|
|
|
|
struct vnode *vp;
|
|
|
|
|
struct exec *a_out;
|
|
|
|
|
struct vattr attr;
|
|
|
|
|
vm_offset_t vmaddr;
|
|
|
|
|
unsigned long file_offset;
|
|
|
|
|
vm_offset_t buffer;
|
|
|
|
|
unsigned long bss_size;
|
|
|
|
|
int error;
|
|
|
|
|
caddr_t sg;
|
|
|
|
|
int locked;
|
|
|
|
|
|
|
|
|
|
sg = stackgap_init();
|
2001-09-12 08:38:13 +00:00
|
|
|
|
CHECKALTEXIST(td, &sg, args->library);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(uselib))
|
|
|
|
|
printf(ARGS(uselib, "%s"), args->library);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
a_out = NULL;
|
|
|
|
|
locked = 0;
|
|
|
|
|
vp = NULL;
|
|
|
|
|
|
2002-04-20 14:43:34 +00:00
|
|
|
|
/*
|
|
|
|
|
* XXX This code should make use of vn_open(), rather than doing
|
|
|
|
|
* all this stuff itself.
|
|
|
|
|
*/
|
2001-09-12 08:38:13 +00:00
|
|
|
|
NDINIT(&ni, LOOKUP, FOLLOW|LOCKLEAF, UIO_USERSPACE, args->library, td);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
error = namei(&ni);
|
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
|
|
vp = ni.ni_vp;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
/*
|
2001-09-08 19:07:04 +00:00
|
|
|
|
* XXX - This looks like a bogus check. A LOCKLEAF namei should not
|
|
|
|
|
* succeed without returning a vnode.
|
1995-06-25 17:32:43 +00:00
|
|
|
|
*/
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (vp == NULL) {
|
|
|
|
|
error = ENOEXEC; /* ?? */
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
|
|
|
|
NDFREE(&ni, NDF_ONLY_PNBUF);
|
1996-02-16 18:40:50 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/*
|
|
|
|
|
* From here on down, we have a locked vnode that must be unlocked.
|
|
|
|
|
*/
|
|
|
|
|
locked++;
|
1996-02-16 18:40:50 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/* Writable? */
|
|
|
|
|
if (vp->v_writecount) {
|
|
|
|
|
error = ETXTBSY;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/* Executable? */
|
2002-02-27 18:32:23 +00:00
|
|
|
|
error = VOP_GETATTR(vp, &attr, td->td_ucred, td);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
if (error)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
goto cleanup;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if ((vp->v_mount->mnt_flag & MNT_NOEXEC) ||
|
|
|
|
|
((attr.va_mode & 0111) == 0) || (attr.va_type != VREG)) {
|
|
|
|
|
error = ENOEXEC;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/* Sensible size? */
|
|
|
|
|
if (attr.va_size == 0) {
|
|
|
|
|
error = ENOEXEC;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/* Can we access it? */
|
2002-02-27 18:32:23 +00:00
|
|
|
|
error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
if (error)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
goto cleanup;
|
|
|
|
|
|
2002-06-14 07:24:01 +00:00
|
|
|
|
/*
|
|
|
|
|
* XXX: This should use vn_open() so that it is properly authorized,
|
|
|
|
|
* and to reduce code redundancy all over the place here.
|
|
|
|
|
*/
|
2002-02-27 18:32:23 +00:00
|
|
|
|
error = VOP_OPEN(vp, FREAD, td->td_ucred, td);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
1996-02-16 18:40:50 +00:00
|
|
|
|
/*
|
2001-09-08 19:07:04 +00:00
|
|
|
|
* Lock no longer needed
|
1996-02-16 18:40:50 +00:00
|
|
|
|
*/
|
2001-09-12 08:38:13 +00:00
|
|
|
|
VOP_UNLOCK(vp, 0, td);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
locked = 0;
|
|
|
|
|
|
|
|
|
|
/* Pull in executable header into kernel_map */
|
|
|
|
|
error = vm_mmap(kernel_map, (vm_offset_t *)&a_out, PAGE_SIZE,
|
|
|
|
|
VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp, 0);
|
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
|
|
/* Is it a Linux binary ? */
|
|
|
|
|
if (((a_out->a_magic >> 16) & 0xff) != 0x64) {
|
|
|
|
|
error = ENOEXEC;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
1996-02-16 18:40:50 +00:00
|
|
|
|
|
|
|
|
|
/*
|
2001-09-08 19:07:04 +00:00
|
|
|
|
* While we are here, we should REALLY do some more checks
|
1996-02-16 18:40:50 +00:00
|
|
|
|
*/
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
/* Set file/virtual offset based on a.out variant. */
|
|
|
|
|
switch ((int)(a_out->a_magic & 0xffff)) {
|
|
|
|
|
case 0413: /* ZMAGIC */
|
|
|
|
|
file_offset = 1024;
|
|
|
|
|
break;
|
|
|
|
|
case 0314: /* QMAGIC */
|
|
|
|
|
file_offset = 0;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
error = ENOEXEC;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bss_size = round_page(a_out->a_bss);
|
|
|
|
|
|
|
|
|
|
/* Check various fields in header for validity/bounds. */
|
|
|
|
|
if (a_out->a_text & PAGE_MASK || a_out->a_data & PAGE_MASK) {
|
|
|
|
|
error = ENOEXEC;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* text + data can't exceed file size */
|
|
|
|
|
if (a_out->a_data + a_out->a_text > attr.va_size) {
|
|
|
|
|
error = EFAULT;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
/* To protect td->td_proc->p_rlimit in the if condition. */
|
2001-09-08 19:07:04 +00:00
|
|
|
|
mtx_assert(&Giant, MA_OWNED);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* text/data/bss must not exceed limits
|
|
|
|
|
* XXX - this is not complete. it should check current usage PLUS
|
|
|
|
|
* the resources needed by this library.
|
1996-02-16 18:40:50 +00:00
|
|
|
|
*/
|
2001-10-10 23:06:54 +00:00
|
|
|
|
if (a_out->a_text > maxtsiz ||
|
2001-09-12 08:38:13 +00:00
|
|
|
|
a_out->a_data + bss_size >
|
|
|
|
|
td->td_proc->p_rlimit[RLIMIT_DATA].rlim_cur) {
|
2001-09-08 19:07:04 +00:00
|
|
|
|
error = ENOMEM;
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* prevent more writers */
|
|
|
|
|
vp->v_flag |= VTEXT;
|
1996-02-16 18:40:50 +00:00
|
|
|
|
|
|
|
|
|
/*
|
2001-09-08 19:07:04 +00:00
|
|
|
|
* Check if file_offset page aligned. Currently we cannot handle
|
|
|
|
|
* misalinged file offsets, and so we read in the entire image
|
|
|
|
|
* (what a waste).
|
1996-02-16 18:40:50 +00:00
|
|
|
|
*/
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (file_offset & PAGE_MASK) {
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
printf("uselib: Non page aligned binary %lu\n", file_offset);
|
|
|
|
|
#endif
|
|
|
|
|
/* Map text+data read/write/execute */
|
|
|
|
|
|
|
|
|
|
/* a_entry is the load address and is page aligned */
|
|
|
|
|
vmaddr = trunc_page(a_out->a_entry);
|
|
|
|
|
|
|
|
|
|
/* get anon user mapping, read+write+execute */
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0,
|
|
|
|
|
&vmaddr, a_out->a_text + a_out->a_data, FALSE, VM_PROT_ALL,
|
2001-09-08 19:07:04 +00:00
|
|
|
|
VM_PROT_ALL, 0);
|
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
|
|
/* map file into kernel_map */
|
|
|
|
|
error = vm_mmap(kernel_map, &buffer,
|
|
|
|
|
round_page(a_out->a_text + a_out->a_data + file_offset),
|
|
|
|
|
VM_PROT_READ, VM_PROT_READ, 0, (caddr_t)vp,
|
|
|
|
|
trunc_page(file_offset));
|
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
|
|
/* copy from kernel VM space to user space */
|
|
|
|
|
error = copyout((caddr_t)(uintptr_t)(buffer + file_offset),
|
|
|
|
|
(caddr_t)vmaddr, a_out->a_text + a_out->a_data);
|
|
|
|
|
|
|
|
|
|
/* release temporary kernel space */
|
|
|
|
|
vm_map_remove(kernel_map, buffer, buffer +
|
|
|
|
|
round_page(a_out->a_text + a_out->a_data + file_offset));
|
|
|
|
|
|
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
} else {
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
printf("uselib: Page aligned binary %lu\n", file_offset);
|
|
|
|
|
#endif
|
|
|
|
|
/*
|
|
|
|
|
* for QMAGIC, a_entry is 20 bytes beyond the load address
|
|
|
|
|
* to skip the executable header
|
|
|
|
|
*/
|
|
|
|
|
vmaddr = trunc_page(a_out->a_entry);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Map it all into the process's space as a single
|
|
|
|
|
* copy-on-write "data" segment.
|
|
|
|
|
*/
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = vm_mmap(&td->td_proc->p_vmspace->vm_map, &vmaddr,
|
2001-09-08 19:07:04 +00:00
|
|
|
|
a_out->a_text + a_out->a_data, VM_PROT_ALL, VM_PROT_ALL,
|
|
|
|
|
MAP_PRIVATE | MAP_FIXED, (caddr_t)vp, file_offset);
|
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
printf("mem=%08lx = %08lx %08lx\n", (long)vmaddr, ((long*)vmaddr)[0],
|
|
|
|
|
((long*)vmaddr)[1]);
|
|
|
|
|
#endif
|
|
|
|
|
if (bss_size != 0) {
|
|
|
|
|
/* Calculate BSS start address */
|
|
|
|
|
vmaddr = trunc_page(a_out->a_entry) + a_out->a_text +
|
|
|
|
|
a_out->a_data;
|
|
|
|
|
|
|
|
|
|
/* allocate some 'anon' space */
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = vm_map_find(&td->td_proc->p_vmspace->vm_map, NULL, 0,
|
|
|
|
|
&vmaddr, bss_size, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (error)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
1996-02-16 18:40:50 +00:00
|
|
|
|
|
|
|
|
|
cleanup:
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/* Unlock vnode if needed */
|
|
|
|
|
if (locked)
|
2001-09-12 08:38:13 +00:00
|
|
|
|
VOP_UNLOCK(vp, 0, td);
|
1996-02-16 18:40:50 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/* Release the kernel mapping. */
|
|
|
|
|
if (a_out)
|
|
|
|
|
vm_map_remove(kernel_map, (vm_offset_t)a_out,
|
|
|
|
|
(vm_offset_t)a_out + PAGE_SIZE);
|
1996-02-16 18:40:50 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return error;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_select(struct thread *td, struct linux_select_args *args)
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct select_args bsa;
|
|
|
|
|
struct timeval tv0, tv1, utv, *tvp;
|
|
|
|
|
caddr_t sg;
|
|
|
|
|
int error;
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#ifdef DEBUG
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (ldebug(select))
|
|
|
|
|
printf(ARGS(select, "%d, %p, %p, %p, %p"), args->nfds,
|
|
|
|
|
(void *)args->readfds, (void *)args->writefds,
|
|
|
|
|
(void *)args->exceptfds, (void *)args->timeout);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
error = 0;
|
|
|
|
|
bsa.nd = args->nfds;
|
|
|
|
|
bsa.in = args->readfds;
|
|
|
|
|
bsa.ou = args->writefds;
|
|
|
|
|
bsa.ex = args->exceptfds;
|
|
|
|
|
bsa.tv = (struct timeval *)args->timeout;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Store current time for computation of the amount of
|
|
|
|
|
* time left.
|
|
|
|
|
*/
|
|
|
|
|
if (args->timeout) {
|
|
|
|
|
if ((error = copyin((caddr_t)args->timeout, &utv,
|
|
|
|
|
sizeof(utv))))
|
|
|
|
|
goto select_out;
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#ifdef DEBUG
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (ldebug(select))
|
|
|
|
|
printf(LMSG("incoming timeout (%ld/%ld)"),
|
|
|
|
|
utv.tv_sec, utv.tv_usec);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
if (itimerfix(&utv)) {
|
|
|
|
|
/*
|
|
|
|
|
* The timeval was invalid. Convert it to something
|
|
|
|
|
* valid that will act as it does under Linux.
|
|
|
|
|
*/
|
|
|
|
|
sg = stackgap_init();
|
|
|
|
|
tvp = stackgap_alloc(&sg, sizeof(utv));
|
|
|
|
|
utv.tv_sec += utv.tv_usec / 1000000;
|
|
|
|
|
utv.tv_usec %= 1000000;
|
|
|
|
|
if (utv.tv_usec < 0) {
|
|
|
|
|
utv.tv_sec -= 1;
|
|
|
|
|
utv.tv_usec += 1000000;
|
|
|
|
|
}
|
|
|
|
|
if (utv.tv_sec < 0)
|
|
|
|
|
timevalclear(&utv);
|
|
|
|
|
if ((error = copyout(&utv, tvp, sizeof(utv))))
|
|
|
|
|
goto select_out;
|
|
|
|
|
bsa.tv = tvp;
|
|
|
|
|
}
|
|
|
|
|
microtime(&tv0);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = select(td, &bsa);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#ifdef DEBUG
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (ldebug(select))
|
2001-02-16 16:40:43 +00:00
|
|
|
|
printf(LMSG("real select returns %d"), error);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (error) {
|
|
|
|
|
/*
|
|
|
|
|
* See fs/select.c in the Linux kernel. Without this,
|
|
|
|
|
* Maelstrom doesn't work.
|
|
|
|
|
*/
|
|
|
|
|
if (error == ERESTART)
|
|
|
|
|
error = EINTR;
|
|
|
|
|
goto select_out;
|
|
|
|
|
}
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (args->timeout) {
|
2001-09-12 08:38:13 +00:00
|
|
|
|
if (td->td_retval[0]) {
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/*
|
|
|
|
|
* Compute how much time was left of the timeout,
|
|
|
|
|
* by subtracting the current time and the time
|
|
|
|
|
* before we started the call, and subtracting
|
|
|
|
|
* that result from the user-supplied value.
|
|
|
|
|
*/
|
|
|
|
|
microtime(&tv1);
|
|
|
|
|
timevalsub(&tv1, &tv0);
|
|
|
|
|
timevalsub(&utv, &tv1);
|
|
|
|
|
if (utv.tv_sec < 0)
|
|
|
|
|
timevalclear(&utv);
|
|
|
|
|
} else
|
|
|
|
|
timevalclear(&utv);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#ifdef DEBUG
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (ldebug(select))
|
|
|
|
|
printf(LMSG("outgoing timeout (%ld/%ld)"),
|
|
|
|
|
utv.tv_sec, utv.tv_usec);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if ((error = copyout(&utv, (caddr_t)args->timeout,
|
|
|
|
|
sizeof(utv))))
|
|
|
|
|
goto select_out;
|
|
|
|
|
}
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
|
|
|
|
|
select_out:
|
|
|
|
|
#ifdef DEBUG
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (ldebug(select))
|
|
|
|
|
printf(LMSG("select_out -> %d"), error);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return error;
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
}
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
1998-07-10 22:30:08 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_mremap(struct thread *td, struct linux_mremap_args *args)
|
1998-07-10 22:30:08 +00:00
|
|
|
|
{
|
|
|
|
|
struct munmap_args /* {
|
|
|
|
|
void *addr;
|
|
|
|
|
size_t len;
|
|
|
|
|
} */ bsd_args;
|
|
|
|
|
int error = 0;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(mremap))
|
|
|
|
|
printf(ARGS(mremap, "%p, %08lx, %08lx, %08lx"),
|
|
|
|
|
(void *)args->addr,
|
|
|
|
|
(unsigned long)args->old_len,
|
|
|
|
|
(unsigned long)args->new_len,
|
|
|
|
|
(unsigned long)args->flags);
|
1998-07-10 22:30:08 +00:00
|
|
|
|
#endif
|
|
|
|
|
args->new_len = round_page(args->new_len);
|
|
|
|
|
args->old_len = round_page(args->old_len);
|
|
|
|
|
|
|
|
|
|
if (args->new_len > args->old_len) {
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = 0;
|
1998-07-10 22:30:08 +00:00
|
|
|
|
return ENOMEM;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (args->new_len < args->old_len) {
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsd_args.addr = (caddr_t)(args->addr + args->new_len);
|
1998-07-10 22:30:08 +00:00
|
|
|
|
bsd_args.len = args->old_len - args->new_len;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = munmap(td, &bsd_args);
|
1998-07-10 22:30:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = error ? 0 : (u_long)args->addr;
|
1998-07-10 22:30:08 +00:00
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_msync(struct thread *td, struct linux_msync_args *args)
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
{
|
|
|
|
|
struct msync_args bsd_args;
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsd_args.addr = (caddr_t)args->addr;
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
bsd_args.len = args->len;
|
|
|
|
|
bsd_args.flags = 0; /* XXX ignore */
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return msync(td, &bsd_args);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
}
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifndef __alpha__
|
1995-06-25 17:32:43 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_time(struct thread *td, struct linux_time_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct timeval tv;
|
|
|
|
|
l_time_t tm;
|
|
|
|
|
int error;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(time))
|
|
|
|
|
printf(ARGS(time, "*"));
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
microtime(&tv);
|
|
|
|
|
tm = tv.tv_sec;
|
|
|
|
|
if (args->tm && (error = copyout(&tm, (caddr_t)args->tm, sizeof(tm))))
|
|
|
|
|
return error;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = tm;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return 0;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif /*!__alpha__*/
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct l_times_argv {
|
|
|
|
|
l_long tms_utime;
|
|
|
|
|
l_long tms_stime;
|
|
|
|
|
l_long tms_cutime;
|
|
|
|
|
l_long tms_cstime;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
};
|
|
|
|
|
|
2001-03-23 19:22:21 +00:00
|
|
|
|
#ifdef __alpha__
|
|
|
|
|
#define CLK_TCK 1024 /* Linux uses 1024 on alpha */
|
|
|
|
|
#else
|
1996-03-04 21:03:11 +00:00
|
|
|
|
#define CLK_TCK 100 /* Linux uses 100 */
|
2001-03-23 19:22:21 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
1996-03-04 21:03:11 +00:00
|
|
|
|
#define CONVTCK(r) (r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK))
|
|
|
|
|
|
1995-06-25 17:32:43 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_times(struct thread *td, struct linux_times_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct timeval tv;
|
|
|
|
|
struct l_times_argv tms;
|
|
|
|
|
struct rusage ru;
|
|
|
|
|
int error;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(times))
|
|
|
|
|
printf(ARGS(times, "*"));
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
1996-03-04 21:03:11 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
mtx_lock_spin(&sched_lock);
|
2001-09-12 08:38:13 +00:00
|
|
|
|
calcru(td->td_proc, &ru.ru_utime, &ru.ru_stime, NULL);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
mtx_unlock_spin(&sched_lock);
|
1996-03-04 21:03:11 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
tms.tms_utime = CONVTCK(ru.ru_utime);
|
|
|
|
|
tms.tms_stime = CONVTCK(ru.ru_stime);
|
1996-03-04 21:03:11 +00:00
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
tms.tms_cutime = CONVTCK(td->td_proc->p_stats->p_cru.ru_utime);
|
|
|
|
|
tms.tms_cstime = CONVTCK(td->td_proc->p_stats->p_cru.ru_stime);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
if ((error = copyout(&tms, (caddr_t)args->buf, sizeof(tms))))
|
|
|
|
|
return error;
|
1996-03-04 21:03:11 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
microuptime(&tv);
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = (int)CONVTCK(tv);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return 0;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_newuname(struct thread *td, struct linux_newuname_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct l_new_utsname utsname;
|
o Introduce pr_mtx into struct prison, providing protection for the
mutable contents of struct prison (hostname, securelevel, refcount,
pr_linux, ...)
o Generally introduce mtx_lock()/mtx_unlock() calls throughout kern/
so as to enforce these protections, in particular, in kern_mib.c
protection sysctl access to the hostname and securelevel, as well as
kern_prot.c access to the securelevel for access control purposes.
o Rewrite linux emulator abstractions for accessing per-jail linux
mib entries (osname, osrelease, osversion) so that they don't return
a pointer to the text in the struct linux_prison, rather, a copy
to an array passed into the calls. Likewise, update linprocfs to
use these primitives.
o Update in_pcb.c to always use prison_getip() rather than directly
accessing struct prison.
Reviewed by: jhb
2001-12-03 16:12:27 +00:00
|
|
|
|
char osname[LINUX_MAX_UTSNAME];
|
|
|
|
|
char osrelease[LINUX_MAX_UTSNAME];
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(newuname))
|
|
|
|
|
printf(ARGS(newuname, "*"));
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
1999-08-25 11:19:03 +00:00
|
|
|
|
|
o Introduce pr_mtx into struct prison, providing protection for the
mutable contents of struct prison (hostname, securelevel, refcount,
pr_linux, ...)
o Generally introduce mtx_lock()/mtx_unlock() calls throughout kern/
so as to enforce these protections, in particular, in kern_mib.c
protection sysctl access to the hostname and securelevel, as well as
kern_prot.c access to the securelevel for access control purposes.
o Rewrite linux emulator abstractions for accessing per-jail linux
mib entries (osname, osrelease, osversion) so that they don't return
a pointer to the text in the struct linux_prison, rather, a copy
to an array passed into the calls. Likewise, update linprocfs to
use these primitives.
o Update in_pcb.c to always use prison_getip() rather than directly
accessing struct prison.
Reviewed by: jhb
2001-12-03 16:12:27 +00:00
|
|
|
|
linux_get_osname(td->td_proc, osname);
|
|
|
|
|
linux_get_osrelease(td->td_proc, osrelease);
|
1999-08-27 19:47:41 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bzero(&utsname, sizeof(utsname));
|
1999-08-27 19:47:41 +00:00
|
|
|
|
strncpy(utsname.sysname, osname, LINUX_MAX_UTSNAME-1);
|
2002-02-27 16:47:27 +00:00
|
|
|
|
getcredhostname(td->td_ucred, utsname.nodename, LINUX_MAX_UTSNAME-1);
|
1999-08-27 19:47:41 +00:00
|
|
|
|
strncpy(utsname.release, osrelease, LINUX_MAX_UTSNAME-1);
|
1999-08-25 11:19:03 +00:00
|
|
|
|
strncpy(utsname.version, version, LINUX_MAX_UTSNAME-1);
|
|
|
|
|
strncpy(utsname.machine, machine, LINUX_MAX_UTSNAME-1);
|
|
|
|
|
strncpy(utsname.domainname, domainname, LINUX_MAX_UTSNAME-1);
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return (copyout(&utsname, (caddr_t)args->buf, sizeof(utsname)));
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
#if defined(__i386__)
|
|
|
|
|
struct l_utimbuf {
|
|
|
|
|
l_time_t l_actime;
|
|
|
|
|
l_time_t l_modtime;
|
1996-03-04 21:03:11 +00:00
|
|
|
|
};
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_utime(struct thread *td, struct linux_utime_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct utimes_args /* {
|
|
|
|
|
char *path;
|
|
|
|
|
struct timeval *tptr;
|
|
|
|
|
} */ bsdutimes;
|
|
|
|
|
struct timeval tv[2], *tvp;
|
|
|
|
|
struct l_utimbuf lut;
|
|
|
|
|
int error;
|
|
|
|
|
caddr_t sg;
|
|
|
|
|
|
|
|
|
|
sg = stackgap_init();
|
2001-09-12 08:38:13 +00:00
|
|
|
|
CHECKALTEXIST(td, &sg, args->fname);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(utime))
|
|
|
|
|
printf(ARGS(utime, "%s, *"), args->fname);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
if (args->times) {
|
|
|
|
|
if ((error = copyin((caddr_t)args->times, &lut, sizeof lut)))
|
|
|
|
|
return error;
|
|
|
|
|
tv[0].tv_sec = lut.l_actime;
|
|
|
|
|
tv[0].tv_usec = 0;
|
|
|
|
|
tv[1].tv_sec = lut.l_modtime;
|
|
|
|
|
tv[1].tv_usec = 0;
|
|
|
|
|
/* so that utimes can copyin */
|
|
|
|
|
tvp = (struct timeval *)stackgap_alloc(&sg, sizeof(tv));
|
|
|
|
|
if (tvp == NULL)
|
|
|
|
|
return (ENAMETOOLONG);
|
|
|
|
|
if ((error = copyout(tv, tvp, sizeof(tv))))
|
|
|
|
|
return error;
|
|
|
|
|
bsdutimes.tptr = tvp;
|
|
|
|
|
} else
|
|
|
|
|
bsdutimes.tptr = NULL;
|
|
|
|
|
|
|
|
|
|
bsdutimes.path = args->fname;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return utimes(td, &bsdutimes);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
2001-09-08 19:07:04 +00:00
|
|
|
|
#endif /* __i386__ */
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
1999-03-02 00:28:09 +00:00
|
|
|
|
#define __WCLONE 0x80000000
|
|
|
|
|
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifndef __alpha__
|
1995-06-25 17:32:43 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_waitpid(struct thread *td, struct linux_waitpid_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct wait_args /* {
|
|
|
|
|
int pid;
|
|
|
|
|
int *status;
|
|
|
|
|
int options;
|
|
|
|
|
struct rusage *rusage;
|
|
|
|
|
} */ tmp;
|
|
|
|
|
int error, tmpstat;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(waitpid))
|
|
|
|
|
printf(ARGS(waitpid, "%d, %p, %d"),
|
|
|
|
|
args->pid, (void *)args->status, args->options);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
1999-01-26 02:38:12 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
tmp.pid = args->pid;
|
|
|
|
|
tmp.status = args->status;
|
|
|
|
|
tmp.options = (args->options & (WNOHANG | WUNTRACED));
|
|
|
|
|
/* WLINUXCLONE should be equal to __WCLONE, but we make sure */
|
|
|
|
|
if (args->options & __WCLONE)
|
|
|
|
|
tmp.options |= WLINUXCLONE;
|
|
|
|
|
tmp.rusage = NULL;
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
if ((error = wait4(td, &tmp)) != 0)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return error;
|
|
|
|
|
|
|
|
|
|
if (args->status) {
|
|
|
|
|
if ((error = copyin((caddr_t)args->status, &tmpstat,
|
|
|
|
|
sizeof(int))) != 0)
|
|
|
|
|
return error;
|
|
|
|
|
tmpstat &= 0xffff;
|
|
|
|
|
if (WIFSIGNALED(tmpstat))
|
|
|
|
|
tmpstat = (tmpstat & 0xffffff80) |
|
|
|
|
|
BSD_TO_LINUX_SIGNAL(WTERMSIG(tmpstat));
|
|
|
|
|
else if (WIFSTOPPED(tmpstat))
|
|
|
|
|
tmpstat = (tmpstat & 0xffff00ff) |
|
|
|
|
|
(BSD_TO_LINUX_SIGNAL(WSTOPSIG(tmpstat)) << 8);
|
|
|
|
|
return copyout(&tmpstat, (caddr_t)args->status, sizeof(int));
|
|
|
|
|
}
|
|
|
|
|
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
return 0;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
}
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif /*!__alpha__*/
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_wait4(struct thread *td, struct linux_wait4_args *args)
|
1995-06-25 17:32:43 +00:00
|
|
|
|
{
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct wait_args /* {
|
|
|
|
|
int pid;
|
|
|
|
|
int *status;
|
|
|
|
|
int options;
|
|
|
|
|
struct rusage *rusage;
|
|
|
|
|
} */ tmp;
|
|
|
|
|
int error, tmpstat;
|
1995-06-25 17:32:43 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(wait4))
|
|
|
|
|
printf(ARGS(wait4, "%d, %p, %d, %p"),
|
|
|
|
|
args->pid, (void *)args->status, args->options,
|
|
|
|
|
(void *)args->rusage);
|
1995-06-25 17:32:43 +00:00
|
|
|
|
#endif
|
1996-01-14 10:59:58 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
tmp.pid = args->pid;
|
|
|
|
|
tmp.status = args->status;
|
|
|
|
|
tmp.options = (args->options & (WNOHANG | WUNTRACED));
|
|
|
|
|
/* WLINUXCLONE should be equal to __WCLONE, but we make sure */
|
|
|
|
|
if (args->options & __WCLONE)
|
|
|
|
|
tmp.options |= WLINUXCLONE;
|
|
|
|
|
tmp.rusage = (struct rusage *)args->rusage;
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
if ((error = wait4(td, &tmp)) != 0)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return error;
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
SIGDELSET(td->td_proc->p_siglist, SIGCHLD);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
|
|
|
|
if (args->status) {
|
|
|
|
|
if ((error = copyin((caddr_t)args->status, &tmpstat,
|
|
|
|
|
sizeof(int))) != 0)
|
|
|
|
|
return error;
|
|
|
|
|
tmpstat &= 0xffff;
|
|
|
|
|
if (WIFSIGNALED(tmpstat))
|
|
|
|
|
tmpstat = (tmpstat & 0xffffff80) |
|
|
|
|
|
BSD_TO_LINUX_SIGNAL(WTERMSIG(tmpstat));
|
|
|
|
|
else if (WIFSTOPPED(tmpstat))
|
|
|
|
|
tmpstat = (tmpstat & 0xffff00ff) |
|
|
|
|
|
(BSD_TO_LINUX_SIGNAL(WSTOPSIG(tmpstat)) << 8);
|
|
|
|
|
return copyout(&tmpstat, (caddr_t)args->status, sizeof(int));
|
|
|
|
|
}
|
|
|
|
|
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
1996-01-14 10:59:58 +00:00
|
|
|
|
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_mknod(struct thread *td, struct linux_mknod_args *args)
|
1996-01-14 10:59:58 +00:00
|
|
|
|
{
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
caddr_t sg;
|
|
|
|
|
struct mknod_args bsd_mknod;
|
|
|
|
|
struct mkfifo_args bsd_mkfifo;
|
|
|
|
|
|
|
|
|
|
sg = stackgap_init();
|
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
CHECKALTCREAT(td, &sg, args->path);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(mknod))
|
|
|
|
|
printf(ARGS(mknod, "%s, %d, %d"),
|
|
|
|
|
args->path, args->mode, args->dev);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (args->mode & S_IFIFO) {
|
|
|
|
|
bsd_mkfifo.path = args->path;
|
|
|
|
|
bsd_mkfifo.mode = args->mode;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return mkfifo(td, &bsd_mkfifo);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
} else {
|
|
|
|
|
bsd_mknod.path = args->path;
|
|
|
|
|
bsd_mknod.mode = args->mode;
|
|
|
|
|
bsd_mknod.dev = args->dev;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return mknod(td, &bsd_mknod);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* UGH! This is just about the dumbest idea I've ever heard!!
|
|
|
|
|
*/
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_personality(struct thread *td, struct linux_personality_args *args)
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
{
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(personality))
|
|
|
|
|
printf(ARGS(personality, "%d"), args->per);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifndef __alpha__
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
if (args->per != 0)
|
|
|
|
|
return EINVAL;
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
|
|
|
|
|
/* Yes Jim, it's still a Linux... */
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = 0;
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Wrappers for get/setitimer for debugging..
|
|
|
|
|
*/
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_setitimer(struct thread *td, struct linux_setitimer_args *args)
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
{
|
|
|
|
|
struct setitimer_args bsa;
|
|
|
|
|
struct itimerval foo;
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(setitimer))
|
|
|
|
|
printf(ARGS(setitimer, "%p, %p"),
|
|
|
|
|
(void *)args->itv, (void *)args->oitv);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
|
|
|
|
bsa.which = args->which;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsa.itv = (struct itimerval *)args->itv;
|
|
|
|
|
bsa.oitv = (struct itimerval *)args->oitv;
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
if (args->itv) {
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if ((error = copyin((caddr_t)args->itv, &foo, sizeof(foo))))
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
return error;
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(setitimer)) {
|
|
|
|
|
printf("setitimer: value: sec: %ld, usec: %ld\n",
|
|
|
|
|
foo.it_value.tv_sec, foo.it_value.tv_usec);
|
|
|
|
|
printf("setitimer: interval: sec: %ld, usec: %ld\n",
|
|
|
|
|
foo.it_interval.tv_sec, foo.it_interval.tv_usec);
|
|
|
|
|
}
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
|
|
|
|
}
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return setitimer(td, &bsa);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_getitimer(struct thread *td, struct linux_getitimer_args *args)
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
{
|
|
|
|
|
struct getitimer_args bsa;
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(getitimer))
|
|
|
|
|
printf(ARGS(getitimer, "%p"), (void *)args->itv);
|
Mega-commit for Linux emulator update.. This has been stress tested under
netscape-2.0 for Linux running all the Java stuff. The scrollbars are now
working, at least on my machine. (whew! :-)
I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.
The main changes:
COMPAT_LINUX is *GONE*. Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself. The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code. All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first. Like IBCS2, you can statically compile it in with "options LINUX".
A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality(). The Linux-ELF libraries want
to use some of these.
linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.
Quite a few bugs removed, including incorrect arguments being used in
syscalls.. eg: mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.
The build for the code has changed. i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.
Supporting changes elsewhere in the kernel:
The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS). This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.
The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only. This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.
makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code. It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)
At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area. This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.
1996-03-02 19:38:20 +00:00
|
|
|
|
#endif
|
|
|
|
|
bsa.which = args->which;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsa.itv = (struct itimerval *)args->itv;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return getitimer(td, &bsa);
|
1996-01-14 10:59:58 +00:00
|
|
|
|
}
|
1997-10-29 08:17:14 +00:00
|
|
|
|
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifndef __alpha__
|
1997-10-29 08:17:14 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_nice(struct thread *td, struct linux_nice_args *args)
|
1997-10-29 08:17:14 +00:00
|
|
|
|
{
|
|
|
|
|
struct setpriority_args bsd_args;
|
|
|
|
|
|
|
|
|
|
bsd_args.which = PRIO_PROCESS;
|
|
|
|
|
bsd_args.who = 0; /* current process */
|
|
|
|
|
bsd_args.prio = args->inc;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return setpriority(td, &bsd_args);
|
1997-10-29 08:17:14 +00:00
|
|
|
|
}
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif /*!__alpha__*/
|
1997-10-29 08:17:14 +00:00
|
|
|
|
|
1998-12-30 21:01:34 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_setgroups(struct thread *td, struct linux_setgroups_args *args)
|
1998-12-30 21:01:34 +00:00
|
|
|
|
{
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
struct ucred *newcred, *oldcred;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
l_gid_t linux_gidset[NGROUPS];
|
1999-08-25 14:11:01 +00:00
|
|
|
|
gid_t *bsd_gidset;
|
|
|
|
|
int ngrp, error;
|
2002-04-13 23:11:23 +00:00
|
|
|
|
struct proc *p;
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
ngrp = args->gidsetsize;
|
2002-04-13 23:11:23 +00:00
|
|
|
|
if (ngrp >= NGROUPS)
|
|
|
|
|
return (EINVAL);
|
|
|
|
|
error = copyin((caddr_t)args->grouplist, linux_gidset,
|
|
|
|
|
ngrp * sizeof(l_gid_t));
|
|
|
|
|
if (error)
|
|
|
|
|
return (error);
|
|
|
|
|
newcred = crget();
|
|
|
|
|
p = td->td_proc;
|
|
|
|
|
PROC_LOCK(p);
|
|
|
|
|
oldcred = p->p_ucred;
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
1999-08-25 14:11:01 +00:00
|
|
|
|
/*
|
|
|
|
|
* cr_groups[0] holds egid. Setting the whole set from
|
|
|
|
|
* the supplied set will cause egid to be changed too.
|
|
|
|
|
* Keep cr_groups[0] unchanged to prevent that.
|
|
|
|
|
*/
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
2002-04-13 23:11:23 +00:00
|
|
|
|
if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) {
|
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
|
crfree(newcred);
|
1999-08-25 14:11:01 +00:00
|
|
|
|
return (error);
|
2002-04-13 23:11:23 +00:00
|
|
|
|
}
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
2002-04-13 23:11:23 +00:00
|
|
|
|
crcopy(newcred, oldcred);
|
1999-08-25 14:11:01 +00:00
|
|
|
|
if (ngrp > 0) {
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
newcred->cr_ngroups = ngrp + 1;
|
1999-08-25 14:11:01 +00:00
|
|
|
|
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
bsd_gidset = newcred->cr_groups;
|
1999-08-25 14:11:01 +00:00
|
|
|
|
ngrp--;
|
|
|
|
|
while (ngrp >= 0) {
|
|
|
|
|
bsd_gidset[ngrp + 1] = linux_gidset[ngrp];
|
|
|
|
|
ngrp--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
newcred->cr_ngroups = 1;
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
2002-04-13 23:11:23 +00:00
|
|
|
|
setsugid(p);
|
|
|
|
|
p->p_ucred = newcred;
|
|
|
|
|
PROC_UNLOCK(p);
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
crfree(oldcred);
|
1999-08-25 14:11:01 +00:00
|
|
|
|
return (0);
|
1998-12-30 21:01:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_getgroups(struct thread *td, struct linux_getgroups_args *args)
|
1998-12-30 21:01:34 +00:00
|
|
|
|
{
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
struct ucred *cred;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
l_gid_t linux_gidset[NGROUPS];
|
1999-08-25 14:11:01 +00:00
|
|
|
|
gid_t *bsd_gidset;
|
|
|
|
|
int bsd_gidsetsz, ngrp, error;
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
2002-04-11 21:00:05 +00:00
|
|
|
|
cred = td->td_ucred;
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
bsd_gidset = cred->cr_groups;
|
|
|
|
|
bsd_gidsetsz = cred->cr_ngroups - 1;
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
1999-08-25 14:11:01 +00:00
|
|
|
|
/*
|
|
|
|
|
* cr_groups[0] holds egid. Returning the whole set
|
|
|
|
|
* here will cause a duplicate. Exclude cr_groups[0]
|
|
|
|
|
* to prevent that.
|
|
|
|
|
*/
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if ((ngrp = args->gidsetsize) == 0) {
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = bsd_gidsetsz;
|
1999-08-25 14:11:01 +00:00
|
|
|
|
return (0);
|
|
|
|
|
}
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
1999-08-29 08:52:38 +00:00
|
|
|
|
if (ngrp < bsd_gidsetsz)
|
1999-08-25 14:11:01 +00:00
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
1999-08-29 08:52:38 +00:00
|
|
|
|
ngrp = 0;
|
1999-08-25 14:11:01 +00:00
|
|
|
|
while (ngrp < bsd_gidsetsz) {
|
1999-08-29 08:52:38 +00:00
|
|
|
|
linux_gidset[ngrp] = bsd_gidset[ngrp + 1];
|
1999-08-25 14:11:01 +00:00
|
|
|
|
ngrp++;
|
|
|
|
|
}
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if ((error = copyout(linux_gidset, (caddr_t)args->grouplist,
|
|
|
|
|
ngrp * sizeof(l_gid_t))))
|
1999-08-25 14:11:01 +00:00
|
|
|
|
return (error);
|
1998-12-30 21:01:34 +00:00
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = ngrp;
|
1999-08-25 14:11:01 +00:00
|
|
|
|
return (0);
|
1998-12-30 21:01:34 +00:00
|
|
|
|
}
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#ifndef __alpha__
|
1999-08-11 13:34:31 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_setrlimit(struct thread *td, struct linux_setrlimit_args *args)
|
1999-08-11 13:34:31 +00:00
|
|
|
|
{
|
2000-08-26 02:18:41 +00:00
|
|
|
|
struct __setrlimit_args bsd;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct l_rlimit rlim;
|
2000-08-26 02:18:41 +00:00
|
|
|
|
int error;
|
|
|
|
|
caddr_t sg = stackgap_init();
|
1999-08-15 13:28:35 +00:00
|
|
|
|
|
1999-08-11 13:34:31 +00:00
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(setrlimit))
|
|
|
|
|
printf(ARGS(setrlimit, "%d, %p"),
|
2001-09-08 19:07:04 +00:00
|
|
|
|
args->resource, (void *)args->rlim);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (args->resource >= LINUX_RLIM_NLIMITS)
|
2000-08-26 02:18:41 +00:00
|
|
|
|
return (EINVAL);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsd.which = linux_to_bsd_resource[args->resource];
|
2000-08-26 02:18:41 +00:00
|
|
|
|
if (bsd.which == -1)
|
|
|
|
|
return (EINVAL);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
error = copyin((caddr_t)args->rlim, &rlim, sizeof(rlim));
|
2000-08-26 02:18:41 +00:00
|
|
|
|
if (error)
|
|
|
|
|
return (error);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2000-08-26 02:18:41 +00:00
|
|
|
|
bsd.rlp = stackgap_alloc(&sg, sizeof(struct rlimit));
|
|
|
|
|
bsd.rlp->rlim_cur = (rlim_t)rlim.rlim_cur;
|
|
|
|
|
bsd.rlp->rlim_max = (rlim_t)rlim.rlim_max;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return (setrlimit(td, &bsd));
|
1999-08-11 13:34:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_old_getrlimit(struct thread *td, struct linux_old_getrlimit_args *args)
|
1999-08-11 13:34:31 +00:00
|
|
|
|
{
|
2000-08-26 02:18:41 +00:00
|
|
|
|
struct __getrlimit_args bsd;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct l_rlimit rlim;
|
2000-08-26 02:18:41 +00:00
|
|
|
|
int error;
|
|
|
|
|
caddr_t sg = stackgap_init();
|
1999-08-15 13:28:35 +00:00
|
|
|
|
|
1999-08-11 13:34:31 +00:00
|
|
|
|
#ifdef DEBUG
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (ldebug(old_getrlimit))
|
|
|
|
|
printf(ARGS(old_getrlimit, "%d, %p"),
|
|
|
|
|
args->resource, (void *)args->rlim);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (args->resource >= LINUX_RLIM_NLIMITS)
|
2000-08-26 02:18:41 +00:00
|
|
|
|
return (EINVAL);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsd.which = linux_to_bsd_resource[args->resource];
|
2000-08-26 02:18:41 +00:00
|
|
|
|
if (bsd.which == -1)
|
|
|
|
|
return (EINVAL);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2000-08-26 02:18:41 +00:00
|
|
|
|
bsd.rlp = stackgap_alloc(&sg, sizeof(struct rlimit));
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = getrlimit(td, &bsd);
|
2000-08-26 02:18:41 +00:00
|
|
|
|
if (error)
|
|
|
|
|
return (error);
|
1999-08-11 13:34:31 +00:00
|
|
|
|
|
2000-08-26 02:18:41 +00:00
|
|
|
|
rlim.rlim_cur = (unsigned long)bsd.rlp->rlim_cur;
|
2000-08-26 05:08:10 +00:00
|
|
|
|
if (rlim.rlim_cur == ULONG_MAX)
|
|
|
|
|
rlim.rlim_cur = LONG_MAX;
|
2000-08-26 02:18:41 +00:00
|
|
|
|
rlim.rlim_max = (unsigned long)bsd.rlp->rlim_max;
|
2000-08-26 05:08:10 +00:00
|
|
|
|
if (rlim.rlim_max == ULONG_MAX)
|
|
|
|
|
rlim.rlim_max = LONG_MAX;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return (copyout(&rlim, (caddr_t)args->rlim, sizeof(rlim)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_getrlimit(struct thread *td, struct linux_getrlimit_args *args)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
{
|
|
|
|
|
struct __getrlimit_args bsd;
|
|
|
|
|
struct l_rlimit rlim;
|
|
|
|
|
int error;
|
|
|
|
|
caddr_t sg = stackgap_init();
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
if (ldebug(getrlimit))
|
|
|
|
|
printf(ARGS(getrlimit, "%d, %p"),
|
|
|
|
|
args->resource, (void *)args->rlim);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (args->resource >= LINUX_RLIM_NLIMITS)
|
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
|
|
bsd.which = linux_to_bsd_resource[args->resource];
|
|
|
|
|
if (bsd.which == -1)
|
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
|
|
bsd.rlp = stackgap_alloc(&sg, sizeof(struct rlimit));
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = getrlimit(td, &bsd);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (error)
|
|
|
|
|
return (error);
|
|
|
|
|
|
|
|
|
|
rlim.rlim_cur = (l_ulong)bsd.rlp->rlim_cur;
|
|
|
|
|
rlim.rlim_max = (l_ulong)bsd.rlp->rlim_max;
|
|
|
|
|
return (copyout(&rlim, (caddr_t)args->rlim, sizeof(rlim)));
|
1999-08-11 13:34:31 +00:00
|
|
|
|
}
|
2000-11-01 19:48:35 +00:00
|
|
|
|
#endif /*!__alpha__*/
|
1999-08-15 17:28:40 +00:00
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_sched_setscheduler(struct thread *td,
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct linux_sched_setscheduler_args *args)
|
1999-08-15 17:28:40 +00:00
|
|
|
|
{
|
|
|
|
|
struct sched_setscheduler_args bsd;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(sched_setscheduler))
|
|
|
|
|
printf(ARGS(sched_setscheduler, "%d, %d, %p"),
|
2001-09-08 19:07:04 +00:00
|
|
|
|
args->pid, args->policy, (const void *)args->param);
|
1999-08-15 17:28:40 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
switch (args->policy) {
|
1999-08-15 17:28:40 +00:00
|
|
|
|
case LINUX_SCHED_OTHER:
|
|
|
|
|
bsd.policy = SCHED_OTHER;
|
|
|
|
|
break;
|
|
|
|
|
case LINUX_SCHED_FIFO:
|
|
|
|
|
bsd.policy = SCHED_FIFO;
|
|
|
|
|
break;
|
|
|
|
|
case LINUX_SCHED_RR:
|
|
|
|
|
bsd.policy = SCHED_RR;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsd.pid = args->pid;
|
|
|
|
|
bsd.param = (struct sched_param *)args->param;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return sched_setscheduler(td, &bsd);
|
1999-08-15 17:28:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_sched_getscheduler(struct thread *td,
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct linux_sched_getscheduler_args *args)
|
1999-08-15 17:28:40 +00:00
|
|
|
|
{
|
|
|
|
|
struct sched_getscheduler_args bsd;
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2001-02-16 16:40:43 +00:00
|
|
|
|
if (ldebug(sched_getscheduler))
|
2001-09-08 19:07:04 +00:00
|
|
|
|
printf(ARGS(sched_getscheduler, "%d"), args->pid);
|
1999-08-15 17:28:40 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsd.pid = args->pid;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
error = sched_getscheduler(td, &bsd);
|
1999-08-15 17:28:40 +00:00
|
|
|
|
|
2001-09-12 08:38:13 +00:00
|
|
|
|
switch (td->td_retval[0]) {
|
1999-08-15 17:28:40 +00:00
|
|
|
|
case SCHED_OTHER:
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = LINUX_SCHED_OTHER;
|
1999-08-15 17:28:40 +00:00
|
|
|
|
break;
|
|
|
|
|
case SCHED_FIFO:
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = LINUX_SCHED_FIFO;
|
1999-08-15 17:28:40 +00:00
|
|
|
|
break;
|
|
|
|
|
case SCHED_RR:
|
2001-09-12 08:38:13 +00:00
|
|
|
|
td->td_retval[0] = LINUX_SCHED_RR;
|
1999-08-15 17:28:40 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
}
|
2001-02-16 14:42:11 +00:00
|
|
|
|
|
2001-04-01 06:37:40 +00:00
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_sched_get_priority_max(struct thread *td,
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct linux_sched_get_priority_max_args *args)
|
2001-04-01 06:37:40 +00:00
|
|
|
|
{
|
|
|
|
|
struct sched_get_priority_max_args bsd;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
if (ldebug(sched_get_priority_max))
|
2001-09-08 19:07:04 +00:00
|
|
|
|
printf(ARGS(sched_get_priority_max, "%d"), args->policy);
|
2001-04-01 06:37:40 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
switch (args->policy) {
|
2001-04-01 06:37:40 +00:00
|
|
|
|
case LINUX_SCHED_OTHER:
|
|
|
|
|
bsd.policy = SCHED_OTHER;
|
|
|
|
|
break;
|
|
|
|
|
case LINUX_SCHED_FIFO:
|
|
|
|
|
bsd.policy = SCHED_FIFO;
|
|
|
|
|
break;
|
|
|
|
|
case LINUX_SCHED_RR:
|
|
|
|
|
bsd.policy = SCHED_RR;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return sched_get_priority_max(td, &bsd);
|
2001-04-01 06:37:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_sched_get_priority_min(struct thread *td,
|
2001-09-08 19:07:04 +00:00
|
|
|
|
struct linux_sched_get_priority_min_args *args)
|
2001-04-01 06:37:40 +00:00
|
|
|
|
{
|
|
|
|
|
struct sched_get_priority_min_args bsd;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
if (ldebug(sched_get_priority_min))
|
2001-09-08 19:07:04 +00:00
|
|
|
|
printf(ARGS(sched_get_priority_min, "%d"), args->policy);
|
2001-04-01 06:37:40 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
switch (args->policy) {
|
2001-04-01 06:37:40 +00:00
|
|
|
|
case LINUX_SCHED_OTHER:
|
|
|
|
|
bsd.policy = SCHED_OTHER;
|
|
|
|
|
break;
|
|
|
|
|
case LINUX_SCHED_FIFO:
|
|
|
|
|
bsd.policy = SCHED_FIFO;
|
|
|
|
|
break;
|
|
|
|
|
case LINUX_SCHED_RR:
|
|
|
|
|
bsd.policy = SCHED_RR;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return sched_get_priority_min(td, &bsd);
|
2001-04-01 06:37:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-02-16 14:42:11 +00:00
|
|
|
|
#define REBOOT_CAD_ON 0x89abcdef
|
|
|
|
|
#define REBOOT_CAD_OFF 0
|
|
|
|
|
#define REBOOT_HALT 0xcdef0123
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_reboot(struct thread *td, struct linux_reboot_args *args)
|
2001-02-16 14:42:11 +00:00
|
|
|
|
{
|
|
|
|
|
struct reboot_args bsd_args;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
if (ldebug(reboot))
|
2001-09-08 19:07:04 +00:00
|
|
|
|
printf(ARGS(reboot, "0x%x"), args->cmd);
|
2001-02-16 14:42:11 +00:00
|
|
|
|
#endif
|
2001-09-08 19:07:04 +00:00
|
|
|
|
if (args->cmd == REBOOT_CAD_ON || args->cmd == REBOOT_CAD_OFF)
|
2001-02-16 14:42:11 +00:00
|
|
|
|
return (0);
|
2001-09-08 19:07:04 +00:00
|
|
|
|
bsd_args.opt = (args->cmd == REBOOT_HALT) ? RB_HALT : 0;
|
2001-09-12 08:38:13 +00:00
|
|
|
|
return (reboot(td, &bsd_args));
|
2001-02-16 14:42:11 +00:00
|
|
|
|
}
|
2001-09-08 19:07:04 +00:00
|
|
|
|
|
2002-01-23 22:46:14 +00:00
|
|
|
|
#ifndef __alpha__
|
|
|
|
|
|
2001-09-08 19:07:04 +00:00
|
|
|
|
/*
|
|
|
|
|
* The FreeBSD native getpid(2), getgid(2) and getuid(2) also modify
|
2001-09-12 08:38:13 +00:00
|
|
|
|
* td->td_retval[1] when COMPAT_43 or COMPAT_SUNOS is defined. This
|
2001-09-08 19:07:04 +00:00
|
|
|
|
* globbers registers that are assumed to be preserved. The following
|
|
|
|
|
* lightweight syscalls fixes this. See also linux_getgid16() and
|
|
|
|
|
* linux_getuid16() in linux_uid16.c.
|
|
|
|
|
*
|
|
|
|
|
* linux_getpid() - MP SAFE
|
|
|
|
|
* linux_getgid() - MP SAFE
|
|
|
|
|
* linux_getuid() - MP SAFE
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_getpid(struct thread *td, struct linux_getpid_args *args)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
{
|
2001-09-12 08:38:13 +00:00
|
|
|
|
|
|
|
|
|
td->td_retval[0] = td->td_proc->p_pid;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_getgid(struct thread *td, struct linux_getgid_args *args)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
{
|
2001-09-12 08:38:13 +00:00
|
|
|
|
|
2002-04-11 21:00:05 +00:00
|
|
|
|
td->td_retval[0] = td->td_ucred->cr_rgid;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
|
linux_getuid(struct thread *td, struct linux_getuid_args *args)
|
2001-09-08 19:07:04 +00:00
|
|
|
|
{
|
2001-09-12 08:38:13 +00:00
|
|
|
|
|
2002-04-11 21:00:05 +00:00
|
|
|
|
td->td_retval[0] = td->td_ucred->cr_ruid;
|
2001-09-08 19:07:04 +00:00
|
|
|
|
return (0);
|
|
|
|
|
}
|
2001-09-15 09:57:30 +00:00
|
|
|
|
|
2002-01-23 22:46:14 +00:00
|
|
|
|
#endif /*!__alpha__*/
|
|
|
|
|
|
2001-09-15 09:57:30 +00:00
|
|
|
|
int
|
|
|
|
|
linux_getsid(struct thread *td, struct linux_getsid_args *args)
|
|
|
|
|
{
|
|
|
|
|
struct getsid_args bsd;
|
|
|
|
|
bsd.pid = args->pid;
|
|
|
|
|
return getsid(td, &bsd);
|
|
|
|
|
}
|