1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1982, 1986, 1989, 1991, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
* (c) UNIX System Laboratories, Inc.
|
|
|
|
* All or some portions of this file are derived from material licensed
|
|
|
|
* to the University of California by American Telephone and Telegraph
|
|
|
|
* Co. or Unix System Laboratories, Inc. and are reproduced herein with
|
|
|
|
* the permission of UNIX System Laboratories, Inc.
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 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. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
|
|
|
|
*
|
|
|
|
* @(#)kern_fork.c 8.6 (Berkeley) 4/8/94
|
1999-08-28 01:08:13 +00:00
|
|
|
* $FreeBSD$
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
|
1996-01-03 21:42:35 +00:00
|
|
|
#include "opt_ktrace.h"
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
1995-11-12 06:43:28 +00:00
|
|
|
#include <sys/sysproto.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/filedesc.h>
|
|
|
|
#include <sys/kernel.h>
|
1997-04-26 15:59:50 +00:00
|
|
|
#include <sys/sysctl.h>
|
Rework the witness code to work with sx locks as well as mutexes.
- Introduce lock classes and lock objects. Each lock class specifies a
name and set of flags (or properties) shared by all locks of a given
type. Currently there are three lock classes: spin mutexes, sleep
mutexes, and sx locks. A lock object specifies properties of an
additional lock along with a lock name and all of the extra stuff needed
to make witness work with a given lock. This abstract lock stuff is
defined in sys/lock.h. The lockmgr constants, types, and prototypes have
been moved to sys/lockmgr.h. For temporary backwards compatability,
sys/lock.h includes sys/lockmgr.h.
- Replace proc->p_spinlocks with a per-CPU list, PCPU(spinlocks), of spin
locks held. By making this per-cpu, we do not have to jump through
magic hoops to deal with sched_lock changing ownership during context
switches.
- Replace proc->p_heldmtx, formerly a list of held sleep mutexes, with
proc->p_sleeplocks, which is a list of held sleep locks including sleep
mutexes and sx locks.
- Add helper macros for logging lock events via the KTR_LOCK KTR logging
level so that the log messages are consistent.
- Add some new flags that can be passed to mtx_init():
- MTX_NOWITNESS - specifies that this lock should be ignored by witness.
This is used for the mutex that blocks a sx lock for example.
- MTX_QUIET - this is not new, but you can pass this to mtx_init() now
and no events will be logged for this lock, so that one doesn't have
to change all the individual mtx_lock/unlock() operations.
- All lock objects maintain an initialized flag. Use this flag to export
a mtx_initialized() macro that can be safely called from drivers. Also,
we on longer walk the all_mtx list if MUTEX_DEBUG is defined as witness
performs the corresponding checks using the initialized flag.
- The lock order reversal messages have been improved to output slightly
more accurate file and line numbers.
2001-03-28 09:03:24 +00:00
|
|
|
#include <sys/lock.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/malloc.h>
|
2000-10-20 07:58:15 +00:00
|
|
|
#include <sys/mutex.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/proc.h>
|
|
|
|
#include <sys/resourcevar.h>
|
2001-01-24 10:47:14 +00:00
|
|
|
#include <sys/syscall.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/vnode.h>
|
|
|
|
#include <sys/acct.h>
|
2000-09-07 01:33:02 +00:00
|
|
|
#include <sys/ktr.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/ktrace.h>
|
2001-01-24 10:47:14 +00:00
|
|
|
#include <sys/kthread.h>
|
1996-09-03 14:25:27 +00:00
|
|
|
#include <sys/unistd.h>
|
2001-03-07 02:30:39 +00:00
|
|
|
#include <sys/jail.h>
|
|
|
|
#include <sys/sx.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1994-10-10 01:00:49 +00:00
|
|
|
#include <vm/vm.h>
|
1996-02-23 18:49:25 +00:00
|
|
|
#include <vm/pmap.h>
|
|
|
|
#include <vm/vm_map.h>
|
1995-12-07 12:48:31 +00:00
|
|
|
#include <vm/vm_extern.h>
|
VM level code cleanups.
1) Start using TSM.
Struct procs continue to point to upages structure, after being freed.
Struct vmspace continues to point to pte object and kva space for kstack.
u_map is now superfluous.
2) vm_map's don't need to be reference counted. They always exist either
in the kernel or in a vmspace. The vmspaces are managed by reference
counts.
3) Remove the "wired" vm_map nonsense.
4) No need to keep a cache of kernel stack kva's.
5) Get rid of strange looking ++var, and change to var++.
6) Change more data structures to use our "zone" allocator. Added
struct proc, struct vmspace and struct vnode. This saves a significant
amount of kva space and physical memory. Additionally, this enables
TSM for the zone managed memory.
7) Keep ioopt disabled for now.
8) Remove the now bogus "single use" map concept.
9) Use generation counts or id's for data structures residing in TSM, where
it allows us to avoid unneeded restart overhead during traversals, where
blocking might occur.
10) Account better for memory deficits, so the pageout daemon will be able
to make enough memory available (experimental.)
11) Fix some vnode locking problems. (From Tor, I think.)
12) Add a check in ufs_lookup, to avoid lots of unneeded calls to bcmp.
(experimental.)
13) Significantly shrink, cleanup, and make slightly faster the vm_fault.c
code. Use generation counts, get rid of unneded collpase operations,
and clean up the cluster code.
14) Make vm_zone more suitable for TSM.
This commit is partially as a result of discussions and contributions from
other people, including DG, Tor Egge, PHK, and probably others that I
have forgotten to attribute (so let me know, if I forgot.)
This is not the infamous, final cleanup of the vnode stuff, but a necessary
step. Vnode mgmt should be correct, but things might still change, and
there is still some missing stuff (like ioopt, and physical backing of
non-merged cache files, debugging of layering concepts.)
1998-01-22 17:30:44 +00:00
|
|
|
#include <vm/vm_zone.h>
|
1994-10-10 01:00:49 +00:00
|
|
|
|
2001-01-23 14:32:01 +00:00
|
|
|
#include <sys/vmmeter.h>
|
1999-01-07 21:23:50 +00:00
|
|
|
#include <sys/user.h>
|
1999-01-26 02:38:12 +00:00
|
|
|
|
1999-11-19 21:29:03 +00:00
|
|
|
static MALLOC_DEFINE(M_ATFORK, "atfork", "atfork callback");
|
|
|
|
|
1997-11-20 16:36:17 +00:00
|
|
|
static int fast_vfork = 1;
|
2000-06-26 13:52:31 +00:00
|
|
|
SYSCTL_INT(_kern, OID_AUTO, fast_vfork, CTLFLAG_RW, &fast_vfork, 0,
|
|
|
|
"flag to indicate whether we have a fast vfork()");
|
1997-04-26 15:59:50 +00:00
|
|
|
|
1996-08-19 02:28:24 +00:00
|
|
|
/*
|
1996-08-22 03:50:33 +00:00
|
|
|
* These are the stuctures used to create a callout list for things to do
|
|
|
|
* when forking a process
|
1996-08-19 02:28:24 +00:00
|
|
|
*/
|
1999-11-19 21:29:03 +00:00
|
|
|
struct forklist {
|
1996-08-19 02:28:24 +00:00
|
|
|
forklist_fn function;
|
2000-05-26 02:09:24 +00:00
|
|
|
TAILQ_ENTRY(forklist) next;
|
1999-11-19 21:29:03 +00:00
|
|
|
};
|
1996-08-19 02:28:24 +00:00
|
|
|
|
2001-03-07 02:30:39 +00:00
|
|
|
static struct sx fork_list_lock;
|
|
|
|
|
2000-05-26 02:09:24 +00:00
|
|
|
TAILQ_HEAD(forklist_head, forklist);
|
1999-11-19 21:29:03 +00:00
|
|
|
static struct forklist_head fork_list = TAILQ_HEAD_INITIALIZER(fork_list);
|
1996-08-19 02:28:24 +00:00
|
|
|
|
1995-11-12 06:43:28 +00:00
|
|
|
#ifndef _SYS_SYSPROTO_H_
|
1995-10-08 00:06:22 +00:00
|
|
|
struct fork_args {
|
1996-08-22 03:50:33 +00:00
|
|
|
int dummy;
|
1995-10-08 00:06:22 +00:00
|
|
|
};
|
1995-11-12 06:43:28 +00:00
|
|
|
#endif
|
1995-10-08 00:06:22 +00:00
|
|
|
|
2001-03-07 02:30:39 +00:00
|
|
|
static void
|
|
|
|
init_fork_list(void *data __unused)
|
|
|
|
{
|
|
|
|
|
|
|
|
sx_init(&fork_list_lock, "fork list");
|
|
|
|
}
|
|
|
|
SYSINIT(fork_list, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_fork_list, NULL);
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/* ARGSUSED */
|
1994-05-25 09:21:21 +00:00
|
|
|
int
|
1997-11-06 19:29:57 +00:00
|
|
|
fork(p, uap)
|
1994-05-24 10:09:53 +00:00
|
|
|
struct proc *p;
|
|
|
|
struct fork_args *uap;
|
|
|
|
{
|
1999-06-30 15:33:41 +00:00
|
|
|
int error;
|
|
|
|
struct proc *p2;
|
1997-11-20 16:36:17 +00:00
|
|
|
|
1999-06-30 15:33:41 +00:00
|
|
|
error = fork1(p, RFFDG | RFPROC, &p2);
|
|
|
|
if (error == 0) {
|
|
|
|
p->p_retval[0] = p2->p_pid;
|
|
|
|
p->p_retval[1] = 0;
|
|
|
|
}
|
|
|
|
return error;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ARGSUSED */
|
1994-05-25 09:21:21 +00:00
|
|
|
int
|
1997-11-06 19:29:57 +00:00
|
|
|
vfork(p, uap)
|
1994-05-24 10:09:53 +00:00
|
|
|
struct proc *p;
|
1996-02-23 18:49:25 +00:00
|
|
|
struct vfork_args *uap;
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
1999-06-30 15:33:41 +00:00
|
|
|
int error;
|
|
|
|
struct proc *p2;
|
1997-11-20 16:36:17 +00:00
|
|
|
|
1999-06-30 15:33:41 +00:00
|
|
|
error = fork1(p, RFFDG | RFPROC | RFPPWAIT | RFMEM, &p2);
|
|
|
|
if (error == 0) {
|
|
|
|
p->p_retval[0] = p2->p_pid;
|
|
|
|
p->p_retval[1] = 0;
|
|
|
|
}
|
|
|
|
return error;
|
1996-02-23 18:49:25 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1996-02-23 18:49:25 +00:00
|
|
|
int
|
1997-11-06 19:29:57 +00:00
|
|
|
rfork(p, uap)
|
1996-02-23 18:49:25 +00:00
|
|
|
struct proc *p;
|
|
|
|
struct rfork_args *uap;
|
|
|
|
{
|
1999-06-30 15:33:41 +00:00
|
|
|
int error;
|
|
|
|
struct proc *p2;
|
1997-11-20 16:36:17 +00:00
|
|
|
|
2000-09-07 01:33:02 +00:00
|
|
|
/* mask kernel only flags out of the user flags */
|
|
|
|
error = fork1(p, uap->flags & ~RFKERNELONLY, &p2);
|
1999-06-30 15:33:41 +00:00
|
|
|
if (error == 0) {
|
1999-07-03 20:58:44 +00:00
|
|
|
p->p_retval[0] = p2 ? p2->p_pid : 0;
|
1999-06-30 15:33:41 +00:00
|
|
|
p->p_retval[1] = 0;
|
|
|
|
}
|
|
|
|
return error;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1996-02-23 18:49:25 +00:00
|
|
|
|
2000-12-04 10:23:29 +00:00
|
|
|
int nprocs = 1; /* process 0 */
|
2001-06-11 21:54:19 +00:00
|
|
|
int lastpid = 0;
|
|
|
|
SYSCTL_INT(_kern, OID_AUTO, lastpid, CTLFLAG_RD, &lastpid, 0,
|
2001-02-12 17:59:01 +00:00
|
|
|
"Last used PID");
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1999-12-06 11:13:50 +00:00
|
|
|
/*
|
2001-06-11 21:54:19 +00:00
|
|
|
* Random component to lastpid generation. We mix in a random factor to make
|
1999-12-06 11:13:50 +00:00
|
|
|
* it a little harder to predict. We sanity check the modulus value to avoid
|
|
|
|
* doing it in critical paths. Don't let it be too small or we pointlessly
|
|
|
|
* waste randomness entropy, and don't let it be impossibly large. Using a
|
|
|
|
* modulus that is too big causes a LOT more process table scans and slows
|
|
|
|
* down fork processing as the pidchecked caching is defeated.
|
|
|
|
*/
|
1999-11-28 17:51:09 +00:00
|
|
|
static int randompid = 0;
|
1999-12-06 11:13:50 +00:00
|
|
|
|
|
|
|
static int
|
2000-07-04 11:25:35 +00:00
|
|
|
sysctl_kern_randompid(SYSCTL_HANDLER_ARGS)
|
1999-12-06 11:13:50 +00:00
|
|
|
{
|
2000-12-04 10:23:29 +00:00
|
|
|
int error, pid;
|
|
|
|
|
|
|
|
pid = randompid;
|
|
|
|
error = sysctl_handle_int(oidp, &pid, 0, req);
|
|
|
|
if (error || !req->newptr)
|
1999-12-06 11:13:50 +00:00
|
|
|
return (error);
|
2000-12-04 10:23:29 +00:00
|
|
|
if (pid < 0 || pid > PID_MAX - 100) /* out of range */
|
|
|
|
pid = PID_MAX - 100;
|
|
|
|
else if (pid < 2) /* NOP */
|
|
|
|
pid = 0;
|
|
|
|
else if (pid < 100) /* Make it reasonable */
|
|
|
|
pid = 100;
|
|
|
|
randompid = pid;
|
|
|
|
return (error);
|
1999-12-06 11:13:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SYSCTL_PROC(_kern, OID_AUTO, randompid, CTLTYPE_INT|CTLFLAG_RW,
|
|
|
|
0, 0, sysctl_kern_randompid, "I", "Random PID modulus");
|
1999-11-28 17:51:09 +00:00
|
|
|
|
1997-12-12 04:00:59 +00:00
|
|
|
int
|
1999-06-30 15:33:41 +00:00
|
|
|
fork1(p1, flags, procp)
|
2000-12-04 10:23:29 +00:00
|
|
|
struct proc *p1; /* parent proc */
|
1996-04-17 17:05:08 +00:00
|
|
|
int flags;
|
2000-12-04 10:23:29 +00:00
|
|
|
struct proc **procp; /* child proc */
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
1999-06-30 15:33:41 +00:00
|
|
|
struct proc *p2, *pptr;
|
|
|
|
uid_t uid;
|
1994-05-24 10:09:53 +00:00
|
|
|
struct proc *newproc;
|
2000-09-07 01:33:02 +00:00
|
|
|
int trypid;
|
2000-06-22 22:27:16 +00:00
|
|
|
int ok;
|
1996-10-27 13:29:22 +00:00
|
|
|
static int pidchecked = 0;
|
1999-11-19 21:29:03 +00:00
|
|
|
struct forklist *ep;
|
2001-03-07 05:21:47 +00:00
|
|
|
struct filedesc *fd;
|
1997-04-13 01:48:35 +00:00
|
|
|
|
2001-07-04 16:20:28 +00:00
|
|
|
GIANT_REQUIRED;
|
|
|
|
|
2000-09-07 01:33:02 +00:00
|
|
|
/* Can't copy and clear */
|
1996-04-17 17:05:08 +00:00
|
|
|
if ((flags & (RFFDG|RFCFDG)) == (RFFDG|RFCFDG))
|
|
|
|
return (EINVAL);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1997-04-13 01:48:35 +00:00
|
|
|
/*
|
|
|
|
* Here we don't create a new process, but we divorce
|
|
|
|
* certain parts of a process from itself.
|
|
|
|
*/
|
|
|
|
if ((flags & RFPROC) == 0) {
|
1999-12-06 04:53:08 +00:00
|
|
|
vm_fork(p1, 0, flags);
|
1997-04-13 01:48:35 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Close all file descriptors.
|
|
|
|
*/
|
|
|
|
if (flags & RFCFDG) {
|
|
|
|
struct filedesc *fdtmp;
|
|
|
|
fdtmp = fdinit(p1);
|
2001-03-07 05:21:47 +00:00
|
|
|
PROC_LOCK(p1);
|
1997-04-13 01:48:35 +00:00
|
|
|
fdfree(p1);
|
|
|
|
p1->p_fd = fdtmp;
|
2001-03-07 05:21:47 +00:00
|
|
|
PROC_UNLOCK(p1);
|
1997-04-13 01:48:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unshare file descriptors (from parent.)
|
|
|
|
*/
|
|
|
|
if (flags & RFFDG) {
|
|
|
|
if (p1->p_fd->fd_refcnt > 1) {
|
|
|
|
struct filedesc *newfd;
|
|
|
|
newfd = fdcopy(p1);
|
2001-03-07 05:21:47 +00:00
|
|
|
PROC_LOCK(p1);
|
1997-04-13 01:48:35 +00:00
|
|
|
fdfree(p1);
|
|
|
|
p1->p_fd = newfd;
|
2001-03-07 05:21:47 +00:00
|
|
|
PROC_UNLOCK(p1);
|
1997-04-13 01:48:35 +00:00
|
|
|
}
|
|
|
|
}
|
1999-07-03 20:58:44 +00:00
|
|
|
*procp = NULL;
|
1997-04-13 01:48:35 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Although process entries are dynamically created, we still keep
|
|
|
|
* a global limit on the maximum number we will create. Don't allow
|
|
|
|
* a nonprivileged user to use the last process; don't let root
|
|
|
|
* exceed the limit. The variable nprocs is the current number of
|
|
|
|
* processes, maxproc is the limit.
|
|
|
|
*/
|
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
|
|
|
uid = p1->p_ucred->cr_ruid;
|
1994-05-24 10:09:53 +00:00
|
|
|
if ((nprocs >= maxproc - 1 && uid != 0) || nprocs >= maxproc) {
|
|
|
|
tablefull("proc");
|
|
|
|
return (EAGAIN);
|
|
|
|
}
|
1996-03-03 19:48:45 +00:00
|
|
|
/*
|
|
|
|
* Increment the nprocs resource before blocking can occur. There
|
|
|
|
* are hard-limits as to the number of processes that can run.
|
|
|
|
*/
|
|
|
|
nprocs++;
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Increment the count of procs running with this uid. Don't allow
|
|
|
|
* a nonprivileged user to exceed their current limit.
|
|
|
|
*/
|
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
|
|
|
ok = chgproccnt(p1->p_ucred->cr_ruidinfo, 1,
|
2000-09-14 23:07:39 +00:00
|
|
|
(uid != 0) ? p1->p_rlimit[RLIMIT_NPROC].rlim_cur : 0);
|
|
|
|
if (!ok) {
|
1996-03-03 19:48:45 +00:00
|
|
|
/*
|
|
|
|
* Back out the process count
|
|
|
|
*/
|
|
|
|
nprocs--;
|
1994-05-24 10:09:53 +00:00
|
|
|
return (EAGAIN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate new proc. */
|
VM level code cleanups.
1) Start using TSM.
Struct procs continue to point to upages structure, after being freed.
Struct vmspace continues to point to pte object and kva space for kstack.
u_map is now superfluous.
2) vm_map's don't need to be reference counted. They always exist either
in the kernel or in a vmspace. The vmspaces are managed by reference
counts.
3) Remove the "wired" vm_map nonsense.
4) No need to keep a cache of kernel stack kva's.
5) Get rid of strange looking ++var, and change to var++.
6) Change more data structures to use our "zone" allocator. Added
struct proc, struct vmspace and struct vnode. This saves a significant
amount of kva space and physical memory. Additionally, this enables
TSM for the zone managed memory.
7) Keep ioopt disabled for now.
8) Remove the now bogus "single use" map concept.
9) Use generation counts or id's for data structures residing in TSM, where
it allows us to avoid unneeded restart overhead during traversals, where
blocking might occur.
10) Account better for memory deficits, so the pageout daemon will be able
to make enough memory available (experimental.)
11) Fix some vnode locking problems. (From Tor, I think.)
12) Add a check in ufs_lookup, to avoid lots of unneeded calls to bcmp.
(experimental.)
13) Significantly shrink, cleanup, and make slightly faster the vm_fault.c
code. Use generation counts, get rid of unneded collpase operations,
and clean up the cluster code.
14) Make vm_zone more suitable for TSM.
This commit is partially as a result of discussions and contributions from
other people, including DG, Tor Egge, PHK, and probably others that I
have forgotten to attribute (so let me know, if I forgot.)
This is not the infamous, final cleanup of the vnode stuff, but a necessary
step. Vnode mgmt should be correct, but things might still change, and
there is still some missing stuff (like ioopt, and physical backing of
non-merged cache files, debugging of layering concepts.)
1998-01-22 17:30:44 +00:00
|
|
|
newproc = zalloc(proc_zone);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1999-06-30 15:33:41 +00:00
|
|
|
/*
|
|
|
|
* Setup linkage for kernel based threading
|
|
|
|
*/
|
1997-06-16 00:29:36 +00:00
|
|
|
if((flags & RFTHREAD) != 0) {
|
|
|
|
newproc->p_peers = p1->p_peers;
|
|
|
|
p1->p_peers = newproc;
|
|
|
|
newproc->p_leader = p1->p_leader;
|
|
|
|
} else {
|
2001-01-24 10:47:14 +00:00
|
|
|
newproc->p_peers = NULL;
|
1997-06-16 00:29:36 +00:00
|
|
|
newproc->p_leader = newproc;
|
|
|
|
}
|
|
|
|
|
1999-07-21 18:02:27 +00:00
|
|
|
newproc->p_vmspace = NULL;
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Find an unused process ID. We remember a range of unused IDs
|
2001-06-11 21:54:19 +00:00
|
|
|
* ready to use (from lastpid+1 through pidchecked-1).
|
2000-09-07 01:33:02 +00:00
|
|
|
*
|
|
|
|
* If RFHIGHPID is set (used during system boot), do not allocate
|
|
|
|
* low-numbered pids.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_xlock(&allproc_lock);
|
2001-06-11 21:54:19 +00:00
|
|
|
trypid = lastpid + 1;
|
2000-09-07 01:33:02 +00:00
|
|
|
if (flags & RFHIGHPID) {
|
|
|
|
if (trypid < 10) {
|
|
|
|
trypid = 10;
|
|
|
|
}
|
|
|
|
} else {
|
2000-12-04 10:23:29 +00:00
|
|
|
if (randompid)
|
2000-09-07 01:33:02 +00:00
|
|
|
trypid += arc4random() % randompid;
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
retry:
|
|
|
|
/*
|
|
|
|
* If the process ID prototype has wrapped around,
|
|
|
|
* restart somewhat above 0, as the low-numbered procs
|
|
|
|
* tend to include daemons that don't exit.
|
|
|
|
*/
|
2000-09-07 01:33:02 +00:00
|
|
|
if (trypid >= PID_MAX) {
|
|
|
|
trypid = trypid % PID_MAX;
|
|
|
|
if (trypid < 100)
|
|
|
|
trypid += 100;
|
1994-05-24 10:09:53 +00:00
|
|
|
pidchecked = 0;
|
|
|
|
}
|
2000-09-07 01:33:02 +00:00
|
|
|
if (trypid >= pidchecked) {
|
1994-05-24 10:09:53 +00:00
|
|
|
int doingzomb = 0;
|
|
|
|
|
|
|
|
pidchecked = PID_MAX;
|
|
|
|
/*
|
|
|
|
* Scan the active and zombie procs to check whether this pid
|
|
|
|
* is in use. Remember the lowest pid that's greater
|
2000-09-07 01:33:02 +00:00
|
|
|
* than trypid, so we can avoid checking for a while.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1999-11-16 10:56:05 +00:00
|
|
|
p2 = LIST_FIRST(&allproc);
|
1994-05-24 10:09:53 +00:00
|
|
|
again:
|
2001-01-24 10:47:14 +00:00
|
|
|
for (; p2 != NULL; p2 = LIST_NEXT(p2, p_list)) {
|
2000-09-07 01:33:02 +00:00
|
|
|
while (p2->p_pid == trypid ||
|
|
|
|
p2->p_pgrp->pg_id == trypid ||
|
|
|
|
p2->p_session->s_sid == trypid) {
|
|
|
|
trypid++;
|
|
|
|
if (trypid >= pidchecked)
|
1994-05-24 10:09:53 +00:00
|
|
|
goto retry;
|
|
|
|
}
|
2000-09-07 01:33:02 +00:00
|
|
|
if (p2->p_pid > trypid && pidchecked > p2->p_pid)
|
1994-05-24 10:09:53 +00:00
|
|
|
pidchecked = p2->p_pid;
|
2000-09-07 01:33:02 +00:00
|
|
|
if (p2->p_pgrp->pg_id > trypid &&
|
1994-05-24 10:09:53 +00:00
|
|
|
pidchecked > p2->p_pgrp->pg_id)
|
|
|
|
pidchecked = p2->p_pgrp->pg_id;
|
2000-09-07 01:33:02 +00:00
|
|
|
if (p2->p_session->s_sid > trypid &&
|
1998-11-09 15:08:04 +00:00
|
|
|
pidchecked > p2->p_session->s_sid)
|
|
|
|
pidchecked = p2->p_session->s_sid;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
if (!doingzomb) {
|
|
|
|
doingzomb = 1;
|
1999-11-16 10:56:05 +00:00
|
|
|
p2 = LIST_FIRST(&zombproc);
|
1994-05-24 10:09:53 +00:00
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-07 01:33:02 +00:00
|
|
|
/*
|
2001-06-11 21:54:19 +00:00
|
|
|
* RFHIGHPID does not mess with the lastpid counter during boot.
|
2000-09-07 01:33:02 +00:00
|
|
|
*/
|
|
|
|
if (flags & RFHIGHPID)
|
|
|
|
pidchecked = 0;
|
|
|
|
else
|
2001-06-11 21:54:19 +00:00
|
|
|
lastpid = trypid;
|
2000-09-07 01:33:02 +00:00
|
|
|
|
2000-11-22 07:42:04 +00:00
|
|
|
p2 = newproc;
|
|
|
|
p2->p_stat = SIDL; /* protect against others */
|
|
|
|
p2->p_pid = trypid;
|
|
|
|
LIST_INSERT_HEAD(&allproc, p2, p_list);
|
|
|
|
LIST_INSERT_HEAD(PIDHASH(p2->p_pid), p2, p_hash);
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_xunlock(&allproc_lock);
|
2000-11-22 07:42:04 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Make a proc table entry for the new process.
|
|
|
|
* Start by zeroing the section of proc that is zero-initialized,
|
|
|
|
* then copy the section that is copied directly from the parent.
|
|
|
|
*/
|
|
|
|
bzero(&p2->p_startzero,
|
|
|
|
(unsigned) ((caddr_t)&p2->p_endzero - (caddr_t)&p2->p_startzero));
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p1);
|
1994-05-24 10:09:53 +00:00
|
|
|
bcopy(&p1->p_startcopy, &p2->p_startcopy,
|
|
|
|
(unsigned) ((caddr_t)&p2->p_endcopy - (caddr_t)&p2->p_startcopy));
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p1);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2000-12-03 01:22:34 +00:00
|
|
|
mtx_init(&p2->p_mtx, "process lock", MTX_DEF);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p2);
|
1997-07-06 02:40:43 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Duplicate sub-structures as needed.
|
|
|
|
* Increase reference counts on shared objects.
|
|
|
|
* The p_stats and p_sigacts substructs are set in vm_fork.
|
|
|
|
*/
|
2001-01-24 10:47:14 +00:00
|
|
|
p2->p_flag = 0;
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&sched_lock);
|
2001-01-24 10:47:14 +00:00
|
|
|
p2->p_sflag = PS_INMEM;
|
|
|
|
if (p1->p_sflag & PS_PROFIL)
|
1994-05-24 10:09:53 +00:00
|
|
|
startprofclock(p2);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&sched_lock);
|
2001-03-09 07:24:17 +00:00
|
|
|
/*
|
|
|
|
* We start off holding one spinlock after fork: sched_lock.
|
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p1);
|
1994-05-24 10:09:53 +00:00
|
|
|
crhold(p1->p_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
|
|
|
p2->p_ucred = p1->p_ucred;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1999-11-16 20:31:58 +00:00
|
|
|
if (p2->p_args)
|
|
|
|
p2->p_args->ar_ref++;
|
|
|
|
|
1998-12-19 02:55:34 +00:00
|
|
|
if (flags & RFSIGSHARE) {
|
1999-01-07 21:23:50 +00:00
|
|
|
p2->p_procsig = p1->p_procsig;
|
1998-12-19 02:55:34 +00:00
|
|
|
p2->p_procsig->ps_refcnt++;
|
1999-01-07 21:23:50 +00:00
|
|
|
if (p1->p_sigacts == &p1->p_addr->u_sigacts) {
|
|
|
|
struct sigacts *newsigacts;
|
|
|
|
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
PROC_UNLOCK(p2);
|
1999-01-07 21:23:50 +00:00
|
|
|
/* Create the shared sigacts structure */
|
1999-06-30 15:33:41 +00:00
|
|
|
MALLOC(newsigacts, struct sigacts *,
|
|
|
|
sizeof(struct sigacts), M_SUBPROC, M_WAITOK);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p2);
|
|
|
|
PROC_LOCK(p1);
|
1999-06-30 15:33:41 +00:00
|
|
|
/*
|
|
|
|
* Set p_sigacts to the new shared structure.
|
|
|
|
* Note that this is updating p1->p_sigacts at the
|
|
|
|
* same time, since p_sigacts is just a pointer to
|
|
|
|
* the shared p_procsig->ps_sigacts.
|
1999-01-07 21:23:50 +00:00
|
|
|
*/
|
|
|
|
p2->p_sigacts = newsigacts;
|
|
|
|
*p2->p_sigacts = p1->p_addr->u_sigacts;
|
|
|
|
}
|
1998-12-19 02:55:34 +00:00
|
|
|
} else {
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
PROC_UNLOCK(p2);
|
1999-06-30 15:33:41 +00:00
|
|
|
MALLOC(p2->p_procsig, struct procsig *, sizeof(struct procsig),
|
|
|
|
M_SUBPROC, M_WAITOK);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p2);
|
|
|
|
PROC_LOCK(p1);
|
1999-06-30 15:33:41 +00:00
|
|
|
bcopy(p1->p_procsig, p2->p_procsig, sizeof(*p2->p_procsig));
|
1999-01-07 21:23:50 +00:00
|
|
|
p2->p_procsig->ps_refcnt = 1;
|
1999-06-30 15:33:41 +00:00
|
|
|
p2->p_sigacts = NULL; /* finished in vm_fork() */
|
1998-12-19 02:55:34 +00:00
|
|
|
}
|
1999-03-02 00:28:09 +00:00
|
|
|
if (flags & RFLINUXTHPN)
|
1998-12-19 02:55:34 +00:00
|
|
|
p2->p_sigparent = SIGUSR1;
|
1999-03-02 00:28:09 +00:00
|
|
|
else
|
|
|
|
p2->p_sigparent = SIGCHLD;
|
1999-01-26 02:38:12 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/* bump references to the text vnode (for procfs) */
|
|
|
|
p2->p_textvp = p1->p_textvp;
|
2001-03-07 05:21:47 +00:00
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
PROC_UNLOCK(p2);
|
1994-05-24 10:09:53 +00:00
|
|
|
if (p2->p_textvp)
|
|
|
|
VREF(p2->p_textvp);
|
|
|
|
|
1996-04-17 17:05:08 +00:00
|
|
|
if (flags & RFCFDG)
|
2001-03-07 05:21:47 +00:00
|
|
|
fd = fdinit(p1);
|
1996-04-17 17:05:08 +00:00
|
|
|
else if (flags & RFFDG)
|
2001-03-07 05:21:47 +00:00
|
|
|
fd = fdcopy(p1);
|
1996-02-23 18:49:25 +00:00
|
|
|
else
|
2001-03-07 05:21:47 +00:00
|
|
|
fd = fdshare(p1);
|
|
|
|
PROC_LOCK(p2);
|
|
|
|
p2->p_fd = fd;
|
1996-02-23 18:49:25 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* If p_limit is still copy-on-write, bump refcnt,
|
|
|
|
* otherwise get a copy that won't be modified.
|
|
|
|
* (If PL_SHAREMOD is clear, the structure is shared
|
|
|
|
* copy-on-write.)
|
|
|
|
*/
|
2001-03-07 05:21:47 +00:00
|
|
|
PROC_LOCK(p1);
|
1994-05-24 10:09:53 +00:00
|
|
|
if (p1->p_limit->p_lflags & PL_SHAREMOD)
|
|
|
|
p2->p_limit = limcopy(p1->p_limit);
|
|
|
|
else {
|
|
|
|
p2->p_limit = p1->p_limit;
|
|
|
|
p2->p_limit->p_refcnt++;
|
|
|
|
}
|
|
|
|
|
1997-02-17 10:58:46 +00:00
|
|
|
/*
|
2001-03-07 02:30:39 +00:00
|
|
|
* Preserve some more flags in subprocess. PS_PROFIL has already
|
1997-11-20 16:36:17 +00:00
|
|
|
* been preserved.
|
1997-02-17 10:58:46 +00:00
|
|
|
*/
|
2001-05-07 18:07:29 +00:00
|
|
|
p2->p_flag |= p1->p_flag & (P_SUGID | P_ALTSTACK);
|
1994-05-24 10:09:53 +00:00
|
|
|
if (p1->p_session->s_ttyvp != NULL && p1->p_flag & P_CONTROLT)
|
|
|
|
p2->p_flag |= P_CONTROLT;
|
1996-04-17 17:05:08 +00:00
|
|
|
if (flags & RFPPWAIT)
|
1994-05-24 10:09:53 +00:00
|
|
|
p2->p_flag |= P_PPWAIT;
|
1997-11-20 16:36:17 +00:00
|
|
|
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_INSERT_AFTER(p1, p2, p_pglist);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
PROC_UNLOCK(p2);
|
1996-04-17 17:05:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Attach the new process to its parent.
|
|
|
|
*
|
|
|
|
* If RFNOWAIT is set, the newly created process becomes a child
|
|
|
|
* of init. This effectively disassociates the child from the
|
|
|
|
* parent.
|
|
|
|
*/
|
|
|
|
if (flags & RFNOWAIT)
|
|
|
|
pptr = initproc;
|
|
|
|
else
|
|
|
|
pptr = p1;
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_xlock(&proctree_lock);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p2);
|
1996-04-17 17:05:08 +00:00
|
|
|
p2->p_pptr = pptr;
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p2);
|
1996-04-17 17:05:08 +00:00
|
|
|
LIST_INSERT_HEAD(&pptr->p_children, p2, p_sibling);
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_xunlock(&proctree_lock);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p2);
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_INIT(&p2->p_children);
|
2000-09-07 01:33:02 +00:00
|
|
|
LIST_INIT(&p2->p_contested);
|
1996-03-11 06:05:03 +00:00
|
|
|
|
2000-11-27 22:52:31 +00:00
|
|
|
callout_init(&p2->p_itcallout, 0);
|
2000-12-01 04:55:52 +00:00
|
|
|
callout_init(&p2->p_slpcallout, 1);
|
2000-11-27 22:52:31 +00:00
|
|
|
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p1);
|
1994-05-24 10:09:53 +00:00
|
|
|
#ifdef KTRACE
|
|
|
|
/*
|
|
|
|
* Copy traceflag and tracefile if enabled.
|
|
|
|
* If not inherited, these were zeroed above.
|
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
if (p1->p_traceflag & KTRFAC_INHERIT) {
|
1994-05-24 10:09:53 +00:00
|
|
|
p2->p_traceflag = p1->p_traceflag;
|
2001-03-07 05:21:47 +00:00
|
|
|
if ((p2->p_tracep = p1->p_tracep) != NULL) {
|
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
PROC_UNLOCK(p2);
|
1994-05-24 10:09:53 +00:00
|
|
|
VREF(p2->p_tracep);
|
2001-03-07 05:21:47 +00:00
|
|
|
PROC_LOCK(p2);
|
|
|
|
PROC_LOCK(p1);
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1994-08-06 07:15:04 +00:00
|
|
|
/*
|
|
|
|
* set priority of child to be that of parent
|
|
|
|
*/
|
2001-03-07 05:21:47 +00:00
|
|
|
mtx_lock_spin(&sched_lock);
|
1994-08-06 07:15:04 +00:00
|
|
|
p2->p_estcpu = p1->p_estcpu;
|
2001-03-07 05:21:47 +00:00
|
|
|
mtx_unlock_spin(&sched_lock);
|
1994-08-06 07:15:04 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* This begins the section where we must prevent the parent
|
|
|
|
* from being swapped.
|
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
_PHOLD(p1);
|
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
PROC_UNLOCK(p2);
|
1994-08-06 07:15:04 +00:00
|
|
|
|
1996-02-23 18:49:25 +00:00
|
|
|
/*
|
1997-04-07 07:16:06 +00:00
|
|
|
* Finish creating the child process. It will return via a different
|
|
|
|
* execution path later. (ie: directly into user mode)
|
1996-02-23 18:49:25 +00:00
|
|
|
*/
|
1997-04-07 07:16:06 +00:00
|
|
|
vm_fork(p1, p2, flags);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2001-01-23 14:32:01 +00:00
|
|
|
if (flags == (RFFDG | RFPROC)) {
|
|
|
|
cnt.v_forks++;
|
|
|
|
cnt.v_forkpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize;
|
|
|
|
} else if (flags == (RFFDG | RFPROC | RFPPWAIT | RFMEM)) {
|
|
|
|
cnt.v_vforks++;
|
|
|
|
cnt.v_vforkpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize;
|
|
|
|
} else if (p1 == &proc0) {
|
|
|
|
cnt.v_kthreads++;
|
|
|
|
cnt.v_kthreadpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize;
|
|
|
|
} else {
|
|
|
|
cnt.v_rforks++;
|
|
|
|
cnt.v_rforkpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize;
|
|
|
|
}
|
|
|
|
|
1996-08-19 02:28:24 +00:00
|
|
|
/*
|
1999-04-17 08:36:07 +00:00
|
|
|
* Both processes are set up, now check if any loadable modules want
|
1996-08-22 03:50:33 +00:00
|
|
|
* to adjust anything.
|
|
|
|
* What if they have an error? XXX
|
1996-08-19 02:28:24 +00:00
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
sx_slock(&fork_list_lock);
|
1999-11-19 21:29:03 +00:00
|
|
|
TAILQ_FOREACH(ep, &fork_list, next) {
|
1996-08-22 03:50:33 +00:00
|
|
|
(*ep->function)(p1, p2, flags);
|
|
|
|
}
|
2001-03-07 02:30:39 +00:00
|
|
|
sx_sunlock(&fork_list_lock);
|
1996-08-19 02:28:24 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
2000-09-07 01:33:02 +00:00
|
|
|
* If RFSTOPPED not requested, make child runnable and add to
|
|
|
|
* run queue.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1997-04-07 07:16:06 +00:00
|
|
|
microtime(&(p2->p_stats->p_start));
|
|
|
|
p2->p_acflag = AFORK;
|
2000-09-07 01:33:02 +00:00
|
|
|
if ((flags & RFSTOPPED) == 0) {
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&sched_lock);
|
2000-09-07 01:33:02 +00:00
|
|
|
p2->p_stat = SRUN;
|
|
|
|
setrunqueue(p2);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&sched_lock);
|
2000-09-07 01:33:02 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Now can be swapped.
|
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p1);
|
|
|
|
_PRELE(p1);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2000-04-16 18:53:38 +00:00
|
|
|
/*
|
|
|
|
* tell any interested parties about the new process
|
|
|
|
*/
|
|
|
|
KNOTE(&p1->p_klist, NOTE_FORK | p2->p_pid);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p1);
|
2000-04-16 18:53:38 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Preserve synchronization semantics of vfork. If waiting for
|
|
|
|
* child to exec or exit, set P_PPWAIT on child, and sleep on our
|
|
|
|
* proc (in case of exit).
|
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p2);
|
1996-04-17 17:05:08 +00:00
|
|
|
while (p2->p_flag & P_PPWAIT)
|
2001-03-07 02:30:39 +00:00
|
|
|
msleep(p1, &p2->p_mtx, PWAIT, "ppwait", 0);
|
|
|
|
PROC_UNLOCK(p2);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
/*
|
1999-06-30 15:33:41 +00:00
|
|
|
* Return child proc pointer to parent.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1999-06-30 15:33:41 +00:00
|
|
|
*procp = p2;
|
1994-05-24 10:09:53 +00:00
|
|
|
return (0);
|
|
|
|
}
|
1996-08-19 02:28:24 +00:00
|
|
|
|
1996-08-22 03:50:33 +00:00
|
|
|
/*
|
|
|
|
* The next two functionms are general routines to handle adding/deleting
|
|
|
|
* items on the fork callout list.
|
|
|
|
*
|
|
|
|
* at_fork():
|
|
|
|
* Take the arguments given and put them onto the fork callout list,
|
1996-08-19 02:28:24 +00:00
|
|
|
* However first make sure that it's not already there.
|
1996-08-22 03:50:33 +00:00
|
|
|
* Returns 0 on success or a standard error number.
|
1996-08-19 02:28:24 +00:00
|
|
|
*/
|
1999-11-19 21:29:03 +00:00
|
|
|
|
1996-08-19 02:28:24 +00:00
|
|
|
int
|
1997-08-26 00:15:04 +00:00
|
|
|
at_fork(function)
|
|
|
|
forklist_fn function;
|
1996-08-19 02:28:24 +00:00
|
|
|
{
|
1999-11-19 21:29:03 +00:00
|
|
|
struct forklist *ep;
|
1996-08-22 03:50:33 +00:00
|
|
|
|
1999-11-19 21:29:03 +00:00
|
|
|
#ifdef INVARIANTS
|
1996-08-22 03:50:33 +00:00
|
|
|
/* let the programmer know if he's been stupid */
|
|
|
|
if (rm_at_fork(function))
|
1999-11-19 21:29:03 +00:00
|
|
|
printf("WARNING: fork callout entry (%p) already present\n",
|
|
|
|
function);
|
|
|
|
#endif
|
|
|
|
ep = malloc(sizeof(*ep), M_ATFORK, M_NOWAIT);
|
1996-08-22 03:50:33 +00:00
|
|
|
if (ep == NULL)
|
|
|
|
return (ENOMEM);
|
1996-08-19 02:28:24 +00:00
|
|
|
ep->function = function;
|
2001-03-07 02:30:39 +00:00
|
|
|
sx_xlock(&fork_list_lock);
|
1999-11-19 21:29:03 +00:00
|
|
|
TAILQ_INSERT_TAIL(&fork_list, ep, next);
|
2001-03-07 02:30:39 +00:00
|
|
|
sx_xunlock(&fork_list_lock);
|
1996-08-22 03:50:33 +00:00
|
|
|
return (0);
|
1996-08-19 02:28:24 +00:00
|
|
|
}
|
1996-08-22 03:50:33 +00:00
|
|
|
|
1996-08-19 02:28:24 +00:00
|
|
|
/*
|
1999-11-19 21:29:03 +00:00
|
|
|
* Scan the exit callout list for the given item and remove it..
|
|
|
|
* Returns the number of items removed (0 or 1)
|
1996-08-19 02:28:24 +00:00
|
|
|
*/
|
1999-11-19 21:29:03 +00:00
|
|
|
|
1996-08-19 02:28:24 +00:00
|
|
|
int
|
1997-08-26 00:15:04 +00:00
|
|
|
rm_at_fork(function)
|
|
|
|
forklist_fn function;
|
1996-08-19 02:28:24 +00:00
|
|
|
{
|
1999-11-19 21:29:03 +00:00
|
|
|
struct forklist *ep;
|
1996-08-19 02:28:24 +00:00
|
|
|
|
2001-03-07 02:30:39 +00:00
|
|
|
sx_xlock(&fork_list_lock);
|
1999-11-19 21:29:03 +00:00
|
|
|
TAILQ_FOREACH(ep, &fork_list, next) {
|
1996-08-22 03:50:33 +00:00
|
|
|
if (ep->function == function) {
|
1999-11-19 21:29:03 +00:00
|
|
|
TAILQ_REMOVE(&fork_list, ep, next);
|
2001-03-07 02:30:39 +00:00
|
|
|
sx_xunlock(&fork_list_lock);
|
1999-11-19 21:29:03 +00:00
|
|
|
free(ep, M_ATFORK);
|
|
|
|
return(1);
|
1996-08-19 02:28:24 +00:00
|
|
|
}
|
2001-03-07 02:30:39 +00:00
|
|
|
}
|
|
|
|
sx_xunlock(&fork_list_lock);
|
1999-11-19 21:29:03 +00:00
|
|
|
return (0);
|
1996-08-19 02:28:24 +00:00
|
|
|
}
|
2001-01-24 10:47:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle the return of a child process from fork1(). This function
|
|
|
|
* is called from the MD fork_trampoline() entry point.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
fork_exit(callout, arg, frame)
|
2001-01-26 23:51:41 +00:00
|
|
|
void (*callout)(void *, struct trapframe *);
|
2001-01-24 10:47:14 +00:00
|
|
|
void *arg;
|
2001-01-24 21:59:25 +00:00
|
|
|
struct trapframe *frame;
|
2001-01-24 10:47:14 +00:00
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
|
2001-03-07 02:30:39 +00:00
|
|
|
p = curproc;
|
|
|
|
|
2001-02-20 05:26:15 +00:00
|
|
|
/*
|
|
|
|
* Setup the sched_lock state so that we can release it.
|
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
sched_lock.mtx_lock = (uintptr_t)p;
|
2001-02-20 05:26:15 +00:00
|
|
|
sched_lock.mtx_recurse = 0;
|
2001-01-24 10:47:14 +00:00
|
|
|
/*
|
|
|
|
* XXX: We really shouldn't have to do this.
|
|
|
|
*/
|
2001-03-28 02:44:11 +00:00
|
|
|
mtx_intr_enable(&sched_lock);
|
|
|
|
mtx_unlock_spin(&sched_lock);
|
2001-01-24 10:47:14 +00:00
|
|
|
|
|
|
|
#ifdef SMP
|
|
|
|
if (PCPU_GET(switchtime.tv_sec) == 0)
|
|
|
|
microuptime(PCPU_PTR(switchtime));
|
|
|
|
PCPU_SET(switchticks, ticks);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* cpu_set_fork_handler intercepts this function call to
|
|
|
|
* have this call a non-return function to stay in kernel mode.
|
|
|
|
* initproc has its own fork handler, but it does return.
|
|
|
|
*/
|
2001-02-20 05:26:15 +00:00
|
|
|
KASSERT(callout != NULL, ("NULL callout in fork_exit"));
|
2001-01-26 23:51:41 +00:00
|
|
|
callout(arg, frame);
|
2001-01-24 10:47:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if a kernel thread misbehaved and returned from its main
|
|
|
|
* function.
|
|
|
|
*/
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_LOCK(p);
|
2001-01-24 10:47:14 +00:00
|
|
|
if (p->p_flag & P_KTHREAD) {
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p);
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&Giant);
|
2001-01-24 10:47:14 +00:00
|
|
|
printf("Kernel thread \"%s\" (pid %d) exited prematurely.\n",
|
|
|
|
p->p_comm, p->p_pid);
|
|
|
|
kthread_exit(0);
|
|
|
|
}
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p);
|
2001-01-24 10:47:14 +00:00
|
|
|
mtx_assert(&Giant, MA_NOTOWNED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Simplified back end of syscall(), used when returning from fork()
|
|
|
|
* directly into user mode. Giant is not held on entry, and must not
|
|
|
|
* be held on return. This function is passed in to fork_exit() as the
|
|
|
|
* first parameter and is called when returning to a new userland process.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
fork_return(p, frame)
|
|
|
|
struct proc *p;
|
|
|
|
struct trapframe *frame;
|
|
|
|
{
|
|
|
|
|
|
|
|
userret(p, frame, 0);
|
|
|
|
#ifdef KTRACE
|
|
|
|
if (KTRPOINT(p, KTR_SYSRET)) {
|
|
|
|
if (!mtx_owned(&Giant))
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock(&Giant);
|
2001-01-24 10:47:14 +00:00
|
|
|
ktrsysret(p->p_tracep, SYS_fork, 0, 0);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (mtx_owned(&Giant))
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock(&Giant);
|
2001-01-24 10:47:14 +00:00
|
|
|
mtx_assert(&Giant, MA_NOTOWNED);
|
|
|
|
}
|