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.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
1996-03-11 06:05:03 +00:00
|
|
|
* @(#)kern_proc.c 8.7 (Berkeley) 2/14/95
|
2003-06-12 16:41:50 +00:00
|
|
|
* $FreeBSD$
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
|
2003-06-11 00:56:59 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2002-06-07 05:41:27 +00:00
|
|
|
#include "opt_ktrace.h"
|
2002-09-07 22:11:45 +00:00
|
|
|
#include "opt_kstack_pages.h"
|
2002-06-07 05:41:27 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
|
|
|
#include <sys/kernel.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
#include <sys/lock.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/malloc.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
#include <sys/mutex.h>
|
1999-11-16 20:31:58 +00:00
|
|
|
#include <sys/proc.h>
|
2003-07-12 02:00:16 +00:00
|
|
|
#include <sys/sysent.h>
|
2002-11-21 01:22:38 +00:00
|
|
|
#include <sys/sched.h>
|
2002-09-28 08:44:31 +00:00
|
|
|
#include <sys/smp.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
#include <sys/sysctl.h>
|
1998-11-11 10:56:07 +00:00
|
|
|
#include <sys/filedesc.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/tty.h>
|
1994-09-25 19:34:02 +00:00
|
|
|
#include <sys/signalvar.h>
|
2001-03-28 11:52:56 +00:00
|
|
|
#include <sys/sx.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
#include <sys/user.h>
|
|
|
|
#include <sys/jail.h>
|
2002-06-07 05:41:27 +00:00
|
|
|
#ifdef KTRACE
|
|
|
|
#include <sys/uio.h>
|
|
|
|
#include <sys/ktrace.h>
|
|
|
|
#endif
|
2001-05-01 08:13:21 +00:00
|
|
|
|
1995-12-07 12:48:31 +00:00
|
|
|
#include <vm/vm.h>
|
2002-07-07 23:05:27 +00:00
|
|
|
#include <vm/vm_extern.h>
|
1995-12-07 12:48:31 +00:00
|
|
|
#include <vm/pmap.h>
|
|
|
|
#include <vm/vm_map.h>
|
2002-03-20 04:09:59 +00:00
|
|
|
#include <vm/uma.h>
|
2002-04-01 23:51:23 +00:00
|
|
|
#include <machine/critical.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2002-02-23 11:12:57 +00:00
|
|
|
MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
|
1997-10-12 20:26:33 +00:00
|
|
|
MALLOC_DEFINE(M_SESSION, "session", "session header");
|
1998-02-20 13:52:15 +00:00
|
|
|
static MALLOC_DEFINE(M_PROC, "proc", "Proc structures");
|
1997-10-12 20:26:33 +00:00
|
|
|
MALLOC_DEFINE(M_SUBPROC, "subproc", "Proc sub-structures");
|
1997-10-11 18:31:40 +00:00
|
|
|
|
2002-03-24 05:09:11 +00:00
|
|
|
static void doenterpgrp(struct proc *, struct pgrp *);
|
|
|
|
static void orphanpg(struct pgrp *pg);
|
2003-04-18 20:17:05 +00:00
|
|
|
static void pgadjustjobc(struct pgrp *pgrp, int entering);
|
|
|
|
static void pgdelete(struct pgrp *);
|
2002-07-07 23:05:27 +00:00
|
|
|
static void proc_ctor(void *mem, int size, void *arg);
|
|
|
|
static void proc_dtor(void *mem, int size, void *arg);
|
|
|
|
static void proc_init(void *mem, int size);
|
|
|
|
static void proc_fini(void *mem, int size);
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
1996-03-11 06:05:03 +00:00
|
|
|
* Other process lists
|
|
|
|
*/
|
|
|
|
struct pidhashhead *pidhashtbl;
|
|
|
|
u_long pidhash;
|
|
|
|
struct pgrphashhead *pgrphashtbl;
|
|
|
|
u_long pgrphash;
|
|
|
|
struct proclist allproc;
|
|
|
|
struct proclist zombproc;
|
2001-03-28 11:52:56 +00:00
|
|
|
struct sx allproc_lock;
|
|
|
|
struct sx proctree_lock;
|
2002-03-27 21:36:18 +00:00
|
|
|
struct mtx pargs_ref_lock;
|
2002-10-15 00:14:32 +00:00
|
|
|
struct mtx ppeers_lock;
|
2002-03-20 04:09:59 +00:00
|
|
|
uma_zone_t proc_zone;
|
|
|
|
uma_zone_t ithread_zone;
|
1996-03-11 06:05:03 +00:00
|
|
|
|
2002-09-07 22:11:45 +00:00
|
|
|
int kstack_pages = KSTACK_PAGES;
|
|
|
|
int uarea_pages = UAREA_PAGES;
|
|
|
|
SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0, "");
|
|
|
|
SYSCTL_INT(_kern, OID_AUTO, uarea_pages, CTLFLAG_RD, &uarea_pages, 0, "");
|
|
|
|
|
2002-07-07 23:05:27 +00:00
|
|
|
#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start))
|
|
|
|
|
2002-04-06 08:13:52 +00:00
|
|
|
CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE);
|
|
|
|
|
1996-03-11 06:05:03 +00:00
|
|
|
/*
|
|
|
|
* Initialize global process hashing structures.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1994-05-25 09:21:21 +00:00
|
|
|
void
|
1996-03-11 06:05:03 +00:00
|
|
|
procinit()
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
|
|
|
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_init(&allproc_lock, "allproc");
|
|
|
|
sx_init(&proctree_lock, "proctree");
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&pargs_ref_lock, "struct pargs.ref", NULL, MTX_DEF);
|
2002-10-15 00:14:32 +00:00
|
|
|
mtx_init(&ppeers_lock, "p_peers", NULL, MTX_DEF);
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_INIT(&allproc);
|
|
|
|
LIST_INIT(&zombproc);
|
|
|
|
pidhashtbl = hashinit(maxproc / 4, M_PROC, &pidhash);
|
|
|
|
pgrphashtbl = hashinit(maxproc / 4, M_PROC, &pgrphash);
|
2002-11-21 01:22:38 +00:00
|
|
|
proc_zone = uma_zcreate("PROC", sched_sizeof_proc(),
|
2002-07-07 23:05:27 +00:00
|
|
|
proc_ctor, proc_dtor, proc_init, proc_fini,
|
|
|
|
UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
|
2000-09-05 22:11:13 +00:00
|
|
|
uihashinit();
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
2002-07-07 23:05:27 +00:00
|
|
|
/*
|
|
|
|
* Prepare a proc for use.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
proc_ctor(void *mem, int size, void *arg)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
|
|
|
|
p = (struct proc *)mem;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reclaim a proc after use.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
proc_dtor(void *mem, int size, void *arg)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
2002-09-06 07:00:37 +00:00
|
|
|
struct thread *td;
|
|
|
|
struct ksegrp *kg;
|
|
|
|
struct kse *ke;
|
2002-07-07 23:05:27 +00:00
|
|
|
|
2002-09-06 07:00:37 +00:00
|
|
|
/* INVARIANTS checks go here */
|
2002-07-07 23:05:27 +00:00
|
|
|
p = (struct proc *)mem;
|
2002-09-06 07:00:37 +00:00
|
|
|
KASSERT((p->p_numthreads == 1),
|
|
|
|
("bad number of threads in exiting process"));
|
|
|
|
td = FIRST_THREAD_IN_PROC(p);
|
|
|
|
KASSERT((td != NULL), ("proc_dtor: bad thread pointer"));
|
|
|
|
kg = FIRST_KSEGRP_IN_PROC(p);
|
|
|
|
KASSERT((kg != NULL), ("proc_dtor: bad kg pointer"));
|
|
|
|
ke = FIRST_KSE_IN_KSEGRP(kg);
|
|
|
|
KASSERT((ke != NULL), ("proc_dtor: bad ke pointer"));
|
2002-10-02 07:44:29 +00:00
|
|
|
|
|
|
|
/* Dispose of an alternate kstack, if it exists.
|
|
|
|
* XXX What if there are more than one thread in the proc?
|
|
|
|
* The first thread in the proc is special and not
|
|
|
|
* freed, so you gotta do this here.
|
|
|
|
*/
|
|
|
|
if (((p->p_flag & P_KTHREAD) != 0) && (td->td_altkstack != 0))
|
2003-06-14 06:20:25 +00:00
|
|
|
vm_thread_dispose_altkstack(td);
|
2002-10-02 07:44:29 +00:00
|
|
|
|
2002-09-06 07:00:37 +00:00
|
|
|
/*
|
|
|
|
* We want to make sure we know the initial linkages.
|
|
|
|
* so for now tear them down and remake them.
|
2002-09-06 13:22:44 +00:00
|
|
|
* This is probably un-needed as we can probably rely
|
2002-09-06 07:00:37 +00:00
|
|
|
* on the state coming in here from wait4().
|
|
|
|
*/
|
|
|
|
proc_linkup(p, kg, ke, td);
|
2002-07-07 23:05:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize type-stable parts of a proc (when newly created).
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
proc_init(void *mem, int size)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
2002-09-06 07:00:37 +00:00
|
|
|
struct thread *td;
|
|
|
|
struct ksegrp *kg;
|
|
|
|
struct kse *ke;
|
2002-07-07 23:05:27 +00:00
|
|
|
|
|
|
|
p = (struct proc *)mem;
|
2002-11-21 01:22:38 +00:00
|
|
|
p->p_sched = (struct p_sched *)&p[1];
|
2002-07-07 23:05:27 +00:00
|
|
|
vm_proc_new(p);
|
2002-09-06 07:00:37 +00:00
|
|
|
td = thread_alloc();
|
2002-09-15 23:52:25 +00:00
|
|
|
ke = kse_alloc();
|
|
|
|
kg = ksegrp_alloc();
|
2002-09-06 07:00:37 +00:00
|
|
|
proc_linkup(p, kg, ke, td);
|
2003-05-01 21:16:38 +00:00
|
|
|
bzero(&p->p_mtx, sizeof(struct mtx));
|
|
|
|
mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK);
|
2002-07-07 23:05:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Tear down type-stable parts of a proc (just before being discarded)
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
proc_fini(void *mem, int size)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
2002-09-15 23:52:25 +00:00
|
|
|
struct thread *td;
|
|
|
|
struct ksegrp *kg;
|
|
|
|
struct kse *ke;
|
2002-07-07 23:05:27 +00:00
|
|
|
|
|
|
|
p = (struct proc *)mem;
|
2002-09-15 23:52:25 +00:00
|
|
|
KASSERT((p->p_numthreads == 1),
|
|
|
|
("bad number of threads in freeing process"));
|
|
|
|
td = FIRST_THREAD_IN_PROC(p);
|
|
|
|
KASSERT((td != NULL), ("proc_dtor: bad thread pointer"));
|
|
|
|
kg = FIRST_KSEGRP_IN_PROC(p);
|
|
|
|
KASSERT((kg != NULL), ("proc_dtor: bad kg pointer"));
|
|
|
|
ke = FIRST_KSE_IN_KSEGRP(kg);
|
|
|
|
KASSERT((ke != NULL), ("proc_dtor: bad ke pointer"));
|
2002-07-07 23:05:27 +00:00
|
|
|
vm_proc_dispose(p);
|
2002-09-15 23:52:25 +00:00
|
|
|
thread_free(td);
|
|
|
|
ksegrp_free(kg);
|
|
|
|
kse_free(ke);
|
2003-05-01 21:16:38 +00:00
|
|
|
mtx_destroy(&p->p_mtx);
|
2002-07-07 23:05:27 +00:00
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Is p an inferior of the current process?
|
|
|
|
*/
|
2000-06-23 07:10:34 +00:00
|
|
|
int
|
1994-05-24 10:09:53 +00:00
|
|
|
inferior(p)
|
|
|
|
register struct proc *p;
|
|
|
|
{
|
2001-11-12 18:56:49 +00:00
|
|
|
|
|
|
|
sx_assert(&proctree_lock, SX_LOCKED);
|
|
|
|
for (; p != curproc; p = p->p_pptr)
|
2001-11-13 16:55:54 +00:00
|
|
|
if (p->p_pid == 0)
|
|
|
|
return (0);
|
|
|
|
return (1);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Locate a process by number
|
|
|
|
*/
|
|
|
|
struct proc *
|
|
|
|
pfind(pid)
|
|
|
|
register pid_t pid;
|
|
|
|
{
|
|
|
|
register struct proc *p;
|
|
|
|
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_slock(&allproc_lock);
|
1999-11-16 16:28:58 +00:00
|
|
|
LIST_FOREACH(p, PIDHASH(pid), p_hash)
|
2001-04-24 00:51:53 +00:00
|
|
|
if (p->p_pid == pid) {
|
|
|
|
PROC_LOCK(p);
|
2000-11-22 07:42:04 +00:00
|
|
|
break;
|
2001-04-24 00:51:53 +00:00
|
|
|
}
|
2003-01-04 11:45:50 +00:00
|
|
|
sx_sunlock(&allproc_lock);
|
2000-11-22 07:42:04 +00:00
|
|
|
return (p);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-02-23 11:12:57 +00:00
|
|
|
* Locate a process group by number.
|
2002-04-16 17:03:05 +00:00
|
|
|
* The caller must hold proctree_lock.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
struct pgrp *
|
|
|
|
pgfind(pgid)
|
|
|
|
register pid_t pgid;
|
|
|
|
{
|
|
|
|
register struct pgrp *pgrp;
|
|
|
|
|
2002-04-16 17:03:05 +00:00
|
|
|
sx_assert(&proctree_lock, SX_LOCKED);
|
2002-02-23 11:12:57 +00:00
|
|
|
|
|
|
|
LIST_FOREACH(pgrp, PGRPHASH(pgid), pg_hash) {
|
|
|
|
if (pgrp->pg_id == pgid) {
|
|
|
|
PGRP_LOCK(pgrp);
|
1994-05-24 10:09:53 +00:00
|
|
|
return (pgrp);
|
2002-02-23 11:12:57 +00:00
|
|
|
}
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-02-23 11:12:57 +00:00
|
|
|
* Create a new process group.
|
|
|
|
* pgid must be equal to the pid of p.
|
|
|
|
* Begin a new session if required.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
1994-05-25 09:21:21 +00:00
|
|
|
int
|
2002-02-23 11:12:57 +00:00
|
|
|
enterpgrp(p, pgid, pgrp, sess)
|
1994-05-24 10:09:53 +00:00
|
|
|
register struct proc *p;
|
|
|
|
pid_t pgid;
|
2002-02-23 11:12:57 +00:00
|
|
|
struct pgrp *pgrp;
|
|
|
|
struct session *sess;
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
2002-02-23 11:12:57 +00:00
|
|
|
struct pgrp *pgrp2;
|
|
|
|
|
2002-04-16 17:03:05 +00:00
|
|
|
sx_assert(&proctree_lock, SX_XLOCKED);
|
2002-02-23 11:12:57 +00:00
|
|
|
|
|
|
|
KASSERT(pgrp != NULL, ("enterpgrp: pgrp == NULL"));
|
|
|
|
KASSERT(p->p_pid == pgid,
|
|
|
|
("enterpgrp: new pgrp and pid != pgid"));
|
|
|
|
|
|
|
|
pgrp2 = pgfind(pgid);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2002-02-23 11:12:57 +00:00
|
|
|
KASSERT(pgrp2 == NULL,
|
|
|
|
("enterpgrp: pgrp with pgid exists"));
|
1999-01-08 17:31:30 +00:00
|
|
|
KASSERT(!SESS_LEADER(p),
|
1999-01-10 01:58:29 +00:00
|
|
|
("enterpgrp: session leader attempted setpgrp"));
|
|
|
|
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&pgrp->pg_mtx, "process group", NULL, MTX_DEF | MTX_DUPOK);
|
2002-02-23 11:12:57 +00:00
|
|
|
|
|
|
|
if (sess != NULL) {
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
2002-02-23 11:12:57 +00:00
|
|
|
* new session
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&sess->s_mtx, "session", NULL, MTX_DEF);
|
2002-02-23 11:12:57 +00:00
|
|
|
PROC_LOCK(p);
|
|
|
|
p->p_flag &= ~P_CONTROLT;
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
PGRP_LOCK(pgrp);
|
|
|
|
sess->s_leader = p;
|
|
|
|
sess->s_sid = p->p_pid;
|
|
|
|
sess->s_count = 1;
|
|
|
|
sess->s_ttyvp = NULL;
|
|
|
|
sess->s_ttyp = NULL;
|
|
|
|
bcopy(p->p_session->s_login, sess->s_login,
|
1994-05-24 10:09:53 +00:00
|
|
|
sizeof(sess->s_login));
|
2002-02-23 11:12:57 +00:00
|
|
|
pgrp->pg_session = sess;
|
|
|
|
KASSERT(p == curproc,
|
|
|
|
("enterpgrp: mksession and p != curproc"));
|
|
|
|
} else {
|
|
|
|
pgrp->pg_session = p->p_session;
|
|
|
|
SESS_LOCK(pgrp->pg_session);
|
|
|
|
pgrp->pg_session->s_count++;
|
|
|
|
SESS_UNLOCK(pgrp->pg_session);
|
|
|
|
PGRP_LOCK(pgrp);
|
|
|
|
}
|
|
|
|
pgrp->pg_id = pgid;
|
|
|
|
LIST_INIT(&pgrp->pg_members);
|
|
|
|
|
|
|
|
/*
|
2002-04-16 17:03:05 +00:00
|
|
|
* As we have an exclusive lock of proctree_lock,
|
2002-02-23 11:12:57 +00:00
|
|
|
* this should not deadlock.
|
|
|
|
*/
|
|
|
|
LIST_INSERT_HEAD(PGRPHASH(pgid), pgrp, pg_hash);
|
|
|
|
pgrp->pg_jobc = 0;
|
|
|
|
SLIST_INIT(&pgrp->pg_sigiolst);
|
|
|
|
PGRP_UNLOCK(pgrp);
|
|
|
|
|
|
|
|
doenterpgrp(p, pgrp);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Move p to an existing process group
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
enterthispgrp(p, pgrp)
|
|
|
|
register struct proc *p;
|
|
|
|
struct pgrp *pgrp;
|
|
|
|
{
|
2002-04-16 17:03:05 +00:00
|
|
|
|
|
|
|
sx_assert(&proctree_lock, SX_XLOCKED);
|
2002-02-23 11:12:57 +00:00
|
|
|
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
|
|
|
|
PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED);
|
|
|
|
PGRP_LOCK_ASSERT(p->p_pgrp, MA_NOTOWNED);
|
|
|
|
SESS_LOCK_ASSERT(p->p_session, MA_NOTOWNED);
|
|
|
|
KASSERT(pgrp->pg_session == p->p_session,
|
|
|
|
("%s: pgrp's session %p, p->p_session %p.\n",
|
|
|
|
__func__,
|
|
|
|
pgrp->pg_session,
|
|
|
|
p->p_session));
|
|
|
|
KASSERT(pgrp != p->p_pgrp,
|
|
|
|
("%s: p belongs to pgrp.", __func__));
|
|
|
|
|
|
|
|
doenterpgrp(p, pgrp);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Move p to a process group
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
doenterpgrp(p, pgrp)
|
|
|
|
struct proc *p;
|
|
|
|
struct pgrp *pgrp;
|
|
|
|
{
|
|
|
|
struct pgrp *savepgrp;
|
|
|
|
|
2002-04-16 17:03:05 +00:00
|
|
|
sx_assert(&proctree_lock, SX_XLOCKED);
|
2002-02-23 11:12:57 +00:00
|
|
|
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
|
|
|
|
PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED);
|
|
|
|
PGRP_LOCK_ASSERT(p->p_pgrp, MA_NOTOWNED);
|
|
|
|
SESS_LOCK_ASSERT(p->p_session, MA_NOTOWNED);
|
|
|
|
|
|
|
|
savepgrp = p->p_pgrp;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Adjust eligibility of affected pgrps to participate in job control.
|
|
|
|
* Increment eligibility counts before decrementing, otherwise we
|
|
|
|
* could reach 0 spuriously during the first call.
|
|
|
|
*/
|
|
|
|
fixjobc(p, pgrp, 1);
|
|
|
|
fixjobc(p, p->p_pgrp, 0);
|
|
|
|
|
2002-02-23 11:12:57 +00:00
|
|
|
PGRP_LOCK(pgrp);
|
|
|
|
PGRP_LOCK(savepgrp);
|
2001-03-07 03:28:50 +00:00
|
|
|
PROC_LOCK(p);
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_REMOVE(p, p_pglist);
|
1994-05-24 10:09:53 +00:00
|
|
|
p->p_pgrp = pgrp;
|
2001-03-07 03:28:50 +00:00
|
|
|
PROC_UNLOCK(p);
|
2002-02-23 11:12:57 +00:00
|
|
|
LIST_INSERT_HEAD(&pgrp->pg_members, p, p_pglist);
|
|
|
|
PGRP_UNLOCK(savepgrp);
|
|
|
|
PGRP_UNLOCK(pgrp);
|
|
|
|
if (LIST_EMPTY(&savepgrp->pg_members))
|
|
|
|
pgdelete(savepgrp);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* remove process from process group
|
|
|
|
*/
|
1994-05-25 09:21:21 +00:00
|
|
|
int
|
1994-05-24 10:09:53 +00:00
|
|
|
leavepgrp(p)
|
|
|
|
register struct proc *p;
|
|
|
|
{
|
2002-02-23 11:12:57 +00:00
|
|
|
struct pgrp *savepgrp;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2002-04-16 17:03:05 +00:00
|
|
|
sx_assert(&proctree_lock, SX_XLOCKED);
|
2002-02-23 11:12:57 +00:00
|
|
|
savepgrp = p->p_pgrp;
|
|
|
|
PGRP_LOCK(savepgrp);
|
2001-03-07 03:28:50 +00:00
|
|
|
PROC_LOCK(p);
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_REMOVE(p, p_pglist);
|
2001-03-07 03:28:50 +00:00
|
|
|
p->p_pgrp = NULL;
|
|
|
|
PROC_UNLOCK(p);
|
2002-02-23 11:12:57 +00:00
|
|
|
PGRP_UNLOCK(savepgrp);
|
|
|
|
if (LIST_EMPTY(&savepgrp->pg_members))
|
|
|
|
pgdelete(savepgrp);
|
1994-05-24 10:09:53 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* delete a process group
|
|
|
|
*/
|
1995-12-14 08:32:45 +00:00
|
|
|
static void
|
1994-05-24 10:09:53 +00:00
|
|
|
pgdelete(pgrp)
|
|
|
|
register struct pgrp *pgrp;
|
|
|
|
{
|
2002-02-23 11:12:57 +00:00
|
|
|
struct session *savesess;
|
|
|
|
|
2002-04-16 17:03:05 +00:00
|
|
|
sx_assert(&proctree_lock, SX_XLOCKED);
|
2002-02-23 11:12:57 +00:00
|
|
|
PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED);
|
|
|
|
SESS_LOCK_ASSERT(pgrp->pg_session, MA_NOTOWNED);
|
|
|
|
|
Installed the second patch attached to kern/7899 with some changes suggested
by bde, a few other tweaks to get the patch to apply cleanly again and
some improvements to the comments.
This change closes some fairly minor security holes associated with
F_SETOWN, fixes a few bugs, and removes some limitations that F_SETOWN
had on tty devices. For more details, see the description on the PR.
Because this patch increases the size of the proc and pgrp structures,
it is necessary to re-install the includes and recompile libkvm,
the vinum lkm, fstat, gcore, gdb, ipfilter, ps, top, and w.
PR: kern/7899
Reviewed by: bde, elvind
1998-11-11 10:04:13 +00:00
|
|
|
/*
|
|
|
|
* Reset any sigio structures pointing to us as a result of
|
|
|
|
* F_SETOWN with our pgid.
|
|
|
|
*/
|
|
|
|
funsetownlst(&pgrp->pg_sigiolst);
|
|
|
|
|
2002-05-06 19:31:28 +00:00
|
|
|
PGRP_LOCK(pgrp);
|
1995-05-30 08:16:23 +00:00
|
|
|
if (pgrp->pg_session->s_ttyp != NULL &&
|
1994-05-24 10:09:53 +00:00
|
|
|
pgrp->pg_session->s_ttyp->t_pgrp == pgrp)
|
|
|
|
pgrp->pg_session->s_ttyp->t_pgrp = NULL;
|
1996-03-11 06:05:03 +00:00
|
|
|
LIST_REMOVE(pgrp, pg_hash);
|
2002-02-23 11:12:57 +00:00
|
|
|
savesess = pgrp->pg_session;
|
|
|
|
SESS_LOCK(savesess);
|
|
|
|
savesess->s_count--;
|
|
|
|
SESS_UNLOCK(savesess);
|
|
|
|
PGRP_UNLOCK(pgrp);
|
|
|
|
if (savesess->s_count == 0) {
|
|
|
|
mtx_destroy(&savesess->s_mtx);
|
1994-05-24 10:09:53 +00:00
|
|
|
FREE(pgrp->pg_session, M_SESSION);
|
2002-02-23 11:12:57 +00:00
|
|
|
}
|
2002-05-03 07:46:59 +00:00
|
|
|
mtx_destroy(&pgrp->pg_mtx);
|
1994-05-24 10:09:53 +00:00
|
|
|
FREE(pgrp, M_PGRP);
|
|
|
|
}
|
|
|
|
|
2003-04-18 20:17:05 +00:00
|
|
|
static void
|
|
|
|
pgadjustjobc(pgrp, entering)
|
|
|
|
struct pgrp *pgrp;
|
|
|
|
int entering;
|
|
|
|
{
|
|
|
|
|
|
|
|
PGRP_LOCK(pgrp);
|
|
|
|
if (entering)
|
|
|
|
pgrp->pg_jobc++;
|
|
|
|
else {
|
|
|
|
--pgrp->pg_jobc;
|
|
|
|
if (pgrp->pg_jobc == 0)
|
|
|
|
orphanpg(pgrp);
|
|
|
|
}
|
|
|
|
PGRP_UNLOCK(pgrp);
|
|
|
|
}
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Adjust pgrp jobc counters when specified process changes process group.
|
|
|
|
* We count the number of processes in each process group that "qualify"
|
|
|
|
* the group for terminal job control (those with a parent in a different
|
|
|
|
* process group of the same session). If that count reaches zero, the
|
|
|
|
* process group becomes orphaned. Check both the specified process'
|
|
|
|
* process group and that of its children.
|
|
|
|
* entering == 0 => p is leaving specified group.
|
|
|
|
* entering == 1 => p is entering specified group.
|
|
|
|
*/
|
1994-05-25 09:21:21 +00:00
|
|
|
void
|
1994-05-24 10:09:53 +00:00
|
|
|
fixjobc(p, pgrp, entering)
|
|
|
|
register struct proc *p;
|
|
|
|
register struct pgrp *pgrp;
|
|
|
|
int entering;
|
|
|
|
{
|
|
|
|
register struct pgrp *hispgrp;
|
2002-02-23 11:12:57 +00:00
|
|
|
register struct session *mysession;
|
|
|
|
|
2002-04-16 17:03:05 +00:00
|
|
|
sx_assert(&proctree_lock, SX_LOCKED);
|
2002-02-23 11:12:57 +00:00
|
|
|
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
|
|
|
|
PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED);
|
|
|
|
SESS_LOCK_ASSERT(pgrp->pg_session, MA_NOTOWNED);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check p's parent to see whether p qualifies its own process
|
|
|
|
* group; if so, adjust count for p's process group.
|
|
|
|
*/
|
2002-02-23 11:12:57 +00:00
|
|
|
mysession = pgrp->pg_session;
|
1994-05-24 10:09:53 +00:00
|
|
|
if ((hispgrp = p->p_pptr->p_pgrp) != pgrp &&
|
2003-04-18 20:17:05 +00:00
|
|
|
hispgrp->pg_session == mysession)
|
|
|
|
pgadjustjobc(pgrp, entering);
|
1994-05-24 10:09:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check this process' children to see whether they qualify
|
|
|
|
* their process groups; if so, adjust counts for children's
|
|
|
|
* process groups.
|
|
|
|
*/
|
2002-02-23 11:12:57 +00:00
|
|
|
LIST_FOREACH(p, &p->p_children, p_sibling) {
|
2003-04-18 20:17:05 +00:00
|
|
|
hispgrp = p->p_pgrp;
|
|
|
|
if (hispgrp == pgrp ||
|
|
|
|
hispgrp->pg_session != mysession)
|
|
|
|
continue;
|
|
|
|
PROC_LOCK(p);
|
|
|
|
if (p->p_state == PRS_ZOMBIE) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
continue;
|
1999-05-06 18:13:11 +00:00
|
|
|
}
|
2003-04-18 20:17:05 +00:00
|
|
|
PROC_UNLOCK(p);
|
|
|
|
pgadjustjobc(hispgrp, entering);
|
2002-02-23 11:12:57 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1995-05-30 08:16:23 +00:00
|
|
|
/*
|
1994-05-24 10:09:53 +00:00
|
|
|
* A process group has become orphaned;
|
|
|
|
* if there are any stopped processes in the group,
|
|
|
|
* hang-up all process in that group.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
orphanpg(pg)
|
|
|
|
struct pgrp *pg;
|
|
|
|
{
|
|
|
|
register struct proc *p;
|
|
|
|
|
2002-02-23 11:12:57 +00:00
|
|
|
PGRP_LOCK_ASSERT(pg, MA_OWNED);
|
|
|
|
|
1999-11-16 16:28:58 +00:00
|
|
|
LIST_FOREACH(p, &pg->pg_members, p_pglist) {
|
2003-04-18 20:17:05 +00:00
|
|
|
PROC_LOCK(p);
|
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
|
|
|
if (P_SHOULDSTOP(p)) {
|
2003-04-18 20:17:05 +00:00
|
|
|
PROC_UNLOCK(p);
|
1999-11-16 16:28:58 +00:00
|
|
|
LIST_FOREACH(p, &pg->pg_members, p_pglist) {
|
2001-03-07 03:28:50 +00:00
|
|
|
PROC_LOCK(p);
|
1994-05-24 10:09:53 +00:00
|
|
|
psignal(p, SIGHUP);
|
|
|
|
psignal(p, SIGCONT);
|
2001-03-07 03:28:50 +00:00
|
|
|
PROC_UNLOCK(p);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2003-04-18 20:17:05 +00:00
|
|
|
PROC_UNLOCK(p);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1996-09-14 10:53:48 +00:00
|
|
|
#include "opt_ddb.h"
|
|
|
|
#ifdef DDB
|
|
|
|
#include <ddb/ddb.h>
|
|
|
|
|
|
|
|
DB_SHOW_COMMAND(pgrpdump, pgrpdump)
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
|
|
|
register struct pgrp *pgrp;
|
|
|
|
register struct proc *p;
|
1998-02-20 13:52:15 +00:00
|
|
|
register int i;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1996-03-11 06:05:03 +00:00
|
|
|
for (i = 0; i <= pgrphash; i++) {
|
1999-11-16 16:28:58 +00:00
|
|
|
if (!LIST_EMPTY(&pgrphashtbl[i])) {
|
1996-03-11 06:05:03 +00:00
|
|
|
printf("\tindx %d\n", i);
|
1999-11-16 16:28:58 +00:00
|
|
|
LIST_FOREACH(pgrp, &pgrphashtbl[i], pg_hash) {
|
1998-07-11 07:46:16 +00:00
|
|
|
printf(
|
|
|
|
"\tpgrp %p, pgid %ld, sess %p, sesscnt %d, mem %p\n",
|
|
|
|
(void *)pgrp, (long)pgrp->pg_id,
|
|
|
|
(void *)pgrp->pg_session,
|
1996-03-11 06:05:03 +00:00
|
|
|
pgrp->pg_session->s_count,
|
1999-11-16 16:28:58 +00:00
|
|
|
(void *)LIST_FIRST(&pgrp->pg_members));
|
|
|
|
LIST_FOREACH(p, &pgrp->pg_members, p_pglist) {
|
1998-07-11 07:46:16 +00:00
|
|
|
printf("\t\tpid %ld addr %p pgrp %p\n",
|
|
|
|
(long)p->p_pid, (void *)p,
|
|
|
|
(void *)p->p_pgrp);
|
1996-03-11 06:05:03 +00:00
|
|
|
}
|
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1996-09-14 10:53:48 +00:00
|
|
|
#endif /* DDB */
|
2003-06-12 16:41:50 +00:00
|
|
|
void
|
|
|
|
fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp);
|
1995-11-14 09:16:27 +00:00
|
|
|
|
|
|
|
/*
|
2002-12-30 21:18:15 +00:00
|
|
|
* Fill in a kinfo_proc structure for the specified process.
|
2002-04-09 20:10:46 +00:00
|
|
|
* Must be called with the target process locked.
|
1995-11-14 09:16:27 +00:00
|
|
|
*/
|
|
|
|
void
|
2003-06-12 16:41:50 +00:00
|
|
|
fill_kinfo_proc(struct proc *p, struct kinfo_proc *kp)
|
1995-11-14 09:16:27 +00:00
|
|
|
{
|
2003-06-12 16:41:50 +00:00
|
|
|
fill_kinfo_thread(FIRST_THREAD_IN_PROC(p), kp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
2003-03-31 22:49:17 +00:00
|
|
|
struct thread *td0;
|
2002-09-15 23:52:25 +00:00
|
|
|
struct kse *ke;
|
|
|
|
struct ksegrp *kg;
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
struct tty *tp;
|
|
|
|
struct session *sp;
|
2002-02-22 13:32:01 +00:00
|
|
|
struct timeval tv;
|
- 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
|
|
|
struct sigacts *ps;
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
|
2003-06-12 16:41:50 +00:00
|
|
|
p = td->td_proc;
|
2003-03-31 22:49:17 +00:00
|
|
|
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
bzero(kp, sizeof(*kp));
|
|
|
|
|
|
|
|
kp->ki_structsize = sizeof(*kp);
|
|
|
|
kp->ki_paddr = p;
|
2002-04-09 20:10:46 +00:00
|
|
|
PROC_LOCK_ASSERT(p, MA_OWNED);
|
2001-09-12 08:38:13 +00:00
|
|
|
kp->ki_addr =/* p->p_addr; */0; /* XXXKSE */
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_args = p->p_args;
|
|
|
|
kp->ki_textvp = p->p_textvp;
|
2002-06-07 05:41:27 +00:00
|
|
|
#ifdef KTRACE
|
2003-03-13 18:24:22 +00:00
|
|
|
kp->ki_tracep = p->p_tracevp;
|
2002-06-07 05:41:27 +00:00
|
|
|
mtx_lock(&ktrace_mtx);
|
|
|
|
kp->ki_traceflag = p->p_traceflag;
|
|
|
|
mtx_unlock(&ktrace_mtx);
|
|
|
|
#endif
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_fd = p->p_fd;
|
|
|
|
kp->ki_vmspace = p->p_vmspace;
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
if (p->p_ucred) {
|
|
|
|
kp->ki_uid = p->p_ucred->cr_uid;
|
|
|
|
kp->ki_ruid = p->p_ucred->cr_ruid;
|
|
|
|
kp->ki_svuid = p->p_ucred->cr_svuid;
|
2001-08-16 23:43:24 +00:00
|
|
|
/* XXX bde doesn't like KI_NGROUPS */
|
|
|
|
kp->ki_ngroups = min(p->p_ucred->cr_ngroups, KI_NGROUPS);
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
bcopy(p->p_ucred->cr_groups, kp->ki_groups,
|
2001-08-16 23:43:24 +00:00
|
|
|
kp->ki_ngroups * sizeof(gid_t));
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
kp->ki_rgid = p->p_ucred->cr_rgid;
|
|
|
|
kp->ki_svgid = p->p_ucred->cr_svgid;
|
1995-11-14 09:16:27 +00:00
|
|
|
}
|
- 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 (p->p_sigacts) {
|
|
|
|
ps = p->p_sigacts;
|
|
|
|
mtx_lock(&ps->ps_mtx);
|
|
|
|
kp->ki_sigignore = ps->ps_sigignore;
|
|
|
|
kp->ki_sigcatch = ps->ps_sigcatch;
|
|
|
|
mtx_unlock(&ps->ps_mtx);
|
1999-01-13 03:11:43 +00:00
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_lock_spin(&sched_lock);
|
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
|
|
|
if (p->p_state != PRS_NEW &&
|
|
|
|
p->p_state != PRS_ZOMBIE &&
|
|
|
|
p->p_vmspace != NULL) {
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
struct vmspace *vm = p->p_vmspace;
|
|
|
|
|
|
|
|
kp->ki_size = vm->vm_map.size;
|
|
|
|
kp->ki_rssize = vmspace_resident_count(vm); /*XXX*/
|
2003-04-25 00:20:40 +00:00
|
|
|
if (p->p_sflag & PS_INMEM)
|
2001-09-12 08:38:13 +00:00
|
|
|
kp->ki_rssize += UAREA_PAGES;
|
2003-04-25 00:20:40 +00:00
|
|
|
FOREACH_THREAD_IN_PROC(p, td0) {
|
|
|
|
if (!TD_IS_SWAPPED(td0))
|
|
|
|
kp->ki_rssize += td0->td_kstack_pages;
|
|
|
|
if (td0->td_altkstack_obj != NULL)
|
|
|
|
kp->ki_rssize += td0->td_altkstack_pages;
|
2003-04-24 11:03:04 +00:00
|
|
|
}
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_swrss = vm->vm_swrss;
|
|
|
|
kp->ki_tsize = vm->vm_tsize;
|
|
|
|
kp->ki_dsize = vm->vm_dsize;
|
|
|
|
kp->ki_ssize = vm->vm_ssize;
|
|
|
|
}
|
2001-01-24 11:05:50 +00:00
|
|
|
if ((p->p_sflag & PS_INMEM) && p->p_stats) {
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_start = p->p_stats->p_start;
|
2003-05-01 16:59:23 +00:00
|
|
|
timevaladd(&kp->ki_start, &boottime);
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_rusage = p->p_stats->p_ru;
|
|
|
|
kp->ki_childtime.tv_sec = p->p_stats->p_cru.ru_utime.tv_sec +
|
|
|
|
p->p_stats->p_cru.ru_stime.tv_sec;
|
|
|
|
kp->ki_childtime.tv_usec = p->p_stats->p_cru.ru_utime.tv_usec +
|
|
|
|
p->p_stats->p_cru.ru_stime.tv_usec;
|
1995-11-14 09:16:27 +00:00
|
|
|
}
|
2002-06-30 07:50:22 +00:00
|
|
|
if (p->p_state != PRS_ZOMBIE) {
|
2003-06-12 16:41:50 +00:00
|
|
|
#if 0
|
2002-09-16 19:26:48 +00:00
|
|
|
if (td == NULL) {
|
|
|
|
/* XXXKSE: This should never happen. */
|
|
|
|
printf("fill_kinfo_proc(): pid %d has no threads!\n",
|
|
|
|
p->p_pid);
|
|
|
|
mtx_unlock_spin(&sched_lock);
|
|
|
|
return;
|
|
|
|
}
|
2003-06-12 16:41:50 +00:00
|
|
|
#endif
|
|
|
|
if (td->td_wmesg != NULL) {
|
|
|
|
strlcpy(kp->ki_wmesg, td->td_wmesg,
|
|
|
|
sizeof(kp->ki_wmesg));
|
|
|
|
}
|
|
|
|
if (TD_ON_LOCK(td)) {
|
|
|
|
kp->ki_kiflag |= KI_LOCKBLOCK;
|
|
|
|
strlcpy(kp->ki_lockname, td->td_lockname,
|
|
|
|
sizeof(kp->ki_lockname));
|
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
|
|
|
}
|
|
|
|
|
2002-08-11 13:05:30 +00:00
|
|
|
if (p->p_state == PRS_NORMAL) { /* XXXKSE very approximate */
|
2002-09-15 23:52:25 +00:00
|
|
|
if (TD_ON_RUNQ(td) ||
|
|
|
|
TD_CAN_RUN(td) ||
|
|
|
|
TD_IS_RUNNING(td)) {
|
2002-06-30 07:50:22 +00:00
|
|
|
kp->ki_stat = SRUN;
|
|
|
|
} else if (P_SHOULDSTOP(p)) {
|
|
|
|
kp->ki_stat = SSTOP;
|
2002-09-15 23:52:25 +00:00
|
|
|
} else if (TD_IS_SLEEPING(td)) {
|
|
|
|
kp->ki_stat = SSLEEP;
|
2002-10-02 20:31:47 +00:00
|
|
|
} else if (TD_ON_LOCK(td)) {
|
|
|
|
kp->ki_stat = SLOCK;
|
2002-06-30 07:50:22 +00:00
|
|
|
} else {
|
|
|
|
kp->ki_stat = SWAIT;
|
|
|
|
}
|
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
|
|
|
} else {
|
2002-06-30 07:50:22 +00:00
|
|
|
kp->ki_stat = SIDL;
|
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
|
|
|
}
|
|
|
|
|
2002-06-30 07:50:22 +00:00
|
|
|
kp->ki_sflag = p->p_sflag;
|
|
|
|
kp->ki_swtime = p->p_swtime;
|
|
|
|
kp->ki_pid = p->p_pid;
|
2003-06-12 16:41:50 +00:00
|
|
|
kg = td->td_ksegrp;
|
|
|
|
ke = td->td_kse;
|
|
|
|
bintime2timeval(&p->p_runtime, &tv);
|
|
|
|
kp->ki_runtime =
|
|
|
|
tv.tv_sec * (u_int64_t)1000000 + tv.tv_usec;
|
|
|
|
|
|
|
|
/* things in the KSE GROUP */
|
|
|
|
kp->ki_estcpu = kg->kg_estcpu;
|
|
|
|
kp->ki_slptime = kg->kg_slptime;
|
|
|
|
kp->ki_pri.pri_user = kg->kg_user_pri;
|
|
|
|
kp->ki_pri.pri_class = kg->kg_pri_class;
|
|
|
|
kp->ki_nice = kg->kg_nice;
|
|
|
|
|
|
|
|
/* Things in the thread */
|
|
|
|
kp->ki_wchan = td->td_wchan;
|
|
|
|
kp->ki_pri.pri_level = td->td_priority;
|
|
|
|
kp->ki_pri.pri_native = td->td_base_pri;
|
|
|
|
kp->ki_lastcpu = td->td_lastcpu;
|
|
|
|
kp->ki_oncpu = td->td_oncpu;
|
|
|
|
kp->ki_tdflags = td->td_flags;
|
|
|
|
kp->ki_pcb = td->td_pcb;
|
|
|
|
kp->ki_kstack = (void *)td->td_kstack;
|
2003-10-16 08:39:15 +00:00
|
|
|
kp->ki_pctcpu = sched_pctcpu(td);
|
2003-06-12 16:41:50 +00:00
|
|
|
|
|
|
|
/* Things in the kse */
|
2003-10-16 08:39:15 +00:00
|
|
|
if (ke)
|
2002-09-15 23:52:25 +00:00
|
|
|
kp->ki_rqindex = ke->ke_rqindex;
|
2003-10-16 08:39:15 +00:00
|
|
|
else
|
2003-06-12 16:41:50 +00:00
|
|
|
kp->ki_rqindex = 0;
|
|
|
|
|
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
|
|
|
} else {
|
2002-06-30 07:50:22 +00:00
|
|
|
kp->ki_stat = SZOMB;
|
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
|
|
|
}
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
mtx_unlock_spin(&sched_lock);
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
sp = NULL;
|
2002-02-23 11:12:57 +00:00
|
|
|
tp = NULL;
|
1995-11-14 09:16:27 +00:00
|
|
|
if (p->p_pgrp) {
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_pgid = p->p_pgrp->pg_id;
|
|
|
|
kp->ki_jobc = p->p_pgrp->pg_jobc;
|
|
|
|
sp = p->p_pgrp->pg_session;
|
|
|
|
|
|
|
|
if (sp != NULL) {
|
|
|
|
kp->ki_sid = sp->s_sid;
|
2002-02-23 11:12:57 +00:00
|
|
|
SESS_LOCK(sp);
|
2002-10-17 20:03:38 +00:00
|
|
|
strlcpy(kp->ki_login, sp->s_login,
|
|
|
|
sizeof(kp->ki_login));
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
if (sp->s_ttyvp)
|
2002-01-05 17:18:59 +00:00
|
|
|
kp->ki_kiflag |= KI_CTTY;
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
if (SESS_LEADER(p))
|
|
|
|
kp->ki_kiflag |= KI_SLEADER;
|
2002-02-23 11:12:57 +00:00
|
|
|
tp = sp->s_ttyp;
|
|
|
|
SESS_UNLOCK(sp);
|
1996-05-30 01:21:50 +00:00
|
|
|
}
|
1995-11-14 09:16:27 +00:00
|
|
|
}
|
2002-02-23 11:12:57 +00:00
|
|
|
if ((p->p_flag & P_CONTROLT) && tp != NULL) {
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_tdev = dev2udev(tp->t_dev);
|
|
|
|
kp->ki_tpgid = tp->t_pgrp ? tp->t_pgrp->pg_id : NO_PID;
|
|
|
|
if (tp->t_session)
|
|
|
|
kp->ki_tsid = tp->t_session->s_sid;
|
1995-11-14 09:16:27 +00:00
|
|
|
} else
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_tdev = NOUDEV;
|
2001-08-16 08:41:15 +00:00
|
|
|
if (p->p_comm[0] != '\0') {
|
2002-10-17 20:03:38 +00:00
|
|
|
strlcpy(kp->ki_comm, p->p_comm, sizeof(kp->ki_comm));
|
|
|
|
strlcpy(kp->ki_ocomm, p->p_comm, sizeof(kp->ki_ocomm));
|
1995-11-14 09:16:27 +00:00
|
|
|
}
|
2002-10-01 17:15:53 +00:00
|
|
|
kp->ki_siglist = p->p_siglist;
|
2003-03-31 22:49:17 +00:00
|
|
|
SIGSETOR(kp->ki_siglist, td->td_siglist);
|
|
|
|
kp->ki_sigmask = td->td_sigmask;
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_xstat = p->p_xstat;
|
|
|
|
kp->ki_acflag = p->p_acflag;
|
|
|
|
kp->ki_flag = p->p_flag;
|
2001-02-21 06:39:57 +00:00
|
|
|
/* If jailed(p->p_ucred), emulate the old P_JAILED flag. */
|
|
|
|
if (jailed(p->p_ucred))
|
|
|
|
kp->ki_flag |= P_JAILED;
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
kp->ki_lock = p->p_lock;
|
2001-01-24 11:05:50 +00:00
|
|
|
if (p->p_pptr)
|
|
|
|
kp->ki_ppid = p->p_pptr->p_pid;
|
1995-11-14 09:16:27 +00:00
|
|
|
}
|
|
|
|
|
2001-01-24 11:05:50 +00:00
|
|
|
/*
|
|
|
|
* Locate a zombie process by number
|
|
|
|
*/
|
|
|
|
struct proc *
|
1996-06-06 17:19:21 +00:00
|
|
|
zpfind(pid_t pid)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_slock(&allproc_lock);
|
1999-11-16 16:28:58 +00:00
|
|
|
LIST_FOREACH(p, &zombproc, p_list)
|
2001-04-24 00:51:53 +00:00
|
|
|
if (p->p_pid == pid) {
|
|
|
|
PROC_LOCK(p);
|
2000-12-13 00:17:05 +00:00
|
|
|
break;
|
2001-04-24 00:51:53 +00:00
|
|
|
}
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_sunlock(&allproc_lock);
|
2000-12-13 00:17:05 +00:00
|
|
|
return (p);
|
1996-06-06 17:19:21 +00:00
|
|
|
}
|
|
|
|
|
2003-06-12 16:41:50 +00:00
|
|
|
#define KERN_PROC_ZOMBMASK 0x3
|
|
|
|
#define KERN_PROC_NOTHREADS 0x4
|
1996-06-06 17:19:21 +00:00
|
|
|
|
2002-04-09 20:10:46 +00:00
|
|
|
/*
|
|
|
|
* Must be called with the process locked and will return with it unlocked.
|
|
|
|
*/
|
1996-06-06 17:19:21 +00:00
|
|
|
static int
|
2003-06-12 16:41:50 +00:00
|
|
|
sysctl_out_proc(struct proc *p, struct sysctl_req *req, int flags)
|
1996-06-06 17:19:21 +00:00
|
|
|
{
|
2003-06-12 16:41:50 +00:00
|
|
|
struct thread *td;
|
Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
|
|
|
struct kinfo_proc kinfo_proc;
|
2003-06-12 16:41:50 +00:00
|
|
|
int error = 0;
|
2001-04-24 00:51:53 +00:00
|
|
|
struct proc *np;
|
1996-06-06 17:19:21 +00:00
|
|
|
pid_t pid = p->p_pid;
|
|
|
|
|
2002-04-09 20:10:46 +00:00
|
|
|
PROC_LOCK_ASSERT(p, MA_OWNED);
|
2003-06-12 16:41:50 +00:00
|
|
|
|
|
|
|
if (flags & KERN_PROC_NOTHREADS) {
|
|
|
|
fill_kinfo_proc(p, &kinfo_proc);
|
2003-06-17 19:14:00 +00:00
|
|
|
PROC_UNLOCK(p);
|
2003-06-12 16:41:50 +00:00
|
|
|
error = SYSCTL_OUT(req, (caddr_t)&kinfo_proc,
|
|
|
|
sizeof(kinfo_proc));
|
2003-06-17 19:14:00 +00:00
|
|
|
PROC_LOCK(p);
|
2003-06-12 16:41:50 +00:00
|
|
|
} else {
|
|
|
|
_PHOLD(p);
|
|
|
|
FOREACH_THREAD_IN_PROC(p, td) {
|
|
|
|
fill_kinfo_thread(td, &kinfo_proc);
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
error = SYSCTL_OUT(req, (caddr_t)&kinfo_proc,
|
|
|
|
sizeof(kinfo_proc));
|
|
|
|
PROC_LOCK(p);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
_PRELE(p);
|
|
|
|
}
|
2002-04-09 20:10:46 +00:00
|
|
|
PROC_UNLOCK(p);
|
1996-06-06 17:19:21 +00:00
|
|
|
if (error)
|
|
|
|
return (error);
|
2003-06-12 16:41:50 +00:00
|
|
|
if (flags & KERN_PROC_ZOMBMASK)
|
2001-04-24 00:51:53 +00:00
|
|
|
np = zpfind(pid);
|
|
|
|
else {
|
|
|
|
if (pid == 0)
|
|
|
|
return (0);
|
|
|
|
np = pfind(pid);
|
|
|
|
}
|
|
|
|
if (np == NULL)
|
1996-06-06 17:19:21 +00:00
|
|
|
return EAGAIN;
|
2001-04-24 00:51:53 +00:00
|
|
|
if (np != p) {
|
|
|
|
PROC_UNLOCK(np);
|
1996-06-06 17:19:21 +00:00
|
|
|
return EAGAIN;
|
2001-04-24 00:51:53 +00:00
|
|
|
}
|
|
|
|
PROC_UNLOCK(np);
|
1996-06-06 17:19:21 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
1995-11-14 09:16:27 +00:00
|
|
|
static int
|
2000-07-04 11:25:35 +00:00
|
|
|
sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
|
1995-11-14 09:16:27 +00:00
|
|
|
{
|
|
|
|
int *name = (int*) arg1;
|
|
|
|
u_int namelen = arg2;
|
|
|
|
struct proc *p;
|
2004-02-22 17:54:32 +00:00
|
|
|
int flags, doingzomb, oid_number;
|
1995-11-14 09:16:27 +00:00
|
|
|
int error = 0;
|
|
|
|
|
2004-02-22 17:54:32 +00:00
|
|
|
oid_number = oidp->oid_number;
|
|
|
|
if (oid_number != KERN_PROC_ALL &&
|
|
|
|
(oid_number & KERN_PROC_INC_THREAD) == 0)
|
|
|
|
flags = KERN_PROC_NOTHREADS;
|
|
|
|
else {
|
|
|
|
flags = 0;
|
|
|
|
oid_number &= ~KERN_PROC_INC_THREAD;
|
|
|
|
}
|
|
|
|
if (oid_number == KERN_PROC_PID) {
|
1996-06-06 17:19:21 +00:00
|
|
|
if (namelen != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
p = pfind((pid_t)name[0]);
|
|
|
|
if (!p)
|
2003-07-17 22:44:41 +00:00
|
|
|
return (ESRCH);
|
|
|
|
if ((error = p_cansee(curthread, p))) {
|
2001-04-24 00:51:53 +00:00
|
|
|
PROC_UNLOCK(p);
|
2003-07-17 22:44:41 +00:00
|
|
|
return (error);
|
2001-04-24 00:51:53 +00:00
|
|
|
}
|
2004-02-22 17:54:32 +00:00
|
|
|
error = sysctl_out_proc(p, req, flags);
|
1996-06-06 17:19:21 +00:00
|
|
|
return (error);
|
|
|
|
}
|
2003-09-19 14:16:50 +00:00
|
|
|
|
2004-02-22 17:54:32 +00:00
|
|
|
switch (oid_number) {
|
2003-09-19 14:16:50 +00:00
|
|
|
case KERN_PROC_ALL:
|
|
|
|
if (namelen != 0)
|
|
|
|
return (EINVAL);
|
|
|
|
break;
|
2003-10-15 03:11:46 +00:00
|
|
|
case KERN_PROC_PROC:
|
|
|
|
if (namelen != 0 && namelen != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
break;
|
2003-09-19 14:16:50 +00:00
|
|
|
default:
|
|
|
|
if (namelen != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
break;
|
|
|
|
}
|
1996-06-06 17:19:21 +00:00
|
|
|
|
1995-11-14 09:16:27 +00:00
|
|
|
if (!req->oldptr) {
|
1996-06-06 17:19:21 +00:00
|
|
|
/* overestimate by 5 procs */
|
1995-11-14 09:16:27 +00:00
|
|
|
error = SYSCTL_OUT(req, 0, sizeof (struct kinfo_proc) * 5);
|
|
|
|
if (error)
|
|
|
|
return (error);
|
|
|
|
}
|
2004-02-26 00:27:04 +00:00
|
|
|
error = sysctl_wire_old_buffer(req, 0);
|
|
|
|
if (error != 0)
|
|
|
|
return (error);
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_slock(&allproc_lock);
|
1996-06-06 17:19:21 +00:00
|
|
|
for (doingzomb=0 ; doingzomb < 2 ; doingzomb++) {
|
|
|
|
if (!doingzomb)
|
1999-11-16 16:28:58 +00:00
|
|
|
p = LIST_FIRST(&allproc);
|
1996-06-06 17:19:21 +00:00
|
|
|
else
|
1999-11-16 16:28:58 +00:00
|
|
|
p = LIST_FIRST(&zombproc);
|
|
|
|
for (; p != 0; p = LIST_NEXT(p, p_list)) {
|
2000-08-23 21:41:25 +00:00
|
|
|
/*
|
2003-04-18 20:17:05 +00:00
|
|
|
* Skip embryonic processes.
|
2000-08-23 21:41:25 +00:00
|
|
|
*/
|
2003-04-18 20:17:05 +00:00
|
|
|
mtx_lock_spin(&sched_lock);
|
|
|
|
if (p->p_state == PRS_NEW) {
|
|
|
|
mtx_unlock_spin(&sched_lock);
|
2000-08-23 21:41:25 +00:00
|
|
|
continue;
|
2002-04-09 20:10:46 +00:00
|
|
|
}
|
2003-04-18 20:17:05 +00:00
|
|
|
mtx_unlock_spin(&sched_lock);
|
|
|
|
PROC_LOCK(p);
|
1996-06-06 17:19:21 +00:00
|
|
|
/*
|
2003-04-18 20:17:05 +00:00
|
|
|
* Show a user only appropriate processes.
|
1996-06-06 17:19:21 +00:00
|
|
|
*/
|
2003-04-18 20:17:05 +00:00
|
|
|
if (p_cansee(curthread, p)) {
|
2002-04-09 20:10:46 +00:00
|
|
|
PROC_UNLOCK(p);
|
1995-11-14 09:16:27 +00:00
|
|
|
continue;
|
2002-04-09 20:10:46 +00:00
|
|
|
}
|
1996-06-06 17:19:21 +00:00
|
|
|
/*
|
|
|
|
* TODO - make more efficient (see notes below).
|
|
|
|
* do by session.
|
|
|
|
*/
|
2004-02-22 17:54:32 +00:00
|
|
|
switch (oid_number) {
|
1996-06-06 17:19:21 +00:00
|
|
|
|
|
|
|
case KERN_PROC_PGRP:
|
|
|
|
/* could do this by traversing pgrp */
|
|
|
|
if (p->p_pgrp == NULL ||
|
2002-02-23 11:12:57 +00:00
|
|
|
p->p_pgrp->pg_id != (pid_t)name[0]) {
|
|
|
|
PROC_UNLOCK(p);
|
1996-06-06 17:19:21 +00:00
|
|
|
continue;
|
2002-02-23 11:12:57 +00:00
|
|
|
}
|
1996-06-06 17:19:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case KERN_PROC_TTY:
|
|
|
|
if ((p->p_flag & P_CONTROLT) == 0 ||
|
2002-02-23 11:12:57 +00:00
|
|
|
p->p_session == NULL) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
SESS_LOCK(p->p_session);
|
|
|
|
if (p->p_session->s_ttyp == NULL ||
|
1999-07-17 20:29:10 +00:00
|
|
|
dev2udev(p->p_session->s_ttyp->t_dev) !=
|
2002-02-23 11:12:57 +00:00
|
|
|
(udev_t)name[0]) {
|
|
|
|
SESS_UNLOCK(p->p_session);
|
|
|
|
PROC_UNLOCK(p);
|
1996-06-06 17:19:21 +00:00
|
|
|
continue;
|
2002-02-23 11:12:57 +00:00
|
|
|
}
|
|
|
|
SESS_UNLOCK(p->p_session);
|
1996-06-06 17:19:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case KERN_PROC_UID:
|
|
|
|
if (p->p_ucred == NULL ||
|
2002-04-09 20:10:46 +00:00
|
|
|
p->p_ucred->cr_uid != (uid_t)name[0]) {
|
|
|
|
PROC_UNLOCK(p);
|
1996-06-06 17:19:21 +00:00
|
|
|
continue;
|
2002-04-09 20:10:46 +00:00
|
|
|
}
|
1996-06-06 17:19:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case KERN_PROC_RUID:
|
|
|
|
if (p->p_ucred == NULL ||
|
2002-04-09 20:10:46 +00:00
|
|
|
p->p_ucred->cr_ruid != (uid_t)name[0]) {
|
|
|
|
PROC_UNLOCK(p);
|
1996-06-06 17:19:21 +00:00
|
|
|
continue;
|
2002-04-09 20:10:46 +00:00
|
|
|
}
|
1996-06-06 17:19:21 +00:00
|
|
|
break;
|
2003-06-12 16:41:50 +00:00
|
|
|
|
|
|
|
case KERN_PROC_PROC:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
|
1996-06-06 17:19:21 +00:00
|
|
|
}
|
1995-11-14 09:16:27 +00:00
|
|
|
|
2003-06-12 16:41:50 +00:00
|
|
|
error = sysctl_out_proc(p, req, flags | doingzomb);
|
2000-11-22 07:42:04 +00:00
|
|
|
if (error) {
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_sunlock(&allproc_lock);
|
1996-06-06 17:19:21 +00:00
|
|
|
return (error);
|
2000-11-22 07:42:04 +00:00
|
|
|
}
|
1995-11-14 09:16:27 +00:00
|
|
|
}
|
|
|
|
}
|
2001-03-28 11:52:56 +00:00
|
|
|
sx_sunlock(&allproc_lock);
|
1995-11-14 09:16:27 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2002-03-28 18:12:27 +00:00
|
|
|
struct pargs *
|
|
|
|
pargs_alloc(int len)
|
|
|
|
{
|
|
|
|
struct pargs *pa;
|
|
|
|
|
|
|
|
MALLOC(pa, struct pargs *, sizeof(struct pargs) + len, M_PARGS,
|
2003-02-19 05:47:46 +00:00
|
|
|
M_WAITOK);
|
2002-03-28 18:12:27 +00:00
|
|
|
pa->ar_ref = 1;
|
|
|
|
pa->ar_length = len;
|
|
|
|
return (pa);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
pargs_free(struct pargs *pa)
|
|
|
|
{
|
|
|
|
|
|
|
|
FREE(pa, M_PARGS);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
pargs_hold(struct pargs *pa)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (pa == NULL)
|
|
|
|
return;
|
|
|
|
PARGS_LOCK(pa);
|
|
|
|
pa->ar_ref++;
|
|
|
|
PARGS_UNLOCK(pa);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
pargs_drop(struct pargs *pa)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (pa == NULL)
|
|
|
|
return;
|
|
|
|
PARGS_LOCK(pa);
|
|
|
|
if (--pa->ar_ref == 0) {
|
|
|
|
PARGS_UNLOCK(pa);
|
|
|
|
pargs_free(pa);
|
|
|
|
} else
|
|
|
|
PARGS_UNLOCK(pa);
|
|
|
|
}
|
|
|
|
|
1999-11-16 20:31:58 +00:00
|
|
|
/*
|
|
|
|
* This sysctl allows a process to retrieve the argument list or process
|
|
|
|
* title for another process without groping around in the address space
|
|
|
|
* of the other process. It also allow a process to set its own "process
|
|
|
|
* title to a string of its own choice.
|
|
|
|
*/
|
|
|
|
static int
|
2000-07-04 11:25:35 +00:00
|
|
|
sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
|
1999-11-16 20:31:58 +00:00
|
|
|
{
|
|
|
|
int *name = (int*) arg1;
|
|
|
|
u_int namelen = arg2;
|
2003-03-12 20:17:40 +00:00
|
|
|
struct pargs *newpa, *pa;
|
1999-11-16 20:31:58 +00:00
|
|
|
struct proc *p;
|
|
|
|
int error = 0;
|
|
|
|
|
|
|
|
if (namelen != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
p = pfind((pid_t)name[0]);
|
|
|
|
if (!p)
|
2003-07-17 22:44:41 +00:00
|
|
|
return (ESRCH);
|
1999-11-16 20:31:58 +00:00
|
|
|
|
2004-03-17 13:19:43 +00:00
|
|
|
if ((error = p_cansee(curthread, p)) != 0) {
|
2001-04-24 00:51:53 +00:00
|
|
|
PROC_UNLOCK(p);
|
2003-07-17 22:44:41 +00:00
|
|
|
return (error);
|
2001-04-24 00:51:53 +00:00
|
|
|
}
|
1999-11-16 20:31:58 +00:00
|
|
|
|
2003-03-12 16:14:55 +00:00
|
|
|
if (req->newptr && curproc != p) {
|
|
|
|
PROC_UNLOCK(p);
|
1999-11-16 20:31:58 +00:00
|
|
|
return (EPERM);
|
2003-03-12 16:14:55 +00:00
|
|
|
}
|
1999-11-16 20:31:58 +00:00
|
|
|
|
2002-03-31 10:33:12 +00:00
|
|
|
pa = p->p_args;
|
|
|
|
pargs_hold(pa);
|
|
|
|
PROC_UNLOCK(p);
|
2003-03-12 20:17:40 +00:00
|
|
|
if (req->oldptr != NULL && pa != NULL)
|
2002-03-31 10:33:12 +00:00
|
|
|
error = SYSCTL_OUT(req, pa->ar_args, pa->ar_length);
|
2002-06-22 10:05:50 +00:00
|
|
|
pargs_drop(pa);
|
2003-03-12 20:17:40 +00:00
|
|
|
if (error != 0 || req->newptr == NULL)
|
1999-11-16 20:31:58 +00:00
|
|
|
return (error);
|
|
|
|
|
2003-03-12 16:14:55 +00:00
|
|
|
if (req->newlen + sizeof(struct pargs) > ps_arg_cache_limit)
|
2003-03-12 20:17:40 +00:00
|
|
|
return (ENOMEM);
|
2003-03-12 16:14:55 +00:00
|
|
|
newpa = pargs_alloc(req->newlen);
|
|
|
|
error = SYSCTL_IN(req, newpa->ar_args, req->newlen);
|
2003-03-12 20:17:40 +00:00
|
|
|
if (error != 0) {
|
2003-03-12 16:14:55 +00:00
|
|
|
pargs_free(newpa);
|
|
|
|
return (error);
|
|
|
|
}
|
2001-04-24 00:51:53 +00:00
|
|
|
PROC_LOCK(p);
|
2001-06-20 23:10:06 +00:00
|
|
|
pa = p->p_args;
|
2003-03-12 16:14:55 +00:00
|
|
|
p->p_args = newpa;
|
2001-03-07 03:28:50 +00:00
|
|
|
PROC_UNLOCK(p);
|
2002-03-27 21:36:18 +00:00
|
|
|
pargs_drop(pa);
|
2003-03-12 16:14:55 +00:00
|
|
|
return (0);
|
1999-11-16 20:31:58 +00:00
|
|
|
}
|
1996-06-06 17:19:21 +00:00
|
|
|
|
2003-07-12 02:00:16 +00:00
|
|
|
static int
|
|
|
|
sysctl_kern_proc_sv_name(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
char *sv_name;
|
|
|
|
int *name;
|
|
|
|
int namelen;
|
2003-07-17 22:44:41 +00:00
|
|
|
int error;
|
2003-07-12 02:00:16 +00:00
|
|
|
|
|
|
|
namelen = arg2;
|
|
|
|
if (namelen != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
|
|
|
|
name = (int *)arg1;
|
|
|
|
if ((p = pfind((pid_t)name[0])) == NULL)
|
2003-07-17 22:44:41 +00:00
|
|
|
return (ESRCH);
|
|
|
|
if ((error = p_cansee(curthread, p))) {
|
2003-07-12 02:00:16 +00:00
|
|
|
PROC_UNLOCK(p);
|
2003-07-17 22:44:41 +00:00
|
|
|
return (error);
|
2003-07-12 02:00:16 +00:00
|
|
|
}
|
|
|
|
sv_name = p->p_sysent->sv_name;
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (sysctl_handle_string(oidp, sv_name, 0, req));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1996-06-06 17:19:21 +00:00
|
|
|
SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT,
|
1999-05-03 23:57:32 +00:00
|
|
|
0, 0, sysctl_kern_proc, "S,proc", "Return entire process table");
|
1996-06-06 17:19:21 +00:00
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, CTLFLAG_RD,
|
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD,
|
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD,
|
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, CTLFLAG_RD,
|
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD,
|
1995-11-14 09:16:27 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
1999-11-16 20:31:58 +00:00
|
|
|
|
2003-06-12 16:41:50 +00:00
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, CTLFLAG_RD,
|
|
|
|
sysctl_kern_proc, "Return process table, no threads");
|
|
|
|
|
2000-02-08 19:54:15 +00:00
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_ARGS, args, CTLFLAG_RW | CTLFLAG_ANYBODY,
|
|
|
|
sysctl_kern_proc_args, "Process argument list");
|
2003-07-12 02:00:16 +00:00
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, KERN_PROC_SV_NAME, sv_name, CTLFLAG_RD,
|
|
|
|
sysctl_kern_proc_sv_name, "Process syscall vector name (ABI type)");
|
2004-02-22 17:54:32 +00:00
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, (KERN_PROC_PGRP | KERN_PROC_INC_THREAD), pgrp_td,
|
|
|
|
CTLFLAG_RD, sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, (KERN_PROC_TTY | KERN_PROC_INC_THREAD), tty_td,
|
|
|
|
CTLFLAG_RD, sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, (KERN_PROC_UID | KERN_PROC_INC_THREAD), uid_td,
|
|
|
|
CTLFLAG_RD, sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, (KERN_PROC_RUID | KERN_PROC_INC_THREAD), ruid_td,
|
|
|
|
CTLFLAG_RD, sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, (KERN_PROC_PID | KERN_PROC_INC_THREAD), pid_td,
|
|
|
|
CTLFLAG_RD, sysctl_kern_proc, "Process table");
|
|
|
|
|
|
|
|
SYSCTL_NODE(_kern_proc, (KERN_PROC_PROC | KERN_PROC_INC_THREAD), proc_td,
|
|
|
|
CTLFLAG_RD, sysctl_kern_proc, "Return process table, no threads");
|