2005-01-06 23:35:40 +00:00
|
|
|
/*-
|
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.
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
2003-06-11 00:56:59 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2008-05-24 06:22:16 +00:00
|
|
|
#include "opt_kdtrace.h"
|
1996-01-03 21:42:35 +00:00
|
|
|
#include "opt_ktrace.h"
|
2009-09-01 11:41:51 +00:00
|
|
|
#include "opt_kstack_pages.h"
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#include "opt_procdesc.h"
|
1996-01-03 21:42:35 +00:00
|
|
|
|
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>
|
2003-03-24 21:15:35 +00:00
|
|
|
#include <sys/eventhandler.h>
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#include <sys/fcntl.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/filedesc.h>
|
2009-05-27 14:11:23 +00:00
|
|
|
#include <sys/jail.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/kernel.h>
|
2003-08-15 21:29:06 +00:00
|
|
|
#include <sys/kthread.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>
|
2006-11-06 13:42:10 +00:00
|
|
|
#include <sys/priv.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/proc.h>
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#include <sys/procdesc.h>
|
2002-08-04 01:07:02 +00:00
|
|
|
#include <sys/pioctl.h>
|
2011-03-29 17:47:25 +00:00
|
|
|
#include <sys/racct.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/resourcevar.h>
|
2002-10-12 05:32:24 +00:00
|
|
|
#include <sys/sched.h>
|
2001-01-24 10:47:14 +00:00
|
|
|
#include <sys/syscall.h>
|
2003-08-15 21:29:06 +00:00
|
|
|
#include <sys/vmmeter.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>
|
1996-09-03 14:25:27 +00:00
|
|
|
#include <sys/unistd.h>
|
2008-05-24 06:22:16 +00:00
|
|
|
#include <sys/sdt.h>
|
2001-03-07 02:30:39 +00:00
|
|
|
#include <sys/sx.h>
|
2011-03-08 19:01:45 +00:00
|
|
|
#include <sys/sysent.h>
|
2004-11-27 06:51:39 +00:00
|
|
|
#include <sys/signalvar.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2006-02-02 01:32:58 +00:00
|
|
|
#include <security/audit/audit.h>
|
2006-10-22 11:52:19 +00:00
|
|
|
#include <security/mac/mac_framework.h>
|
2006-02-02 01:32:58 +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>
|
2002-03-20 04:09:59 +00:00
|
|
|
#include <vm/uma.h>
|
1994-10-10 01:00:49 +00:00
|
|
|
|
2008-05-24 06:22:16 +00:00
|
|
|
#ifdef KDTRACE_HOOKS
|
|
|
|
#include <sys/dtrace_bsd.h>
|
|
|
|
dtrace_fork_func_t dtrace_fasttrap_fork;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
SDT_PROVIDER_DECLARE(proc);
|
2013-08-15 04:08:55 +00:00
|
|
|
SDT_PROBE_DEFINE3(proc, kernel, , create, create, "struct proc *",
|
|
|
|
"struct proc *", "int");
|
1999-01-26 02:38:12 +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
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/* ARGSUSED */
|
1994-05-25 09:21:21 +00:00
|
|
|
int
|
2011-09-16 13:58:51 +00:00
|
|
|
sys_fork(struct thread *td, struct fork_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
|
|
|
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
error = fork1(td, RFFDG | RFPROC, 0, &p2, NULL, 0);
|
1999-06-30 15:33:41 +00:00
|
|
|
if (error == 0) {
|
2001-09-12 08:38:13 +00:00
|
|
|
td->td_retval[0] = p2->p_pid;
|
|
|
|
td->td_retval[1] = 0;
|
1999-06-30 15:33:41 +00:00
|
|
|
}
|
2003-08-15 21:29:06 +00:00
|
|
|
return (error);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
/* ARGUSED */
|
|
|
|
int
|
2011-09-16 13:58:51 +00:00
|
|
|
sys_pdfork(td, uap)
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
struct thread *td;
|
|
|
|
struct pdfork_args *uap;
|
|
|
|
{
|
|
|
|
#ifdef PROCDESC
|
|
|
|
int error, fd;
|
|
|
|
struct proc *p2;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It is necessary to return fd by reference because 0 is a valid file
|
|
|
|
* descriptor number, and the child needs to be able to distinguish
|
|
|
|
* itself from the parent using the return value.
|
|
|
|
*/
|
|
|
|
error = fork1(td, RFFDG | RFPROC | RFPROCDESC, 0, &p2,
|
|
|
|
&fd, uap->flags);
|
|
|
|
if (error == 0) {
|
|
|
|
td->td_retval[0] = p2->p_pid;
|
|
|
|
td->td_retval[1] = 0;
|
|
|
|
error = copyout(&fd, uap->fdp, sizeof(fd));
|
|
|
|
}
|
|
|
|
return (error);
|
|
|
|
#else
|
|
|
|
return (ENOSYS);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/* ARGSUSED */
|
1994-05-25 09:21:21 +00:00
|
|
|
int
|
2011-09-16 13:58:51 +00:00
|
|
|
sys_vfork(struct thread *td, struct vfork_args *uap)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
2008-10-19 01:35:27 +00:00
|
|
|
int error, flags;
|
1999-06-30 15:33:41 +00:00
|
|
|
struct proc *p2;
|
1997-11-20 16:36:17 +00:00
|
|
|
|
2008-10-19 01:35:27 +00:00
|
|
|
flags = RFFDG | RFPROC | RFPPWAIT | RFMEM;
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
error = fork1(td, flags, 0, &p2, NULL, 0);
|
1999-06-30 15:33:41 +00:00
|
|
|
if (error == 0) {
|
2001-09-12 08:38:13 +00:00
|
|
|
td->td_retval[0] = p2->p_pid;
|
|
|
|
td->td_retval[1] = 0;
|
1999-06-30 15:33:41 +00:00
|
|
|
}
|
2003-08-15 21:29:06 +00:00
|
|
|
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
|
2011-09-16 13:58:51 +00:00
|
|
|
sys_rfork(struct thread *td, struct rfork_args *uap)
|
1996-02-23 18:49:25 +00:00
|
|
|
{
|
1999-06-30 15:33:41 +00:00
|
|
|
struct proc *p2;
|
2004-03-04 09:56:29 +00:00
|
|
|
int error;
|
1997-11-20 16:36:17 +00:00
|
|
|
|
2004-03-04 09:56:29 +00:00
|
|
|
/* Don't allow kernel-only flags. */
|
2001-12-19 00:53:23 +00:00
|
|
|
if ((uap->flags & RFKERNELONLY) != 0)
|
|
|
|
return (EINVAL);
|
2004-03-04 09:56:29 +00:00
|
|
|
|
2009-06-27 13:58:44 +00:00
|
|
|
AUDIT_ARG_FFLAGS(uap->flags);
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
error = fork1(td, uap->flags, 0, &p2, NULL, 0);
|
1999-06-30 15:33:41 +00:00
|
|
|
if (error == 0) {
|
2001-09-12 08:38:13 +00:00
|
|
|
td->td_retval[0] = p2 ? p2->p_pid : 0;
|
|
|
|
td->td_retval[1] = 0;
|
1999-06-30 15:33:41 +00:00
|
|
|
}
|
2003-08-15 21:29:06 +00:00
|
|
|
return (error);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
2003-08-15 21:29:06 +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;
|
|
|
|
|
2004-02-26 00:27:04 +00:00
|
|
|
error = sysctl_wire_old_buffer(req, sizeof(int));
|
|
|
|
if (error != 0)
|
|
|
|
return(error);
|
2002-05-02 15:13:45 +00:00
|
|
|
sx_xlock(&allproc_lock);
|
2000-12-04 10:23:29 +00:00
|
|
|
pid = randompid;
|
|
|
|
error = sysctl_handle_int(oidp, &pid, 0, req);
|
2002-05-02 15:13:45 +00:00
|
|
|
if (error == 0 && req->newptr != NULL) {
|
2012-08-15 15:56:21 +00:00
|
|
|
if (pid < 0 || pid > pid_max - 100) /* out of range */
|
|
|
|
pid = pid_max - 100;
|
2002-05-02 15:13:45 +00:00
|
|
|
else if (pid < 2) /* NOP */
|
|
|
|
pid = 0;
|
|
|
|
else if (pid < 100) /* Make it reasonable */
|
|
|
|
pid = 100;
|
|
|
|
randompid = pid;
|
|
|
|
}
|
|
|
|
sx_xunlock(&allproc_lock);
|
2000-12-04 10:23:29 +00:00
|
|
|
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
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
static int
|
|
|
|
fork_findpid(int flags)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
int trypid;
|
|
|
|
static int pidchecked = 0;
|
|
|
|
|
2011-01-02 12:16:57 +00:00
|
|
|
/*
|
|
|
|
* Requires allproc_lock in order to iterate over the list
|
|
|
|
* of processes, and proctree_lock to access p_pgrp.
|
|
|
|
*/
|
|
|
|
sx_assert(&allproc_lock, SX_LOCKED);
|
|
|
|
sx_assert(&proctree_lock, SX_LOCKED);
|
2010-12-10 08:33:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Find an unused process ID. We remember a range of unused IDs
|
|
|
|
* ready to use (from lastpid+1 through pidchecked-1).
|
|
|
|
*
|
|
|
|
* If RFHIGHPID is set (used during system boot), do not allocate
|
|
|
|
* low-numbered pids.
|
|
|
|
*/
|
|
|
|
trypid = lastpid + 1;
|
|
|
|
if (flags & RFHIGHPID) {
|
|
|
|
if (trypid < 10)
|
|
|
|
trypid = 10;
|
|
|
|
} else {
|
|
|
|
if (randompid)
|
|
|
|
trypid += arc4random() % randompid;
|
|
|
|
}
|
|
|
|
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.
|
|
|
|
*/
|
2012-08-15 15:56:21 +00:00
|
|
|
if (trypid >= pid_max) {
|
|
|
|
trypid = trypid % pid_max;
|
2010-12-10 08:33:56 +00:00
|
|
|
if (trypid < 100)
|
|
|
|
trypid += 100;
|
|
|
|
pidchecked = 0;
|
|
|
|
}
|
|
|
|
if (trypid >= pidchecked) {
|
|
|
|
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
|
|
|
|
* than trypid, so we can avoid checking for a while.
|
|
|
|
*/
|
|
|
|
p = LIST_FIRST(&allproc);
|
|
|
|
again:
|
|
|
|
for (; p != NULL; p = LIST_NEXT(p, p_list)) {
|
|
|
|
while (p->p_pid == trypid ||
|
|
|
|
(p->p_pgrp != NULL &&
|
|
|
|
(p->p_pgrp->pg_id == trypid ||
|
|
|
|
(p->p_session != NULL &&
|
|
|
|
p->p_session->s_sid == trypid)))) {
|
|
|
|
trypid++;
|
|
|
|
if (trypid >= pidchecked)
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
if (p->p_pid > trypid && pidchecked > p->p_pid)
|
|
|
|
pidchecked = p->p_pid;
|
|
|
|
if (p->p_pgrp != NULL) {
|
|
|
|
if (p->p_pgrp->pg_id > trypid &&
|
|
|
|
pidchecked > p->p_pgrp->pg_id)
|
|
|
|
pidchecked = p->p_pgrp->pg_id;
|
|
|
|
if (p->p_session != NULL &&
|
|
|
|
p->p_session->s_sid > trypid &&
|
|
|
|
pidchecked > p->p_session->s_sid)
|
|
|
|
pidchecked = p->p_session->s_sid;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!doingzomb) {
|
|
|
|
doingzomb = 1;
|
|
|
|
p = LIST_FIRST(&zombproc);
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* RFHIGHPID does not mess with the lastpid counter during boot.
|
|
|
|
*/
|
|
|
|
if (flags & RFHIGHPID)
|
|
|
|
pidchecked = 0;
|
|
|
|
else
|
|
|
|
lastpid = trypid;
|
|
|
|
|
|
|
|
return (trypid);
|
|
|
|
}
|
|
|
|
|
2010-12-06 16:39:18 +00:00
|
|
|
static int
|
2011-01-02 12:16:57 +00:00
|
|
|
fork_norfproc(struct thread *td, int flags)
|
2010-12-06 16:39:18 +00:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
struct proc *p1;
|
|
|
|
|
2010-12-06 19:15:38 +00:00
|
|
|
KASSERT((flags & RFPROC) == 0,
|
|
|
|
("fork_norfproc called with RFPROC set"));
|
2010-12-06 16:39:18 +00:00
|
|
|
p1 = td->td_proc;
|
|
|
|
|
|
|
|
if (((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) &&
|
|
|
|
(flags & (RFCFDG | RFFDG))) {
|
|
|
|
PROC_LOCK(p1);
|
|
|
|
if (thread_single(SINGLE_BOUNDARY)) {
|
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
return (ERESTART);
|
|
|
|
}
|
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
}
|
|
|
|
|
|
|
|
error = vm_forkproc(td, NULL, NULL, NULL, flags);
|
|
|
|
if (error)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Close all file descriptors.
|
|
|
|
*/
|
|
|
|
if (flags & RFCFDG) {
|
|
|
|
struct filedesc *fdtmp;
|
|
|
|
fdtmp = fdinit(td->td_proc->p_fd);
|
Merge Capsicum overhaul:
- Capability is no longer separate descriptor type. Now every descriptor
has set of its own capability rights.
- The cap_new(2) system call is left, but it is no longer documented and
should not be used in new code.
- The new syscall cap_rights_limit(2) should be used instead of
cap_new(2), which limits capability rights of the given descriptor
without creating a new one.
- The cap_getrights(2) syscall is renamed to cap_rights_get(2).
- If CAP_IOCTL capability right is present we can further reduce allowed
ioctls list with the new cap_ioctls_limit(2) syscall. List of allowed
ioctls can be retrived with cap_ioctls_get(2) syscall.
- If CAP_FCNTL capability right is present we can further reduce fcntls
that can be used with the new cap_fcntls_limit(2) syscall and retrive
them with cap_fcntls_get(2).
- To support ioctl and fcntl white-listing the filedesc structure was
heavly modified.
- The audit subsystem, kdump and procstat tools were updated to
recognize new syscalls.
- Capability rights were revised and eventhough I tried hard to provide
backward API and ABI compatibility there are some incompatible changes
that are described in detail below:
CAP_CREATE old behaviour:
- Allow for openat(2)+O_CREAT.
- Allow for linkat(2).
- Allow for symlinkat(2).
CAP_CREATE new behaviour:
- Allow for openat(2)+O_CREAT.
Added CAP_LINKAT:
- Allow for linkat(2). ABI: Reuses CAP_RMDIR bit.
- Allow to be target for renameat(2).
Added CAP_SYMLINKAT:
- Allow for symlinkat(2).
Removed CAP_DELETE. Old behaviour:
- Allow for unlinkat(2) when removing non-directory object.
- Allow to be source for renameat(2).
Removed CAP_RMDIR. Old behaviour:
- Allow for unlinkat(2) when removing directory.
Added CAP_RENAMEAT:
- Required for source directory for the renameat(2) syscall.
Added CAP_UNLINKAT (effectively it replaces CAP_DELETE and CAP_RMDIR):
- Allow for unlinkat(2) on any object.
- Required if target of renameat(2) exists and will be removed by this
call.
Removed CAP_MAPEXEC.
CAP_MMAP old behaviour:
- Allow for mmap(2) with any combination of PROT_NONE, PROT_READ and
PROT_WRITE.
CAP_MMAP new behaviour:
- Allow for mmap(2)+PROT_NONE.
Added CAP_MMAP_R:
- Allow for mmap(PROT_READ).
Added CAP_MMAP_W:
- Allow for mmap(PROT_WRITE).
Added CAP_MMAP_X:
- Allow for mmap(PROT_EXEC).
Added CAP_MMAP_RW:
- Allow for mmap(PROT_READ | PROT_WRITE).
Added CAP_MMAP_RX:
- Allow for mmap(PROT_READ | PROT_EXEC).
Added CAP_MMAP_WX:
- Allow for mmap(PROT_WRITE | PROT_EXEC).
Added CAP_MMAP_RWX:
- Allow for mmap(PROT_READ | PROT_WRITE | PROT_EXEC).
Renamed CAP_MKDIR to CAP_MKDIRAT.
Renamed CAP_MKFIFO to CAP_MKFIFOAT.
Renamed CAP_MKNODE to CAP_MKNODEAT.
CAP_READ old behaviour:
- Allow pread(2).
- Disallow read(2), readv(2) (if there is no CAP_SEEK).
CAP_READ new behaviour:
- Allow read(2), readv(2).
- Disallow pread(2) (CAP_SEEK was also required).
CAP_WRITE old behaviour:
- Allow pwrite(2).
- Disallow write(2), writev(2) (if there is no CAP_SEEK).
CAP_WRITE new behaviour:
- Allow write(2), writev(2).
- Disallow pwrite(2) (CAP_SEEK was also required).
Added convinient defines:
#define CAP_PREAD (CAP_SEEK | CAP_READ)
#define CAP_PWRITE (CAP_SEEK | CAP_WRITE)
#define CAP_MMAP_R (CAP_MMAP | CAP_SEEK | CAP_READ)
#define CAP_MMAP_W (CAP_MMAP | CAP_SEEK | CAP_WRITE)
#define CAP_MMAP_X (CAP_MMAP | CAP_SEEK | 0x0000000000000008ULL)
#define CAP_MMAP_RW (CAP_MMAP_R | CAP_MMAP_W)
#define CAP_MMAP_RX (CAP_MMAP_R | CAP_MMAP_X)
#define CAP_MMAP_WX (CAP_MMAP_W | CAP_MMAP_X)
#define CAP_MMAP_RWX (CAP_MMAP_R | CAP_MMAP_W | CAP_MMAP_X)
#define CAP_RECV CAP_READ
#define CAP_SEND CAP_WRITE
#define CAP_SOCK_CLIENT \
(CAP_CONNECT | CAP_GETPEERNAME | CAP_GETSOCKNAME | CAP_GETSOCKOPT | \
CAP_PEELOFF | CAP_RECV | CAP_SEND | CAP_SETSOCKOPT | CAP_SHUTDOWN)
#define CAP_SOCK_SERVER \
(CAP_ACCEPT | CAP_BIND | CAP_GETPEERNAME | CAP_GETSOCKNAME | \
CAP_GETSOCKOPT | CAP_LISTEN | CAP_PEELOFF | CAP_RECV | CAP_SEND | \
CAP_SETSOCKOPT | CAP_SHUTDOWN)
Added defines for backward API compatibility:
#define CAP_MAPEXEC CAP_MMAP_X
#define CAP_DELETE CAP_UNLINKAT
#define CAP_MKDIR CAP_MKDIRAT
#define CAP_RMDIR CAP_UNLINKAT
#define CAP_MKFIFO CAP_MKFIFOAT
#define CAP_MKNOD CAP_MKNODAT
#define CAP_SOCK_ALL (CAP_SOCK_CLIENT | CAP_SOCK_SERVER)
Sponsored by: The FreeBSD Foundation
Reviewed by: Christoph Mallon <christoph.mallon@gmx.de>
Many aspects discussed with: rwatson, benl, jonathan
ABI compatibility discussed with: kib
2013-03-02 00:53:12 +00:00
|
|
|
fdescfree(td);
|
2010-12-06 16:39:18 +00:00
|
|
|
p1->p_fd = fdtmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unshare file descriptors (from parent).
|
|
|
|
*/
|
|
|
|
if (flags & RFFDG)
|
|
|
|
fdunshare(p1, td);
|
|
|
|
|
|
|
|
fail:
|
|
|
|
if (((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) &&
|
2010-12-06 16:45:36 +00:00
|
|
|
(flags & (RFCFDG | RFFDG))) {
|
2010-12-06 16:39:18 +00:00
|
|
|
PROC_LOCK(p1);
|
|
|
|
thread_single_end();
|
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
}
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
static void
|
|
|
|
do_fork(struct thread *td, int flags, struct proc *p2, struct thread *td2,
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
struct vmspace *vm2, int pdflags)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
2010-12-10 08:33:56 +00:00
|
|
|
struct proc *p1, *pptr;
|
2011-01-25 10:59:21 +00:00
|
|
|
int p2_held, trypid;
|
2001-03-07 05:21:47 +00:00
|
|
|
struct filedesc *fd;
|
2003-06-02 16:05:32 +00:00
|
|
|
struct filedesc_to_leader *fdtol;
|
2002-05-02 15:13:45 +00:00
|
|
|
struct sigacts *newsigacts;
|
1997-04-13 01:48:35 +00:00
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
sx_assert(&proctree_lock, SX_SLOCKED);
|
|
|
|
sx_assert(&allproc_lock, SX_XLOCKED);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2011-01-25 10:59:21 +00:00
|
|
|
p2_held = 0;
|
2003-08-15 21:29:06 +00:00
|
|
|
p1 = td->td_proc;
|
|
|
|
|
1999-06-30 15:33:41 +00:00
|
|
|
/*
|
2002-05-02 15:13:45 +00:00
|
|
|
* Increment the nprocs resource before blocking can occur. There
|
|
|
|
* are hard-limits as to the number of processes that can run.
|
1999-06-30 15:33:41 +00:00
|
|
|
*/
|
2002-05-02 15:13:45 +00:00
|
|
|
nprocs++;
|
1999-07-21 18:02:27 +00:00
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
trypid = fork_findpid(flags);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2004-03-05 22:37:32 +00:00
|
|
|
sx_sunlock(&proctree_lock);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
Part 1 of KSE-III
The ability to schedule multiple threads per process
(one one cpu) by making ALL system calls optionally asynchronous.
to come: ia64 and power-pc patches, patches for gdb, test program (in tools)
Reviewed by: Almost everyone who counts
(at various times, peter, jhb, matt, alfred, mini, bernd,
and a cast of thousands)
NOTE: this is still Beta code, and contains lots of debugging stuff.
expect slight instability in signals..
2002-06-29 17:26:22 +00:00
|
|
|
p2->p_state = PRS_NEW; /* protect against others */
|
2000-11-22 07:42:04 +00:00
|
|
|
p2->p_pid = trypid;
|
2009-06-27 13:58:44 +00:00
|
|
|
AUDIT_ARG_PID(p2->p_pid);
|
2000-11-22 07:42:04 +00:00
|
|
|
LIST_INSERT_HEAD(&allproc, p2, p_list);
|
|
|
|
LIST_INSERT_HEAD(PIDHASH(p2->p_pid), p2, p_hash);
|
2010-10-09 02:50:23 +00:00
|
|
|
tidhash_add(td2);
|
Close race conditions between fork() and [sg]etpriority()'s
PRIO_USER case, possibly also other places that deferences
p_ucred.
In the past, we insert a new process into the allproc list right
after PID allocation, and release the allproc_lock sx. Because
most content in new proc's structure is not yet initialized,
this could lead to undefined result if we do not handle PRS_NEW
with care.
The problem with PRS_NEW state is that it does not provide fine
grained information about how much initialization is done for a
new process. By defination, after PRIO_USER setpriority(), all
processes that belongs to given user should have their nice value
set to the specified value. Therefore, if p_{start,end}copy
section was done for a PRS_NEW process, we can not safely ignore
it because p_nice is in this area. On the other hand, we should
be careful on PRS_NEW processes because we do not allow non-root
users to lower their nice values, and without a successful copy
of the copy section, we can get stale values that is inherted
from the uninitialized area of the process structure.
This commit tries to close the race condition by grabbing proc
mutex *before* we release allproc_lock xlock, and do copy as
well as zero immediately after the allproc_lock xunlock. This
guarantees that the new process would have its p_copy and p_zero
sections, as well as user credential informaion initialized. In
getpriority() case, instead of grabbing PROC_LOCK for a PRS_NEW
process, we just skip the process in question, because it does
not affect the final result of the call, as the p_nice value
would be copied from its parent, and we will see it during
allproc traverse.
Other potential solutions are still under evaluation.
Discussed with: davidxu, jhb, rwatson
PR: kern/108071
MFC after: 2 weeks
2007-02-26 03:38:09 +00:00
|
|
|
PROC_LOCK(p2);
|
|
|
|
PROC_LOCK(p1);
|
|
|
|
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_xunlock(&allproc_lock);
|
2000-11-22 07:42:04 +00:00
|
|
|
|
Close race conditions between fork() and [sg]etpriority()'s
PRIO_USER case, possibly also other places that deferences
p_ucred.
In the past, we insert a new process into the allproc list right
after PID allocation, and release the allproc_lock sx. Because
most content in new proc's structure is not yet initialized,
this could lead to undefined result if we do not handle PRS_NEW
with care.
The problem with PRS_NEW state is that it does not provide fine
grained information about how much initialization is done for a
new process. By defination, after PRIO_USER setpriority(), all
processes that belongs to given user should have their nice value
set to the specified value. Therefore, if p_{start,end}copy
section was done for a PRS_NEW process, we can not safely ignore
it because p_nice is in this area. On the other hand, we should
be careful on PRS_NEW processes because we do not allow non-root
users to lower their nice values, and without a successful copy
of the copy section, we can get stale values that is inherted
from the uninitialized area of the process structure.
This commit tries to close the race condition by grabbing proc
mutex *before* we release allproc_lock xlock, and do copy as
well as zero immediately after the allproc_lock xunlock. This
guarantees that the new process would have its p_copy and p_zero
sections, as well as user credential informaion initialized. In
getpriority() case, instead of grabbing PROC_LOCK for a PRS_NEW
process, we just skip the process in question, because it does
not affect the final result of the call, as the p_nice value
would be copied from its parent, and we will see it during
allproc traverse.
Other potential solutions are still under evaluation.
Discussed with: davidxu, jhb, rwatson
PR: kern/108071
MFC after: 2 weeks
2007-02-26 03:38:09 +00:00
|
|
|
bcopy(&p1->p_startcopy, &p2->p_startcopy,
|
|
|
|
__rangeof(struct proc, p_startcopy, p_endcopy));
|
2008-07-23 08:45:25 +00:00
|
|
|
pargs_hold(p2->p_args);
|
Close race conditions between fork() and [sg]etpriority()'s
PRIO_USER case, possibly also other places that deferences
p_ucred.
In the past, we insert a new process into the allproc list right
after PID allocation, and release the allproc_lock sx. Because
most content in new proc's structure is not yet initialized,
this could lead to undefined result if we do not handle PRS_NEW
with care.
The problem with PRS_NEW state is that it does not provide fine
grained information about how much initialization is done for a
new process. By defination, after PRIO_USER setpriority(), all
processes that belongs to given user should have their nice value
set to the specified value. Therefore, if p_{start,end}copy
section was done for a PRS_NEW process, we can not safely ignore
it because p_nice is in this area. On the other hand, we should
be careful on PRS_NEW processes because we do not allow non-root
users to lower their nice values, and without a successful copy
of the copy section, we can get stale values that is inherted
from the uninitialized area of the process structure.
This commit tries to close the race condition by grabbing proc
mutex *before* we release allproc_lock xlock, and do copy as
well as zero immediately after the allproc_lock xunlock. This
guarantees that the new process would have its p_copy and p_zero
sections, as well as user credential informaion initialized. In
getpriority() case, instead of grabbing PROC_LOCK for a PRS_NEW
process, we just skip the process in question, because it does
not affect the final result of the call, as the p_nice value
would be copied from its parent, and we will see it during
allproc traverse.
Other potential solutions are still under evaluation.
Discussed with: davidxu, jhb, rwatson
PR: kern/108071
MFC after: 2 weeks
2007-02-26 03:38:09 +00:00
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
|
|
|
|
bzero(&p2->p_startzero,
|
|
|
|
__rangeof(struct proc, p_startzero, p_endzero));
|
|
|
|
|
|
|
|
p2->p_ucred = crhold(td->td_ucred);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
2009-05-27 14:11:23 +00:00
|
|
|
/* Tell the prison that we exist. */
|
|
|
|
prison_proc_hold(p2->p_ucred->cr_prison);
|
MFp4:
Bring in updated jail support from bz_jail branch.
This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..
SCTP support was updated and supports IPv6 in jails as well.
Cpuset support permits jails to be bound to specific processor
sets after creation.
Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.
DDB 'show jails' command was added to aid debugging.
Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.
Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.
Bump __FreeBSD_version for the afore mentioned and in kernel changes.
Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
on cluster machines as well as all the testers and people
who provided feedback the last months on freebsd-jail and
other channels.
- My employer, CK Software GmbH, for the support so I could work on this.
Reviewed by: (see above)
MFC after: 3 months (this is just so that I get the mail)
X-MFC Before: 7.2-RELEASE if possible
2008-11-29 14:32:14 +00:00
|
|
|
|
Close race conditions between fork() and [sg]etpriority()'s
PRIO_USER case, possibly also other places that deferences
p_ucred.
In the past, we insert a new process into the allproc list right
after PID allocation, and release the allproc_lock sx. Because
most content in new proc's structure is not yet initialized,
this could lead to undefined result if we do not handle PRS_NEW
with care.
The problem with PRS_NEW state is that it does not provide fine
grained information about how much initialization is done for a
new process. By defination, after PRIO_USER setpriority(), all
processes that belongs to given user should have their nice value
set to the specified value. Therefore, if p_{start,end}copy
section was done for a PRS_NEW process, we can not safely ignore
it because p_nice is in this area. On the other hand, we should
be careful on PRS_NEW processes because we do not allow non-root
users to lower their nice values, and without a successful copy
of the copy section, we can get stale values that is inherted
from the uninitialized area of the process structure.
This commit tries to close the race condition by grabbing proc
mutex *before* we release allproc_lock xlock, and do copy as
well as zero immediately after the allproc_lock xunlock. This
guarantees that the new process would have its p_copy and p_zero
sections, as well as user credential informaion initialized. In
getpriority() case, instead of grabbing PROC_LOCK for a PRS_NEW
process, we just skip the process in question, because it does
not affect the final result of the call, as the p_nice value
would be copied from its parent, and we will see it during
allproc traverse.
Other potential solutions are still under evaluation.
Discussed with: davidxu, jhb, rwatson
PR: kern/108071
MFC after: 2 weeks
2007-02-26 03:38:09 +00:00
|
|
|
PROC_UNLOCK(p2);
|
|
|
|
|
2002-05-02 15:13:45 +00:00
|
|
|
/*
|
|
|
|
* Malloc things while we don't hold any locks.
|
|
|
|
*/
|
- Merge struct procsig with struct sigacts.
- Move struct sigacts out of the u-area and malloc() it using the
M_SUBPROC malloc bucket.
- Add a small sigacts_*() API for managing sigacts structures: sigacts_alloc(),
sigacts_free(), sigacts_copy(), sigacts_share(), and sigacts_shared().
- Remove the p_sigignore, p_sigacts, and p_sigcatch macros.
- Add a mutex to struct sigacts that protects all the members of the struct.
- Add sigacts locking.
- Remove Giant from nosys(), kill(), killpg(), and kern_sigaction() now
that sigacts is locked.
- Several in-kernel functions such as psignal(), tdsignal(), trapsignal(),
and thread_stopped() are now MP safe.
Reviewed by: arch@
Approved by: re (rwatson)
2003-05-13 20:36:02 +00:00
|
|
|
if (flags & RFSIGSHARE)
|
2002-05-02 15:13:45 +00:00
|
|
|
newsigacts = NULL;
|
- Merge struct procsig with struct sigacts.
- Move struct sigacts out of the u-area and malloc() it using the
M_SUBPROC malloc bucket.
- Add a small sigacts_*() API for managing sigacts structures: sigacts_alloc(),
sigacts_free(), sigacts_copy(), sigacts_share(), and sigacts_shared().
- Remove the p_sigignore, p_sigacts, and p_sigcatch macros.
- Add a mutex to struct sigacts that protects all the members of the struct.
- Add sigacts locking.
- Remove Giant from nosys(), kill(), killpg(), and kern_sigaction() now
that sigacts is locked.
- Several in-kernel functions such as psignal(), tdsignal(), trapsignal(),
and thread_stopped() are now MP safe.
Reviewed by: arch@
Approved by: re (rwatson)
2003-05-13 20:36:02 +00:00
|
|
|
else
|
|
|
|
newsigacts = sigacts_alloc();
|
2002-05-02 15:13:45 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy filedesc.
|
|
|
|
*/
|
2003-06-02 16:05:32 +00:00
|
|
|
if (flags & RFCFDG) {
|
2004-11-08 12:43:23 +00:00
|
|
|
fd = fdinit(p1->p_fd);
|
2003-06-02 16:05:32 +00:00
|
|
|
fdtol = NULL;
|
|
|
|
} else if (flags & RFFDG) {
|
2004-11-08 12:43:23 +00:00
|
|
|
fd = fdcopy(p1->p_fd);
|
2003-06-02 16:05:32 +00:00
|
|
|
fdtol = NULL;
|
|
|
|
} else {
|
2003-01-01 01:01:14 +00:00
|
|
|
fd = fdshare(p1->p_fd);
|
2003-06-02 16:05:32 +00:00
|
|
|
if (p1->p_fdtol == NULL)
|
2011-01-02 12:16:57 +00:00
|
|
|
p1->p_fdtol = filedesc_to_leader_alloc(NULL, NULL,
|
|
|
|
p1->p_leader);
|
2003-06-02 16:05:32 +00:00
|
|
|
if ((flags & RFTHREAD) != 0) {
|
|
|
|
/*
|
2011-01-02 12:16:57 +00:00
|
|
|
* Shared file descriptor table, and shared
|
|
|
|
* process leaders.
|
2003-06-02 16:05:32 +00:00
|
|
|
*/
|
|
|
|
fdtol = p1->p_fdtol;
|
Replace custom file descriptor array sleep lock constructed using a mutex
and flags with an sxlock. This leads to a significant and measurable
performance improvement as a result of access to shared locking for
frequent lookup operations, reduced general overhead, and reduced overhead
in the event of contention. All of these are imported for threaded
applications where simultaneous access to a shared file descriptor array
occurs frequently. Kris has reported 2x-4x transaction rate improvements
on 8-core MySQL benchmarks; smaller improvements can be expected for many
workloads as a result of reduced overhead.
- Generally eliminate the distinction between "fast" and regular
acquisisition of the filedesc lock; the plan is that they will now all
be fast. Change all locking instances to either shared or exclusive
locks.
- Correct a bug (pointed out by kib) in fdfree() where previously msleep()
was called without the mutex held; sx_sleep() is now always called with
the sxlock held exclusively.
- Universally hold the struct file lock over changes to struct file,
rather than the filedesc lock or no lock. Always update the f_ops
field last. A further memory barrier is required here in the future
(discussed with jhb).
- Improve locking and reference management in linux_at(), which fails to
properly acquire vnode references before using vnode pointers. Annotate
improper use of vn_fullpath(), which will be replaced at a future date.
In fcntl(), we conservatively acquire an exclusive lock, even though in
some cases a shared lock may be sufficient, which should be revisited.
The dropping of the filedesc lock in fdgrowtable() is no longer required
as the sxlock can be held over the sleep operation; we should consider
removing that (pointed out by attilio).
Tested by: kris
Discussed with: jhb, kris, attilio, jeff
2007-04-04 09:11:34 +00:00
|
|
|
FILEDESC_XLOCK(p1->p_fd);
|
2003-06-02 16:05:32 +00:00
|
|
|
fdtol->fdl_refcount++;
|
Replace custom file descriptor array sleep lock constructed using a mutex
and flags with an sxlock. This leads to a significant and measurable
performance improvement as a result of access to shared locking for
frequent lookup operations, reduced general overhead, and reduced overhead
in the event of contention. All of these are imported for threaded
applications where simultaneous access to a shared file descriptor array
occurs frequently. Kris has reported 2x-4x transaction rate improvements
on 8-core MySQL benchmarks; smaller improvements can be expected for many
workloads as a result of reduced overhead.
- Generally eliminate the distinction between "fast" and regular
acquisisition of the filedesc lock; the plan is that they will now all
be fast. Change all locking instances to either shared or exclusive
locks.
- Correct a bug (pointed out by kib) in fdfree() where previously msleep()
was called without the mutex held; sx_sleep() is now always called with
the sxlock held exclusively.
- Universally hold the struct file lock over changes to struct file,
rather than the filedesc lock or no lock. Always update the f_ops
field last. A further memory barrier is required here in the future
(discussed with jhb).
- Improve locking and reference management in linux_at(), which fails to
properly acquire vnode references before using vnode pointers. Annotate
improper use of vn_fullpath(), which will be replaced at a future date.
In fcntl(), we conservatively acquire an exclusive lock, even though in
some cases a shared lock may be sufficient, which should be revisited.
The dropping of the filedesc lock in fdgrowtable() is no longer required
as the sxlock can be held over the sleep operation; we should consider
removing that (pointed out by attilio).
Tested by: kris
Discussed with: jhb, kris, attilio, jeff
2007-04-04 09:11:34 +00:00
|
|
|
FILEDESC_XUNLOCK(p1->p_fd);
|
2003-06-02 16:05:32 +00:00
|
|
|
} else {
|
|
|
|
/*
|
2011-01-02 12:16:57 +00:00
|
|
|
* Shared file descriptor table, and different
|
|
|
|
* process leaders.
|
2003-06-02 16:05:32 +00:00
|
|
|
*/
|
|
|
|
fdtol = filedesc_to_leader_alloc(p1->p_fdtol,
|
2011-01-02 12:16:57 +00:00
|
|
|
p1->p_fd, p2);
|
2003-06-02 16:05:32 +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.
|
|
|
|
*/
|
2002-10-02 07:44:29 +00:00
|
|
|
|
2003-05-01 21:16:38 +00:00
|
|
|
PROC_LOCK(p2);
|
|
|
|
PROC_LOCK(p1);
|
|
|
|
|
2002-02-07 20:58:47 +00:00
|
|
|
bzero(&td2->td_startzero,
|
2004-11-20 23:00:59 +00:00
|
|
|
__rangeof(struct thread, td_startzero, td_endzero));
|
2001-09-12 08:38:13 +00:00
|
|
|
|
2002-02-07 20:58:47 +00:00
|
|
|
bcopy(&td->td_startcopy, &td2->td_startcopy,
|
2004-11-20 23:00:59 +00:00
|
|
|
__rangeof(struct thread, td_startcopy, td_endcopy));
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2007-11-15 02:13:44 +00:00
|
|
|
bcopy(&p2->p_comm, &td2->td_name, sizeof(td2->td_name));
|
2004-01-03 02:02:26 +00:00
|
|
|
td2->td_sigstk = td->td_sigstk;
|
2007-09-17 05:31:39 +00:00
|
|
|
td2->td_flags = TDF_INMEM;
|
2010-12-09 02:42:02 +00:00
|
|
|
td2->td_lend_user_pri = PRI_MAX;
|
2004-01-03 02:02:26 +00:00
|
|
|
|
Change the curvnet variable from a global const struct vnet *,
previously always pointing to the default vnet context, to a
dynamically changing thread-local one. The currvnet context
should be set on entry to networking code via CURVNET_SET() macros,
and reverted to previous state via CURVNET_RESTORE(). Recursions
on curvnet are permitted, though strongly discuouraged.
This change should have no functional impact on nooptions VIMAGE
kernel builds, where CURVNET_* macros expand to whitespace.
The curthread->td_vnet (aka curvnet) variable's purpose is to be an
indicator of the vnet context in which the current network-related
operation takes place, in case we cannot deduce the current vnet
context from any other source, such as by looking at mbuf's
m->m_pkthdr.rcvif->if_vnet, sockets's so->so_vnet etc. Moreover, so
far curvnet has turned out to be an invaluable consistency checking
aid: it helps to catch cases when sockets, ifnets or any other
vnet-aware structures may have leaked from one vnet to another.
The exact placement of the CURVNET_SET() / CURVNET_RESTORE() macros
was a result of an empirical iterative process, whith an aim to
reduce recursions on CURVNET_SET() to a minimum, while still reducing
the scope of CURVNET_SET() to networking only operations - the
alternative would be calling CURVNET_SET() on each system call entry.
In general, curvnet has to be set in three typicall cases: when
processing socket-related requests from userspace or from within the
kernel; when processing inbound traffic flowing from device drivers
to upper layers of the networking stack, and when executing
timer-driven networking functions.
This change also introduces a DDB subcommand to show the list of all
vnet instances.
Approved by: julian (mentor)
2009-05-05 10:56:12 +00:00
|
|
|
#ifdef VIMAGE
|
|
|
|
td2->td_vnet = NULL;
|
|
|
|
td2->td_vnet_lpush = NULL;
|
|
|
|
#endif
|
|
|
|
|
2011-01-06 22:24:00 +00:00
|
|
|
/*
|
|
|
|
* Allow the scheduler to initialize the child.
|
|
|
|
*/
|
|
|
|
thread_lock(td);
|
|
|
|
sched_fork(td, td2);
|
|
|
|
thread_unlock(td);
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Duplicate sub-structures as needed.
|
|
|
|
* Increase reference counts on shared objects.
|
|
|
|
*/
|
2007-09-17 05:31:39 +00:00
|
|
|
p2->p_flag = P_INMEM;
|
2007-09-21 04:10:23 +00:00
|
|
|
p2->p_swtick = ticks;
|
2003-04-22 20:54:04 +00:00
|
|
|
if (p1->p_flag & P_PROFIL)
|
|
|
|
startprofclock(p2);
|
2006-10-26 21:42:22 +00:00
|
|
|
td2->td_ucred = crhold(p2->p_ucred);
|
1999-11-16 20:31:58 +00:00
|
|
|
|
1998-12-19 02:55:34 +00:00
|
|
|
if (flags & RFSIGSHARE) {
|
- Merge struct procsig with struct sigacts.
- Move struct sigacts out of the u-area and malloc() it using the
M_SUBPROC malloc bucket.
- Add a small sigacts_*() API for managing sigacts structures: sigacts_alloc(),
sigacts_free(), sigacts_copy(), sigacts_share(), and sigacts_shared().
- Remove the p_sigignore, p_sigacts, and p_sigcatch macros.
- Add a mutex to struct sigacts that protects all the members of the struct.
- Add sigacts locking.
- Remove Giant from nosys(), kill(), killpg(), and kern_sigaction() now
that sigacts is locked.
- Several in-kernel functions such as psignal(), tdsignal(), trapsignal(),
and thread_stopped() are now MP safe.
Reviewed by: arch@
Approved by: re (rwatson)
2003-05-13 20:36:02 +00:00
|
|
|
p2->p_sigacts = sigacts_hold(p1->p_sigacts);
|
1998-12-19 02:55:34 +00:00
|
|
|
} else {
|
- Merge struct procsig with struct sigacts.
- Move struct sigacts out of the u-area and malloc() it using the
M_SUBPROC malloc bucket.
- Add a small sigacts_*() API for managing sigacts structures: sigacts_alloc(),
sigacts_free(), sigacts_copy(), sigacts_share(), and sigacts_shared().
- Remove the p_sigignore, p_sigacts, and p_sigcatch macros.
- Add a mutex to struct sigacts that protects all the members of the struct.
- Add sigacts locking.
- Remove Giant from nosys(), kill(), killpg(), and kern_sigaction() now
that sigacts is locked.
- Several in-kernel functions such as psignal(), tdsignal(), trapsignal(),
and thread_stopped() are now MP safe.
Reviewed by: arch@
Approved by: re (rwatson)
2003-05-13 20:36:02 +00:00
|
|
|
sigacts_copy(newsigacts, p1->p_sigacts);
|
|
|
|
p2->p_sigacts = newsigacts;
|
1998-12-19 02:55:34 +00:00
|
|
|
}
|
2011-07-12 20:37:18 +00:00
|
|
|
|
|
|
|
if (flags & RFTSIGZMB)
|
|
|
|
p2->p_sigparent = RFTSIGNUM(flags);
|
|
|
|
else 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
|
|
|
p2->p_textvp = p1->p_textvp;
|
2001-03-07 05:21:47 +00:00
|
|
|
p2->p_fd = fd;
|
2003-06-02 16:05:32 +00:00
|
|
|
p2->p_fdtol = fdtol;
|
1996-02-23 18:49:25 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
2004-03-04 09:56:29 +00:00
|
|
|
* p_limit is copy-on-write. Bump its refcount.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
2007-06-01 01:12:45 +00:00
|
|
|
lim_fork(p1, p2);
|
2004-11-20 02:28:48 +00:00
|
|
|
|
|
|
|
pstats_fork(p1->p_stats, p2->p_stats);
|
|
|
|
|
2004-10-01 05:01:29 +00:00
|
|
|
PROC_UNLOCK(p1);
|
2004-10-06 23:53:49 +00:00
|
|
|
PROC_UNLOCK(p2);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2011-01-02 12:16:57 +00:00
|
|
|
/* Bump references to the text vnode (for procfs). */
|
2004-03-08 00:32:34 +00:00
|
|
|
if (p2->p_textvp)
|
|
|
|
vref(p2->p_textvp);
|
|
|
|
|
2002-10-15 00:14:32 +00:00
|
|
|
/*
|
2004-03-04 09:56:29 +00:00
|
|
|
* Set up linkage for kernel based threading.
|
2002-10-15 00:14:32 +00:00
|
|
|
*/
|
2004-03-04 09:56:29 +00:00
|
|
|
if ((flags & RFTHREAD) != 0) {
|
2002-10-15 00:14:32 +00:00
|
|
|
mtx_lock(&ppeers_lock);
|
|
|
|
p2->p_peers = p1->p_peers;
|
|
|
|
p1->p_peers = p2;
|
|
|
|
p2->p_leader = p1->p_leader;
|
|
|
|
mtx_unlock(&ppeers_lock);
|
|
|
|
PROC_LOCK(p1->p_leader);
|
|
|
|
if ((p1->p_leader->p_flag & P_WEXIT) != 0) {
|
|
|
|
PROC_UNLOCK(p1->p_leader);
|
|
|
|
/*
|
|
|
|
* The task leader is exiting, so process p1 is
|
|
|
|
* going to be killed shortly. Since p1 obviously
|
|
|
|
* isn't dead yet, we know that the leader is either
|
|
|
|
* sending SIGKILL's to all the processes in this
|
|
|
|
* task or is sleeping waiting for all the peers to
|
|
|
|
* exit. We let p1 complete the fork, but we need
|
|
|
|
* to go ahead and kill the new process p2 since
|
|
|
|
* the task leader may not get a chance to send
|
|
|
|
* SIGKILL to it. We leave it on the list so that
|
|
|
|
* the task leader will wait for this new process
|
|
|
|
* to commit suicide.
|
|
|
|
*/
|
|
|
|
PROC_LOCK(p2);
|
2011-09-16 13:58:51 +00:00
|
|
|
kern_psignal(p2, SIGKILL);
|
2002-10-15 00:14:32 +00:00
|
|
|
PROC_UNLOCK(p2);
|
2002-11-18 14:23:21 +00:00
|
|
|
} else
|
|
|
|
PROC_UNLOCK(p1->p_leader);
|
2002-10-15 00:14:32 +00:00
|
|
|
} else {
|
|
|
|
p2->p_peers = NULL;
|
|
|
|
p2->p_leader = p2;
|
|
|
|
}
|
|
|
|
|
2002-05-02 15:13:45 +00:00
|
|
|
sx_xlock(&proctree_lock);
|
|
|
|
PGRP_LOCK(p1->p_pgrp);
|
|
|
|
PROC_LOCK(p2);
|
|
|
|
PROC_LOCK(p1);
|
|
|
|
|
1997-02-17 10:58:46 +00:00
|
|
|
/*
|
2003-04-22 20:54:04 +00:00
|
|
|
* Preserve some more flags in subprocess. P_PROFIL has already
|
1997-11-20 16:36:17 +00:00
|
|
|
* been preserved.
|
1997-02-17 10:58:46 +00:00
|
|
|
*/
|
2004-01-03 02:02:26 +00:00
|
|
|
p2->p_flag |= p1->p_flag & P_SUGID;
|
|
|
|
td2->td_pflags |= td->td_pflags & TDP_ALTSTACK;
|
2002-02-23 11:12:57 +00:00
|
|
|
SESS_LOCK(p1->p_session);
|
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;
|
2002-02-23 11:12:57 +00:00
|
|
|
SESS_UNLOCK(p1->p_session);
|
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
|
|
|
|
2004-01-09 23:42:36 +00:00
|
|
|
p2->p_pgrp = p1->p_pgrp;
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_INSERT_AFTER(p1, p2, p_pglist);
|
2002-04-02 17:12:06 +00:00
|
|
|
PGRP_UNLOCK(p1->p_pgrp);
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_INIT(&p2->p_children);
|
2012-02-23 11:50:23 +00:00
|
|
|
LIST_INIT(&p2->p_orphans);
|
1996-03-11 06:05:03 +00:00
|
|
|
|
Fix a race between kern_setitimer() and realitexpire(), where the
callout is started before kern_setitimer() acquires process mutex, but
looses a race and kern_setitimer() gets the process mutex before the
callout. Then, assuming that new specified struct itimerval has
it_interval zero, but it_value non-zero, the callout, after it starts
executing again, clears p->p_realtimer.it_value, but kern_setitimer()
already rescheduled the callout.
As the result of the race, both p_realtimer is zero, and the callout
is rescheduled. Then, in the exit1(), the exit code sees that it_value
is zero and does not even try to stop the callout. This allows the
struct proc to be reused and eventually the armed callout is
re-initialized. The consequence is the corrupted callwheel tailq.
Use process mutex to interlock the callout start, which fixes the race.
Reported and tested by: pho
Reviewed by: jhb
MFC after: 2 weeks
2012-12-04 20:49:39 +00:00
|
|
|
callout_init_mtx(&p2->p_itcallout, &p2->p_mtx, 0);
|
2000-11-27 22:52:31 +00:00
|
|
|
|
2002-08-07 11:31:45 +00:00
|
|
|
/*
|
|
|
|
* If PF_FORK is set, the child process inherits the
|
|
|
|
* procfs ioctl flags from its parent.
|
|
|
|
*/
|
|
|
|
if (p1->p_pfsflags & PF_FORK) {
|
|
|
|
p2->p_stops = p1->p_stops;
|
|
|
|
p2->p_pfsflags = p1->p_pfsflags;
|
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* This begins the section where we must prevent the parent
|
2004-10-06 23:53:49 +00:00
|
|
|
* from being swapped.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
2004-10-06 23:53:49 +00:00
|
|
|
_PHOLD(p1);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p1);
|
2002-05-02 15:13:45 +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;
|
|
|
|
p2->p_pptr = pptr;
|
|
|
|
LIST_INSERT_HEAD(&pptr->p_children, p2, p_sibling);
|
|
|
|
sx_xunlock(&proctree_lock);
|
|
|
|
|
2003-04-17 22:24:59 +00:00
|
|
|
/* Inform accounting that we have forked. */
|
|
|
|
p2->p_acflag = AFORK;
|
|
|
|
PROC_UNLOCK(p2);
|
|
|
|
|
2011-02-25 22:05:33 +00:00
|
|
|
#ifdef KTRACE
|
|
|
|
ktrprocfork(p1, p2);
|
|
|
|
#endif
|
|
|
|
|
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
|
|
|
*/
|
2007-11-05 11:36:16 +00:00
|
|
|
vm_forkproc(td, p2, td2, vm2, flags);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2001-01-23 14:32:01 +00:00
|
|
|
if (flags == (RFFDG | RFPROC)) {
|
2007-06-10 21:59:14 +00:00
|
|
|
PCPU_INC(cnt.v_forks);
|
|
|
|
PCPU_ADD(cnt.v_forkpages, p2->p_vmspace->vm_dsize +
|
2004-09-03 05:11:32 +00:00
|
|
|
p2->p_vmspace->vm_ssize);
|
2001-01-23 14:32:01 +00:00
|
|
|
} else if (flags == (RFFDG | RFPROC | RFPPWAIT | RFMEM)) {
|
2007-06-10 21:59:14 +00:00
|
|
|
PCPU_INC(cnt.v_vforks);
|
|
|
|
PCPU_ADD(cnt.v_vforkpages, p2->p_vmspace->vm_dsize +
|
2004-09-03 05:11:32 +00:00
|
|
|
p2->p_vmspace->vm_ssize);
|
2001-01-23 14:32:01 +00:00
|
|
|
} else if (p1 == &proc0) {
|
2007-06-10 21:59:14 +00:00
|
|
|
PCPU_INC(cnt.v_kthreads);
|
|
|
|
PCPU_ADD(cnt.v_kthreadpages, p2->p_vmspace->vm_dsize +
|
2004-09-03 05:11:32 +00:00
|
|
|
p2->p_vmspace->vm_ssize);
|
2001-01-23 14:32:01 +00:00
|
|
|
} else {
|
2007-06-10 21:59:14 +00:00
|
|
|
PCPU_INC(cnt.v_rforks);
|
|
|
|
PCPU_ADD(cnt.v_rforkpages, p2->p_vmspace->vm_dsize +
|
2004-09-03 05:11:32 +00:00
|
|
|
p2->p_vmspace->vm_ssize);
|
2001-01-23 14:32:01 +00:00
|
|
|
}
|
|
|
|
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#ifdef PROCDESC
|
|
|
|
/*
|
|
|
|
* Associate the process descriptor with the process before anything
|
|
|
|
* can happen that might cause that process to need the descriptor.
|
|
|
|
* However, don't do this until after fork(2) can no longer fail.
|
|
|
|
*/
|
|
|
|
if (flags & RFPROCDESC)
|
|
|
|
procdesc_new(p2, pdflags);
|
|
|
|
#endif
|
|
|
|
|
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.
|
1996-08-19 02:28:24 +00:00
|
|
|
*/
|
2003-03-24 21:15:35 +00:00
|
|
|
EVENTHANDLER_INVOKE(process_fork, p1, p2, flags);
|
1996-08-19 02:28:24 +00:00
|
|
|
|
2004-02-05 21:01:37 +00:00
|
|
|
/*
|
|
|
|
* Set the child start time and mark the process as being complete.
|
|
|
|
*/
|
2011-03-24 18:40:11 +00:00
|
|
|
PROC_LOCK(p2);
|
|
|
|
PROC_LOCK(p1);
|
2004-02-05 21:01:37 +00:00
|
|
|
microuptime(&p2->p_stats->p_start);
|
Commit 6/14 of sched_lock decomposition.
- Use thread_lock() rather than sched_lock for per-thread scheduling
sychronization.
- Use the per-process spinlock rather than the sched_lock for per-process
scheduling synchronization.
- Replace the tail-end of fork_exit() with a scheduler specific routine
which can do the appropriate lock manipulations.
Tested by: kris, current@
Tested on: i386, amd64, ULE, 4BSD, libthr, libkse, PREEMPTION, etc.
Discussed with: kris, attilio, kmacy, jhb, julian, bde (small parts each)
2007-06-04 23:53:34 +00:00
|
|
|
PROC_SLOCK(p2);
|
2004-02-05 21:01:37 +00:00
|
|
|
p2->p_state = PRS_NORMAL;
|
Commit 6/14 of sched_lock decomposition.
- Use thread_lock() rather than sched_lock for per-thread scheduling
sychronization.
- Use the per-process spinlock rather than the sched_lock for per-process
scheduling synchronization.
- Replace the tail-end of fork_exit() with a scheduler specific routine
which can do the appropriate lock manipulations.
Tested by: kris, current@
Tested on: i386, amd64, ULE, 4BSD, libthr, libkse, PREEMPTION, etc.
Discussed with: kris, attilio, kmacy, jhb, julian, bde (small parts each)
2007-06-04 23:53:34 +00:00
|
|
|
PROC_SUNLOCK(p2);
|
2011-01-25 10:59:21 +00:00
|
|
|
|
2010-09-09 09:58:05 +00:00
|
|
|
#ifdef KDTRACE_HOOKS
|
|
|
|
/*
|
|
|
|
* Tell the DTrace fasttrap provider about the new process
|
|
|
|
* if it has registered an interest. We have to do this only after
|
|
|
|
* p_state is PRS_NORMAL since the fasttrap module will use pfind()
|
|
|
|
* later on.
|
|
|
|
*/
|
2011-03-24 18:40:11 +00:00
|
|
|
if (dtrace_fasttrap_fork)
|
2010-09-09 09:58:05 +00:00
|
|
|
dtrace_fasttrap_fork(p1, p2);
|
|
|
|
#endif
|
2011-01-25 10:59:21 +00:00
|
|
|
if ((p1->p_flag & (P_TRACED | P_FOLLOWFORK)) == (P_TRACED |
|
|
|
|
P_FOLLOWFORK)) {
|
|
|
|
/*
|
|
|
|
* Arrange for debugger to receive the fork event.
|
|
|
|
*
|
|
|
|
* We can report PL_FLAG_FORKED regardless of
|
|
|
|
* P_FOLLOWFORK settings, but it does not make a sense
|
|
|
|
* for runaway child.
|
|
|
|
*/
|
|
|
|
td->td_dbgflags |= TDB_FORK;
|
|
|
|
td->td_dbg_forked = p2->p_pid;
|
|
|
|
td2->td_dbgflags |= TDB_STOPATFORK;
|
|
|
|
_PHOLD(p2);
|
|
|
|
p2_held = 1;
|
|
|
|
}
|
2012-02-27 21:10:10 +00:00
|
|
|
if (flags & RFPPWAIT) {
|
|
|
|
td->td_pflags |= TDP_RFPPWAIT;
|
|
|
|
td->td_rfppwait_p = p2;
|
|
|
|
}
|
2011-03-24 18:40:11 +00:00
|
|
|
PROC_UNLOCK(p2);
|
2000-09-07 01:33:02 +00:00
|
|
|
if ((flags & RFSTOPPED) == 0) {
|
2011-01-25 10:59:21 +00:00
|
|
|
/*
|
|
|
|
* If RFSTOPPED not requested, make child runnable and
|
|
|
|
* add to run queue.
|
|
|
|
*/
|
Commit 6/14 of sched_lock decomposition.
- Use thread_lock() rather than sched_lock for per-thread scheduling
sychronization.
- Use the per-process spinlock rather than the sched_lock for per-process
scheduling synchronization.
- Replace the tail-end of fork_exit() with a scheduler specific routine
which can do the appropriate lock manipulations.
Tested by: kris, current@
Tested on: i386, amd64, ULE, 4BSD, libthr, libkse, PREEMPTION, etc.
Discussed with: kris, attilio, kmacy, jhb, julian, bde (small parts each)
2007-06-04 23:53:34 +00:00
|
|
|
thread_lock(td2);
|
2002-09-11 08:13:56 +00:00
|
|
|
TD_SET_CAN_RUN(td2);
|
2007-01-23 08:46:51 +00:00
|
|
|
sched_add(td2, SRQ_BORING);
|
Commit 6/14 of sched_lock decomposition.
- Use thread_lock() rather than sched_lock for per-thread scheduling
sychronization.
- Use the per-process spinlock rather than the sched_lock for per-process
scheduling synchronization.
- Replace the tail-end of fork_exit() with a scheduler specific routine
which can do the appropriate lock manipulations.
Tested by: kris, current@
Tested on: i386, amd64, ULE, 4BSD, libthr, libkse, PREEMPTION, etc.
Discussed with: kris, attilio, kmacy, jhb, julian, bde (small parts each)
2007-06-04 23:53:34 +00:00
|
|
|
thread_unlock(td2);
|
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
|
|
|
_PRELE(p1);
|
2008-07-07 09:30:11 +00:00
|
|
|
PROC_UNLOCK(p1);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2000-04-16 18:53:38 +00:00
|
|
|
/*
|
2003-08-15 21:29:06 +00:00
|
|
|
* Tell any interested parties about the new process.
|
2000-04-16 18:53:38 +00:00
|
|
|
*/
|
2008-07-07 09:30:11 +00:00
|
|
|
knote_fork(&p1->p_klist, p2->p_pid);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE(proc, kernel, , create, p2, p1, flags, 0, 0);
|
|
|
|
|
2011-01-25 10:59:21 +00:00
|
|
|
/*
|
|
|
|
* Wait until debugger is attached to child.
|
|
|
|
*/
|
|
|
|
PROC_LOCK(p2);
|
|
|
|
while ((td2->td_dbgflags & TDB_STOPATFORK) != 0)
|
|
|
|
cv_wait(&p2->p_dbgwait, &p2->p_mtx);
|
|
|
|
if (p2_held)
|
|
|
|
_PRELE(p2);
|
2001-03-07 02:30:39 +00:00
|
|
|
PROC_UNLOCK(p2);
|
2010-12-10 08:33:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
fork1(struct thread *td, int flags, int pages, struct proc **procp,
|
|
|
|
int *procdescp, int pdflags)
|
2010-12-10 08:33:56 +00:00
|
|
|
{
|
|
|
|
struct proc *p1;
|
|
|
|
struct proc *newproc;
|
|
|
|
int ok;
|
|
|
|
struct thread *td2;
|
|
|
|
struct vmspace *vm2;
|
|
|
|
vm_ooffset_t mem_charged;
|
|
|
|
int error;
|
|
|
|
static int curfail;
|
|
|
|
static struct timeval lastfail;
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#ifdef PROCDESC
|
|
|
|
struct file *fp_procdesc = NULL;
|
|
|
|
#endif
|
2010-12-10 08:33:56 +00:00
|
|
|
|
2011-07-12 20:37:18 +00:00
|
|
|
/* Check for the undefined or unimplemented flags. */
|
|
|
|
if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK))) != 0)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
/* Signal value requires RFTSIGZMB. */
|
|
|
|
if ((flags & RFTSIGFLAGS(RFTSIGMASK)) != 0 && (flags & RFTSIGZMB) == 0)
|
|
|
|
return (EINVAL);
|
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
/* Can't copy and clear. */
|
|
|
|
if ((flags & (RFFDG|RFCFDG)) == (RFFDG|RFCFDG))
|
|
|
|
return (EINVAL);
|
|
|
|
|
2011-07-12 20:37:18 +00:00
|
|
|
/* Check the validity of the signal number. */
|
|
|
|
if ((flags & RFTSIGZMB) != 0 && (u_int)RFTSIGNUM(flags) > _SIG_MAXSIG)
|
|
|
|
return (EINVAL);
|
|
|
|
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#ifdef PROCDESC
|
|
|
|
if ((flags & RFPROCDESC) != 0) {
|
|
|
|
/* Can't not create a process yet get a process descriptor. */
|
|
|
|
if ((flags & RFPROC) == 0)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
/* Must provide a place to put a procdesc if creating one. */
|
|
|
|
if (procdescp == NULL)
|
|
|
|
return (EINVAL);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
p1 = td->td_proc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Here we don't create a new process, but we divorce
|
|
|
|
* certain parts of a process from itself.
|
|
|
|
*/
|
2011-01-02 12:16:57 +00:00
|
|
|
if ((flags & RFPROC) == 0) {
|
|
|
|
*procp = NULL;
|
|
|
|
return (fork_norfproc(td, flags));
|
|
|
|
}
|
2010-12-10 08:33:56 +00:00
|
|
|
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#ifdef PROCDESC
|
|
|
|
/*
|
|
|
|
* If required, create a process descriptor in the parent first; we
|
|
|
|
* will abandon it if something goes wrong. We don't finit() until
|
|
|
|
* later.
|
|
|
|
*/
|
|
|
|
if (flags & RFPROCDESC) {
|
|
|
|
error = falloc(td, &fp_procdesc, procdescp, 0);
|
2011-09-17 19:55:32 +00:00
|
|
|
if (error != 0)
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
mem_charged = 0;
|
|
|
|
vm2 = NULL;
|
|
|
|
if (pages == 0)
|
|
|
|
pages = KSTACK_PAGES;
|
|
|
|
/* Allocate new proc. */
|
|
|
|
newproc = uma_zalloc(proc_zone, M_WAITOK);
|
|
|
|
td2 = FIRST_THREAD_IN_PROC(newproc);
|
|
|
|
if (td2 == NULL) {
|
|
|
|
td2 = thread_alloc(pages);
|
|
|
|
if (td2 == NULL) {
|
|
|
|
error = ENOMEM;
|
|
|
|
goto fail1;
|
|
|
|
}
|
|
|
|
proc_linkup(newproc, td2);
|
|
|
|
} else {
|
|
|
|
if (td2->td_kstack == 0 || td2->td_kstack_pages != pages) {
|
|
|
|
if (td2->td_kstack != 0)
|
|
|
|
vm_thread_dispose(td2);
|
|
|
|
if (!thread_alloc_stack(td2, pages)) {
|
|
|
|
error = ENOMEM;
|
|
|
|
goto fail1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((flags & RFMEM) == 0) {
|
|
|
|
vm2 = vmspace_fork(p1->p_vmspace, &mem_charged);
|
|
|
|
if (vm2 == NULL) {
|
|
|
|
error = ENOMEM;
|
|
|
|
goto fail1;
|
|
|
|
}
|
|
|
|
if (!swap_reserve(mem_charged)) {
|
|
|
|
/*
|
|
|
|
* The swap reservation failed. The accounting
|
|
|
|
* from the entries of the copied vm2 will be
|
|
|
|
* substracted in vmspace_free(), so force the
|
|
|
|
* reservation there.
|
|
|
|
*/
|
|
|
|
swap_reserve_force(mem_charged);
|
|
|
|
error = ENOMEM;
|
|
|
|
goto fail1;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
vm2 = NULL;
|
|
|
|
|
2011-03-29 17:47:25 +00:00
|
|
|
/*
|
|
|
|
* XXX: This is ugly; when we copy resource usage, we need to bump
|
|
|
|
* per-cred resource counters.
|
|
|
|
*/
|
|
|
|
newproc->p_ucred = p1->p_ucred;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize resource accounting for the child process.
|
|
|
|
*/
|
|
|
|
error = racct_proc_fork(p1, newproc);
|
|
|
|
if (error != 0) {
|
|
|
|
error = EAGAIN;
|
|
|
|
goto fail1;
|
|
|
|
}
|
|
|
|
|
2011-09-17 20:48:49 +00:00
|
|
|
#ifdef MAC
|
|
|
|
mac_proc_init(newproc);
|
|
|
|
#endif
|
|
|
|
knlist_init_mtx(&newproc->p_klist, &newproc->p_mtx);
|
|
|
|
STAILQ_INIT(&newproc->p_ktr);
|
|
|
|
|
2010-12-10 08:33:56 +00:00
|
|
|
/* We have to lock the process tree while we look for a pid. */
|
|
|
|
sx_slock(&proctree_lock);
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
2010-12-10 08:33:56 +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 ten processes; don't let root
|
|
|
|
* exceed the limit. The variable nprocs is the current number of
|
|
|
|
* processes, maxproc is the limit.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
2010-12-10 08:33:56 +00:00
|
|
|
sx_xlock(&allproc_lock);
|
|
|
|
if ((nprocs >= maxproc - 10 && priv_check_cred(td->td_ucred,
|
|
|
|
PRIV_MAXPROC, 0) != 0) || nprocs >= maxproc) {
|
|
|
|
error = EAGAIN;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Increment the count of procs running with this uid. Don't allow
|
|
|
|
* a nonprivileged user to exceed their current limit.
|
|
|
|
*
|
|
|
|
* XXXRW: Can we avoid privilege here if it's not needed?
|
|
|
|
*/
|
|
|
|
error = priv_check_cred(td->td_ucred, PRIV_PROC_LIMIT, 0);
|
|
|
|
if (error == 0)
|
|
|
|
ok = chgproccnt(td->td_ucred->cr_ruidinfo, 1, 0);
|
|
|
|
else {
|
|
|
|
PROC_LOCK(p1);
|
|
|
|
ok = chgproccnt(td->td_ucred->cr_ruidinfo, 1,
|
|
|
|
lim_cur(p1, RLIMIT_NPROC));
|
|
|
|
PROC_UNLOCK(p1);
|
|
|
|
}
|
|
|
|
if (ok) {
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
do_fork(td, flags, newproc, td2, vm2, pdflags);
|
2010-12-10 08:33:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Return child proc pointer to parent.
|
|
|
|
*/
|
|
|
|
*procp = newproc;
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#ifdef PROCDESC
|
2012-06-19 22:21:59 +00:00
|
|
|
if (flags & RFPROCDESC) {
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
procdesc_finit(newproc->p_procdesc, fp_procdesc);
|
2012-06-19 22:21:59 +00:00
|
|
|
fdrop(fp_procdesc, td);
|
|
|
|
}
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#endif
|
2011-10-03 16:23:20 +00:00
|
|
|
racct_proc_fork_done(newproc);
|
2010-12-10 08:33:56 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
error = EAGAIN;
|
2002-10-15 00:14:32 +00:00
|
|
|
fail:
|
2004-03-05 22:37:32 +00:00
|
|
|
sx_sunlock(&proctree_lock);
|
2003-06-19 05:57:25 +00:00
|
|
|
if (ppsratecheck(&lastfail, &curfail, 1))
|
2013-04-19 15:19:29 +00:00
|
|
|
printf("maxproc limit exceeded by uid %u (pid %d); see tuning(7) and login.conf(5)\n",
|
|
|
|
td->td_ucred->cr_ruid, p1->p_pid);
|
2002-10-15 00:14:32 +00:00
|
|
|
sx_xunlock(&allproc_lock);
|
2004-01-25 18:42:18 +00:00
|
|
|
#ifdef MAC
|
2007-10-24 19:04:04 +00:00
|
|
|
mac_proc_destroy(newproc);
|
2004-01-25 18:42:18 +00:00
|
|
|
#endif
|
2011-09-17 20:48:49 +00:00
|
|
|
racct_proc_exit(newproc);
|
2012-05-22 15:58:27 +00:00
|
|
|
fail1:
|
2008-03-20 15:24:49 +00:00
|
|
|
if (vm2 != NULL)
|
|
|
|
vmspace_free(vm2);
|
2002-10-15 00:14:32 +00:00
|
|
|
uma_zfree(proc_zone, newproc);
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#ifdef PROCDESC
|
2013-02-17 11:47:01 +00:00
|
|
|
if ((flags & RFPROCDESC) != 0 && fp_procdesc != NULL) {
|
2012-06-19 22:21:59 +00:00
|
|
|
fdclose(td->td_proc->p_fd, fp_procdesc, *procdescp, td);
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
fdrop(fp_procdesc, td);
|
2012-06-19 22:21:59 +00:00
|
|
|
}
|
Add experimental support for process descriptors
A "process descriptor" file descriptor is used to manage processes
without using the PID namespace. This is required for Capsicum's
Capability Mode, where the PID namespace is unavailable.
New system calls pdfork(2) and pdkill(2) offer the functional equivalents
of fork(2) and kill(2). pdgetpid(2) allows querying the PID of the remote
process for debugging purposes. The currently-unimplemented pdwait(2) will,
in the future, allow querying rusage/exit status. In the interim, poll(2)
may be used to check (and wait for) process termination.
When a process is referenced by a process descriptor, it does not issue
SIGCHLD to the parent, making it suitable for use in libraries---a common
scenario when using library compartmentalisation from within large
applications (such as web browsers). Some observers may note a similarity
to Mach task ports; process descriptors provide a subset of this behaviour,
but in a UNIX style.
This feature is enabled by "options PROCDESC", but as with several other
Capsicum kernel features, is not enabled by default in GENERIC 9.0.
Reviewed by: jhb, kib
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
2011-08-18 22:51:30 +00:00
|
|
|
#endif
|
2007-02-27 17:22:30 +00:00
|
|
|
pause("fork", hz / 2);
|
2002-10-15 00:14:32 +00:00
|
|
|
return (error);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
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
|
2010-12-06 16:39:18 +00:00
|
|
|
fork_exit(void (*callout)(void *, struct trapframe *), void *arg,
|
|
|
|
struct trapframe *frame)
|
2001-01-24 10:47:14 +00:00
|
|
|
{
|
2002-12-10 02:33:45 +00:00
|
|
|
struct proc *p;
|
2003-08-15 21:29:06 +00:00
|
|
|
struct thread *td;
|
2007-06-12 07:47:09 +00:00
|
|
|
struct thread *dtd;
|
2003-08-15 21:29:06 +00:00
|
|
|
|
2002-12-10 02:33:45 +00:00
|
|
|
td = curthread;
|
|
|
|
p = td->td_proc;
|
2004-02-05 21:01:37 +00:00
|
|
|
KASSERT(p->p_state == PRS_NORMAL, ("executing process is still new"));
|
2003-08-15 21:29:06 +00:00
|
|
|
|
2008-03-12 10:12:01 +00:00
|
|
|
CTR4(KTR_PROC, "fork_exit: new thread %p (td_sched %p, pid %d, %s)",
|
2007-11-14 06:51:33 +00:00
|
|
|
td, td->td_sched, p->p_pid, td->td_name);
|
2004-07-27 03:46:31 +00:00
|
|
|
|
Commit 6/14 of sched_lock decomposition.
- Use thread_lock() rather than sched_lock for per-thread scheduling
sychronization.
- Use the per-process spinlock rather than the sched_lock for per-process
scheduling synchronization.
- Replace the tail-end of fork_exit() with a scheduler specific routine
which can do the appropriate lock manipulations.
Tested by: kris, current@
Tested on: i386, amd64, ULE, 4BSD, libthr, libkse, PREEMPTION, etc.
Discussed with: kris, attilio, kmacy, jhb, julian, bde (small parts each)
2007-06-04 23:53:34 +00:00
|
|
|
sched_fork_exit(td);
|
2007-06-12 07:47:09 +00:00
|
|
|
/*
|
|
|
|
* Processes normally resume in mi_switch() after being
|
|
|
|
* cpu_switch()'ed to, but when children start up they arrive here
|
|
|
|
* instead, so we must do much the same things as mi_switch() would.
|
|
|
|
*/
|
|
|
|
if ((dtd = PCPU_GET(deadthread))) {
|
|
|
|
PCPU_SET(deadthread, NULL);
|
|
|
|
thread_stash(dtd);
|
|
|
|
}
|
|
|
|
thread_unlock(td);
|
|
|
|
|
2001-01-24 10:47:14 +00:00
|
|
|
/*
|
|
|
|
* cpu_set_fork_handler intercepts this function call to
|
2003-08-15 21:29:06 +00:00
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
if (p->p_flag & P_KTHREAD) {
|
|
|
|
printf("Kernel thread \"%s\" (pid %d) exited prematurely.\n",
|
2007-11-14 06:51:33 +00:00
|
|
|
td->td_name, p->p_pid);
|
2007-10-20 23:23:23 +00:00
|
|
|
kproc_exit(0);
|
2001-01-24 10:47:14 +00:00
|
|
|
}
|
|
|
|
mtx_assert(&Giant, MA_NOTOWNED);
|
2006-08-15 12:10:57 +00:00
|
|
|
|
2011-03-08 19:01:45 +00:00
|
|
|
if (p->p_sysent->sv_schedtail != NULL)
|
|
|
|
(p->p_sysent->sv_schedtail)(td);
|
2001-01-24 10:47:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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
|
2010-12-06 16:39:18 +00:00
|
|
|
fork_return(struct thread *td, struct trapframe *frame)
|
2001-01-24 10:47:14 +00:00
|
|
|
{
|
2011-01-25 10:59:21 +00:00
|
|
|
struct proc *p, *dbg;
|
|
|
|
|
|
|
|
if (td->td_dbgflags & TDB_STOPATFORK) {
|
|
|
|
p = td->td_proc;
|
|
|
|
sx_xlock(&proctree_lock);
|
|
|
|
PROC_LOCK(p);
|
|
|
|
if ((p->p_pptr->p_flag & (P_TRACED | P_FOLLOWFORK)) ==
|
|
|
|
(P_TRACED | P_FOLLOWFORK)) {
|
|
|
|
/*
|
|
|
|
* If debugger still wants auto-attach for the
|
|
|
|
* parent's children, do it now.
|
|
|
|
*/
|
|
|
|
dbg = p->p_pptr->p_pptr;
|
|
|
|
p->p_flag |= P_TRACED;
|
|
|
|
p->p_oppid = p->p_pptr->p_pid;
|
|
|
|
proc_reparent(p, dbg);
|
|
|
|
sx_xunlock(&proctree_lock);
|
2012-02-10 00:02:13 +00:00
|
|
|
td->td_dbgflags |= TDB_CHILD;
|
2011-01-25 10:59:21 +00:00
|
|
|
ptracestop(td, SIGSTOP);
|
2012-02-10 00:02:13 +00:00
|
|
|
td->td_dbgflags &= ~TDB_CHILD;
|
2011-01-25 10:59:21 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* ... otherwise clear the request.
|
|
|
|
*/
|
|
|
|
sx_xunlock(&proctree_lock);
|
|
|
|
td->td_dbgflags &= ~TDB_STOPATFORK;
|
|
|
|
cv_broadcast(&p->p_dbgwait);
|
|
|
|
}
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
}
|
2001-01-24 10:47:14 +00:00
|
|
|
|
2006-02-08 08:09:17 +00:00
|
|
|
userret(td, frame);
|
2011-01-25 10:59:21 +00:00
|
|
|
|
2001-01-24 10:47:14 +00:00
|
|
|
#ifdef KTRACE
|
2002-06-07 05:42:25 +00:00
|
|
|
if (KTRPOINT(td, KTR_SYSRET))
|
|
|
|
ktrsysret(SYS_fork, 0, 0);
|
2001-01-24 10:47:14 +00:00
|
|
|
#endif
|
|
|
|
}
|