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.
|
|
|
|
*
|
|
|
|
* 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
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
|
2003-06-11 00:56:59 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2008-12-02 06:50:26 +00:00
|
|
|
#include "opt_compat.h"
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
#include "opt_ddb.h"
|
2008-05-24 06:22:16 +00:00
|
|
|
#include "opt_kdtrace.h"
|
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"
|
2007-12-02 21:52:18 +00:00
|
|
|
#include "opt_stack.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>
|
2010-04-21 19:32:00 +00:00
|
|
|
#include <sys/limits.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
#include <sys/lock.h>
|
2011-03-05 14:41:49 +00:00
|
|
|
#include <sys/loginclass.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/malloc.h>
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
#include <sys/mount.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>
|
2005-09-27 18:03:15 +00:00
|
|
|
#include <sys/refcount.h>
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
#include <sys/sbuf.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>
|
2007-12-02 21:52:18 +00:00
|
|
|
#include <sys/stack.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>
|
2008-05-24 06:22:16 +00:00
|
|
|
#include <sys/sdt.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>
|
2005-04-18 02:10:37 +00:00
|
|
|
#include <sys/vnode.h>
|
2007-11-15 13:28:54 +00:00
|
|
|
#include <sys/eventhandler.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
#ifdef DDB
|
|
|
|
#include <ddb/ddb.h>
|
|
|
|
#endif
|
|
|
|
|
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>
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
#include <vm/vm_object.h>
|
2002-03-20 04:09:59 +00:00
|
|
|
#include <vm/uma.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
|
2010-04-21 19:32:00 +00:00
|
|
|
#ifdef COMPAT_FREEBSD32
|
|
|
|
#include <compat/freebsd32/freebsd32.h>
|
|
|
|
#include <compat/freebsd32/freebsd32_util.h>
|
|
|
|
#endif
|
|
|
|
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROVIDER_DEFINE(proc);
|
2010-08-22 11:18:57 +00:00
|
|
|
SDT_PROBE_DEFINE(proc, kernel, ctor, entry, entry);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 0, "struct proc *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 1, "int");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 2, "void *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 3, "int");
|
2010-08-22 11:18:57 +00:00
|
|
|
SDT_PROBE_DEFINE(proc, kernel, ctor, return, return);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 0, "struct proc *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 1, "int");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 2, "void *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 3, "int");
|
2010-08-22 11:18:57 +00:00
|
|
|
SDT_PROBE_DEFINE(proc, kernel, dtor, entry, entry);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 0, "struct proc *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 1, "int");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 2, "void *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 3, "struct thread *");
|
2010-08-22 11:18:57 +00:00
|
|
|
SDT_PROBE_DEFINE(proc, kernel, dtor, return, return);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, dtor, return, 0, "struct proc *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, dtor, return, 1, "int");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, dtor, return, 2, "void *");
|
2010-08-22 11:18:57 +00:00
|
|
|
SDT_PROBE_DEFINE(proc, kernel, init, entry, entry);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, init, entry, 0, "struct proc *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, init, entry, 1, "int");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, init, entry, 2, "int");
|
2010-08-22 11:18:57 +00:00
|
|
|
SDT_PROBE_DEFINE(proc, kernel, init, return, return);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, init, return, 0, "struct proc *");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, init, return, 1, "int");
|
|
|
|
SDT_PROBE_ARGTYPE(proc, kernel, init, return, 2, "int");
|
|
|
|
|
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);
|
2009-02-18 21:52:13 +00:00
|
|
|
static void fill_kinfo_aggregate(struct proc *p, struct kinfo_proc *kp);
|
2005-10-02 23:27:56 +00:00
|
|
|
static void fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp);
|
2008-01-10 22:11:20 +00:00
|
|
|
static void fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp,
|
|
|
|
int preferthread);
|
2003-04-18 20:17:05 +00:00
|
|
|
static void pgadjustjobc(struct pgrp *pgrp, int entering);
|
|
|
|
static void pgdelete(struct pgrp *);
|
2004-08-02 00:18:36 +00:00
|
|
|
static int proc_ctor(void *mem, int size, void *arg, int flags);
|
2002-07-07 23:05:27 +00:00
|
|
|
static void proc_dtor(void *mem, int size, void *arg);
|
2004-08-02 00:18:36 +00:00
|
|
|
static int proc_init(void *mem, int size, int flags);
|
2002-07-07 23:05:27 +00:00
|
|
|
static void proc_fini(void *mem, int size);
|
2008-07-25 11:55:32 +00:00
|
|
|
static void pargs_free(struct pargs *pa);
|
2002-07-07 23:05:27 +00:00
|
|
|
|
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-10-15 00:14:32 +00:00
|
|
|
struct mtx ppeers_lock;
|
2002-03-20 04:09:59 +00:00
|
|
|
uma_zone_t proc_zone;
|
1996-03-11 06:05:03 +00:00
|
|
|
|
2002-09-07 22:11:45 +00:00
|
|
|
int kstack_pages = KSTACK_PAGES;
|
2010-11-14 08:06:29 +00:00
|
|
|
SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0,
|
2010-11-14 16:10:15 +00:00
|
|
|
"Kernel stack size in pages");
|
2002-09-07 22:11:45 +00:00
|
|
|
|
2002-04-06 08:13:52 +00:00
|
|
|
CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE);
|
2010-04-24 12:49:52 +00:00
|
|
|
#ifdef COMPAT_FREEBSD32
|
|
|
|
CTASSERT(sizeof(struct kinfo_proc32) == KINFO_PROC32_SIZE);
|
|
|
|
#endif
|
2002-04-06 08:13:52 +00:00
|
|
|
|
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-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.
|
|
|
|
*/
|
2004-08-02 00:18:36 +00:00
|
|
|
static int
|
|
|
|
proc_ctor(void *mem, int size, void *arg, int flags)
|
2002-07-07 23:05:27 +00:00
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
|
|
|
|
p = (struct proc *)mem;
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE(proc, kernel, ctor , entry, p, size, arg, flags, 0);
|
2007-11-15 13:28:54 +00:00
|
|
|
EVENTHANDLER_INVOKE(process_ctor, p);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE(proc, kernel, ctor , return, p, size, arg, flags, 0);
|
2004-08-02 00:18:36 +00:00
|
|
|
return (0);
|
2002-07-07 23:05:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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;
|
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;
|
2007-11-15 13:28:54 +00:00
|
|
|
td = FIRST_THREAD_IN_PROC(p);
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE(proc, kernel, dtor, entry, p, size, arg, td, 0);
|
2007-11-05 11:36:16 +00:00
|
|
|
if (td != NULL) {
|
2004-09-05 02:09:54 +00:00
|
|
|
#ifdef INVARIANTS
|
2007-11-05 11:36:16 +00:00
|
|
|
KASSERT((p->p_numthreads == 1),
|
|
|
|
("bad number of threads in exiting process"));
|
|
|
|
KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr"));
|
2004-09-05 02:09:54 +00:00
|
|
|
#endif
|
Update ZFS from version 6 to 13 and bring some FreeBSD-specific changes.
This bring huge amount of changes, I'll enumerate only user-visible changes:
- Delegated Administration
Allows regular users to perform ZFS operations, like file system
creation, snapshot creation, etc.
- L2ARC
Level 2 cache for ZFS - allows to use additional disks for cache.
Huge performance improvements mostly for random read of mostly
static content.
- slog
Allow to use additional disks for ZFS Intent Log to speed up
operations like fsync(2).
- vfs.zfs.super_owner
Allows regular users to perform privileged operations on files stored
on ZFS file systems owned by him. Very careful with this one.
- chflags(2)
Not all the flags are supported. This still needs work.
- ZFSBoot
Support to boot off of ZFS pool. Not finished, AFAIK.
Submitted by: dfr
- Snapshot properties
- New failure modes
Before if write requested failed, system paniced. Now one
can select from one of three failure modes:
- panic - panic on write error
- wait - wait for disk to reappear
- continue - serve read requests if possible, block write requests
- Refquota, refreservation properties
Just quota and reservation properties, but don't count space consumed
by children file systems, clones and snapshots.
- Sparse volumes
ZVOLs that don't reserve space in the pool.
- External attributes
Compatible with extattr(2).
- NFSv4-ACLs
Not sure about the status, might not be complete yet.
Submitted by: trasz
- Creation-time properties
- Regression tests for zpool(8) command.
Obtained from: OpenSolaris
2008-11-17 20:49:29 +00:00
|
|
|
/* Free all OSD associated to this thread. */
|
|
|
|
osd_thread_exit(td);
|
2007-11-05 11:36:16 +00:00
|
|
|
}
|
2007-11-15 13:28:54 +00:00
|
|
|
EVENTHANDLER_INVOKE(process_dtor, p);
|
2005-11-08 09:09:26 +00:00
|
|
|
if (p->p_ksi != NULL)
|
|
|
|
KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue"));
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE(proc, kernel, dtor, return, p, size, arg, 0, 0);
|
2002-07-07 23:05:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize type-stable parts of a proc (when newly created).
|
|
|
|
*/
|
2004-08-02 00:18:36 +00:00
|
|
|
static int
|
|
|
|
proc_init(void *mem, int size, int flags)
|
2002-07-07 23:05:27 +00:00
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
|
|
|
|
p = (struct proc *)mem;
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE(proc, kernel, init, entry, p, size, flags, 0, 0);
|
2002-11-21 01:22:38 +00:00
|
|
|
p->p_sched = (struct p_sched *)&p[1];
|
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);
|
Commit 14/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.
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-05 00:00:57 +00:00
|
|
|
mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN | MTX_RECURSE);
|
2008-12-05 20:50:24 +00:00
|
|
|
cv_init(&p->p_pwait, "ppwait");
|
2011-01-25 10:59:21 +00:00
|
|
|
cv_init(&p->p_dbgwait, "dbgwait");
|
2007-11-05 11:36:16 +00:00
|
|
|
TAILQ_INIT(&p->p_threads); /* all threads in proc */
|
2007-11-15 13:28:54 +00:00
|
|
|
EVENTHANDLER_INVOKE(process_init, p);
|
2004-11-20 02:28:48 +00:00
|
|
|
p->p_stats = pstats_alloc();
|
2008-05-24 06:22:16 +00:00
|
|
|
SDT_PROBE(proc, kernel, init, return, p, size, flags, 0, 0);
|
2004-08-02 00:18:36 +00:00
|
|
|
return (0);
|
2002-07-07 23:05:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2004-09-19 18:34:17 +00:00
|
|
|
* UMA should ensure that this function is never called.
|
|
|
|
* Freeing a proc structure would violate type stability.
|
2002-07-07 23:05:27 +00:00
|
|
|
*/
|
|
|
|
static void
|
|
|
|
proc_fini(void *mem, int size)
|
|
|
|
{
|
2005-10-24 20:15:23 +00:00
|
|
|
#ifdef notnow
|
|
|
|
struct proc *p;
|
2002-07-07 23:05:27 +00:00
|
|
|
|
2005-10-24 20:15:23 +00:00
|
|
|
p = (struct proc *)mem;
|
2007-11-15 13:28:54 +00:00
|
|
|
EVENTHANDLER_INVOKE(process_fini, p);
|
2005-10-24 20:15:23 +00:00
|
|
|
pstats_free(p->p_stats);
|
|
|
|
thread_free(FIRST_THREAD_IN_PROC(p));
|
|
|
|
mtx_destroy(&p->p_mtx);
|
2005-11-08 09:09:26 +00:00
|
|
|
if (p->p_ksi != NULL)
|
|
|
|
ksiginfo_free(p->p_ksi);
|
2005-10-24 20:15:23 +00:00
|
|
|
#else
|
2004-09-19 18:34:17 +00:00
|
|
|
panic("proc reclaimed");
|
2005-10-24 20:15:23 +00:00
|
|
|
#endif
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2004-08-14 17:15:16 +00:00
|
|
|
* Locate a process by number; return only "live" processes -- i.e., neither
|
|
|
|
* zombies nor newly born but incompletely initialized processes. By not
|
|
|
|
* returning processes in the PRS_NEW state, we allow callers to avoid
|
|
|
|
* testing for that condition to avoid dereferencing p_ucred, et al.
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
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) {
|
2011-03-24 18:40:11 +00:00
|
|
|
PROC_LOCK(p);
|
2004-08-14 17:15:16 +00:00
|
|
|
if (p->p_state == PRS_NEW) {
|
2011-03-24 18:40:11 +00:00
|
|
|
PROC_UNLOCK(p);
|
2004-08-14 17:15:16 +00:00
|
|
|
p = NULL;
|
|
|
|
}
|
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;
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
refcount_init(&sess->s_count, 1);
|
2002-02-23 11:12:57 +00:00
|
|
|
sess->s_ttyvp = NULL;
|
Let access overriding to TTYs depend on the cdev_priv, not the vnode.
Basically this commit changes two things, which improves access to TTYs
in exceptional conditions. Basically the problem was that when you ran
jexec(8) to attach to a jail, you couldn't use /dev/tty (well, also the
node of the actual TTY, e.g. /dev/pts/X). This is very inconvenient if
you want to attach to screens quickly, use ssh(1), etc.
The fixes:
- Cache the cdev_priv of the controlling TTY in struct session. Change
devfs_access() to compare against the cdev_priv instead of the vnode.
This allows you to bypass UNIX permissions, even across different
mounts of devfs.
- Extend devfs_prison_check() to unconditionally expose the device node
of the controlling TTY, even if normal prison nesting rules normally
don't allow this. This actually allows you to interact with this
device node.
To be honest, I'm not really happy with this solution. We now have to
store three pointers to a controlling TTY (s_ttyp, s_ttyvp, s_ttydp).
In an ideal world, we should just get rid of the latter two and only use
s_ttyp, but this makes certian pieces of code very impractical (e.g.
devfs, kern_exit.c).
Reported by: Many people
2009-12-19 18:42:12 +00:00
|
|
|
sess->s_ttydp = NULL;
|
2002-02-23 11:12:57 +00:00
|
|
|
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;
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
sess_hold(pgrp->pg_session);
|
2002-02-23 11:12:57 +00:00
|
|
|
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;
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
struct tty *tp;
|
2002-02-23 11:12:57 +00:00
|
|
|
|
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);
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
tp = pgrp->pg_session->s_ttyp;
|
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;
|
|
|
|
PGRP_UNLOCK(pgrp);
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
|
|
|
|
/* Remove the reference to the pgrp before deallocating it. */
|
|
|
|
if (tp != NULL) {
|
|
|
|
tty_lock(tp);
|
|
|
|
tty_rel_pgrp(tp, pgrp);
|
|
|
|
}
|
|
|
|
|
2002-05-03 07:46:59 +00:00
|
|
|
mtx_destroy(&pgrp->pg_mtx);
|
2008-10-23 15:53:51 +00:00
|
|
|
free(pgrp, M_PGRP);
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
sess_release(savesess);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-17 08:44:41 +00:00
|
|
|
void
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
sess_hold(struct session *s)
|
2005-03-17 08:44:41 +00:00
|
|
|
{
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
|
|
|
|
refcount_acquire(&s->s_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
sess_release(struct session *s)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (refcount_release(&s->s_count)) {
|
|
|
|
if (s->s_ttyp != NULL) {
|
|
|
|
tty_lock(s->s_ttyp);
|
|
|
|
tty_rel_sess(s->s_ttyp, s);
|
|
|
|
}
|
2005-03-17 08:44:41 +00:00
|
|
|
mtx_destroy(&s->s_mtx);
|
2008-10-23 15:53:51 +00:00
|
|
|
free(s, M_SESSION);
|
2005-03-17 08:44:41 +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 */
|
1995-11-14 09:16:27 +00:00
|
|
|
|
2009-02-18 21:52:13 +00:00
|
|
|
/*
|
|
|
|
* Calculate the kinfo_proc members which contain process-wide
|
|
|
|
* informations.
|
|
|
|
* Must be called with the target process locked.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
fill_kinfo_aggregate(struct proc *p, struct kinfo_proc *kp)
|
|
|
|
{
|
|
|
|
struct thread *td;
|
|
|
|
|
|
|
|
PROC_LOCK_ASSERT(p, MA_OWNED);
|
|
|
|
|
|
|
|
kp->ki_estcpu = 0;
|
|
|
|
kp->ki_pctcpu = 0;
|
|
|
|
FOREACH_THREAD_IN_PROC(p, td) {
|
|
|
|
thread_lock(td);
|
|
|
|
kp->ki_pctcpu += sched_pctcpu(td);
|
|
|
|
kp->ki_estcpu += td->td_estcpu;
|
|
|
|
thread_unlock(td);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1995-11-14 09:16:27 +00:00
|
|
|
/*
|
2005-10-02 23:27:56 +00:00
|
|
|
* Clear kinfo_proc and fill in any information that is common
|
|
|
|
* to all threads in the 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
|
|
|
*/
|
2005-10-02 23:27:56 +00:00
|
|
|
static void
|
|
|
|
fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
|
2003-06-12 16:41:50 +00:00
|
|
|
{
|
2003-03-31 22:49:17 +00:00
|
|
|
struct thread *td0;
|
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;
|
2005-03-12 14:28:34 +00:00
|
|
|
struct ucred *cred;
|
- 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
|
|
|
|
2008-03-19 06:19:01 +00:00
|
|
|
PROC_LOCK_ASSERT(p, MA_OWNED);
|
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;
|
2008-03-12 10:12:01 +00:00
|
|
|
kp->ki_addr =/* p->p_addr; */0; /* XXX */
|
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
|
|
|
kp->ki_traceflag = p->p_traceflag;
|
|
|
|
#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;
|
2005-03-12 14:31:04 +00:00
|
|
|
kp->ki_flag = p->p_flag;
|
2005-03-12 14:28:34 +00:00
|
|
|
cred = p->p_ucred;
|
|
|
|
if (cred) {
|
|
|
|
kp->ki_uid = cred->cr_uid;
|
|
|
|
kp->ki_ruid = cred->cr_ruid;
|
|
|
|
kp->ki_svuid = cred->cr_svuid;
|
2011-03-01 13:23:37 +00:00
|
|
|
kp->ki_cr_flags = 0;
|
|
|
|
if (cred->cr_flags & CRED_FLAG_CAPMODE)
|
|
|
|
kp->ki_cr_flags |= KI_CRF_CAPABILITY_MODE;
|
2009-07-24 15:03:10 +00:00
|
|
|
/* XXX bde doesn't like KI_NGROUPS */
|
|
|
|
if (cred->cr_ngroups > KI_NGROUPS) {
|
|
|
|
kp->ki_ngroups = KI_NGROUPS;
|
|
|
|
kp->ki_cr_flags |= KI_CRF_GRP_OVERFLOW;
|
|
|
|
} else
|
|
|
|
kp->ki_ngroups = cred->cr_ngroups;
|
|
|
|
bcopy(cred->cr_groups, kp->ki_groups,
|
|
|
|
kp->ki_ngroups * sizeof(gid_t));
|
2005-03-12 14:28:34 +00:00
|
|
|
kp->ki_rgid = cred->cr_rgid;
|
|
|
|
kp->ki_svgid = cred->cr_svgid;
|
2005-03-12 14:31:04 +00:00
|
|
|
/* If jailed(cred), emulate the old P_JAILED flag. */
|
2005-03-20 10:35:23 +00:00
|
|
|
if (jailed(cred)) {
|
2005-03-12 14:31:04 +00:00
|
|
|
kp->ki_flag |= P_JAILED;
|
2009-05-27 14:11:23 +00:00
|
|
|
/* If inside the jail, use 0 as a jail ID. */
|
|
|
|
if (cred->cr_prison != curthread->td_ucred->cr_prison)
|
2005-03-20 10:35:23 +00:00
|
|
|
kp->ki_jid = cred->cr_prison->pr_id;
|
|
|
|
}
|
2011-03-05 14:41:49 +00:00
|
|
|
strlcpy(kp->ki_loginclass, cred->cr_loginclass->lc_name,
|
|
|
|
sizeof(kp->ki_loginclass));
|
1995-11-14 09:16:27 +00:00
|
|
|
}
|
2005-03-12 14:28:34 +00:00
|
|
|
ps = p->p_sigacts;
|
|
|
|
if (ps) {
|
- 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
|
|
|
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
|
|
|
}
|
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
|
|
|
FOREACH_THREAD_IN_PROC(p, td0) {
|
|
|
|
if (!TD_IS_SWAPPED(td0))
|
|
|
|
kp->ki_rssize += td0->td_kstack_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;
|
2005-10-02 23:27:56 +00:00
|
|
|
} else if (p->p_state == PRS_ZOMBIE)
|
|
|
|
kp->ki_stat = SZOMB;
|
2007-09-17 05:31:39 +00:00
|
|
|
if (kp->ki_flag & P_INMEM)
|
|
|
|
kp->ki_sflag = PS_INMEM;
|
|
|
|
else
|
|
|
|
kp->ki_sflag = 0;
|
2007-09-21 04:10:23 +00:00
|
|
|
/* Calculate legacy swtime as seconds since 'swtick'. */
|
|
|
|
kp->ki_swtime = (ticks - p->p_swtick) / hz;
|
2004-07-29 20:27:59 +00:00
|
|
|
kp->ki_pid = p->p_pid;
|
|
|
|
kp->ki_nice = p->p_nice;
|
2010-11-11 08:15:12 +00:00
|
|
|
kp->ki_start = p->p_stats->p_start;
|
|
|
|
timevaladd(&kp->ki_start, &boottime);
|
|
|
|
PROC_SLOCK(p);
|
2011-03-24 18:40:11 +00:00
|
|
|
rufetch(p, &kp->ki_rusage);
|
|
|
|
kp->ki_runtime = cputick2usec(p->p_rux.rux_runtime);
|
2010-11-11 08:15:12 +00:00
|
|
|
calcru(p, &kp->ki_rusage.ru_utime, &kp->ki_rusage.ru_stime);
|
|
|
|
PROC_SUNLOCK(p);
|
|
|
|
calccru(p, &kp->ki_childutime, &kp->ki_childstime);
|
2010-11-11 21:53:46 +00:00
|
|
|
/* Some callers want child times in a single value. */
|
2010-11-11 08:15:12 +00:00
|
|
|
kp->ki_childtime = kp->ki_childstime;
|
|
|
|
timevaladd(&kp->ki_childtime, &kp->ki_childutime);
|
2010-11-11 21:53:46 +00:00
|
|
|
|
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;
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
/* XXX proctree_lock */
|
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) {
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
kp->ki_tdev = tty_udev(tp);
|
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_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
|
2004-06-17 17:16:53 +00:00
|
|
|
kp->ki_tdev = NODEV;
|
2007-03-23 04:01:08 +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));
|
2004-06-19 14:03:00 +00:00
|
|
|
if (p->p_sysent && p->p_sysent->sv_name != NULL &&
|
|
|
|
p->p_sysent->sv_name[0] != '\0')
|
|
|
|
strlcpy(kp->ki_emul, p->p_sysent->sv_name, sizeof(kp->ki_emul));
|
2002-10-01 17:15:53 +00:00
|
|
|
kp->ki_siglist = p->p_siglist;
|
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_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
|
|
|
}
|
|
|
|
|
2005-10-02 23:27:56 +00:00
|
|
|
/*
|
2010-02-27 15:32:49 +00:00
|
|
|
* Fill in information that is thread specific. Must be called with
|
|
|
|
* target process locked. If 'preferthread' is set, overwrite certain
|
|
|
|
* process-related fields that are maintained for both threads and
|
|
|
|
* processes.
|
2005-10-02 23:27:56 +00:00
|
|
|
*/
|
|
|
|
static void
|
2008-01-10 22:11:20 +00:00
|
|
|
fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread)
|
2005-10-02 23:27:56 +00:00
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
|
|
|
|
p = td->td_proc;
|
2010-10-08 00:44:53 +00:00
|
|
|
kp->ki_tdaddr = td;
|
2008-03-19 06:19:01 +00:00
|
|
|
PROC_LOCK_ASSERT(p, MA_OWNED);
|
2005-10-02 23:27:56 +00:00
|
|
|
|
2011-07-18 17:33:08 +00:00
|
|
|
if (preferthread)
|
|
|
|
PROC_SLOCK(p);
|
Commit 14/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.
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-05 00:00:57 +00:00
|
|
|
thread_lock(td);
|
2005-10-02 23:27:56 +00:00
|
|
|
if (td->td_wmesg != NULL)
|
|
|
|
strlcpy(kp->ki_wmesg, td->td_wmesg, sizeof(kp->ki_wmesg));
|
|
|
|
else
|
|
|
|
bzero(kp->ki_wmesg, sizeof(kp->ki_wmesg));
|
2011-07-18 20:06:15 +00:00
|
|
|
strlcpy(kp->ki_tdname, td->td_name, sizeof(kp->ki_tdname));
|
2005-10-02 23:27:56 +00:00
|
|
|
if (TD_ON_LOCK(td)) {
|
|
|
|
kp->ki_kiflag |= KI_LOCKBLOCK;
|
|
|
|
strlcpy(kp->ki_lockname, td->td_lockname,
|
|
|
|
sizeof(kp->ki_lockname));
|
|
|
|
} else {
|
|
|
|
kp->ki_kiflag &= ~KI_LOCKBLOCK;
|
|
|
|
bzero(kp->ki_lockname, sizeof(kp->ki_lockname));
|
|
|
|
}
|
|
|
|
|
2008-03-12 10:12:01 +00:00
|
|
|
if (p->p_state == PRS_NORMAL) { /* approximate. */
|
2005-10-02 23:27:56 +00:00
|
|
|
if (TD_ON_RUNQ(td) ||
|
|
|
|
TD_CAN_RUN(td) ||
|
|
|
|
TD_IS_RUNNING(td)) {
|
|
|
|
kp->ki_stat = SRUN;
|
|
|
|
} else if (P_SHOULDSTOP(p)) {
|
|
|
|
kp->ki_stat = SSTOP;
|
|
|
|
} else if (TD_IS_SLEEPING(td)) {
|
|
|
|
kp->ki_stat = SSLEEP;
|
|
|
|
} else if (TD_ON_LOCK(td)) {
|
|
|
|
kp->ki_stat = SLOCK;
|
|
|
|
} else {
|
|
|
|
kp->ki_stat = SWAIT;
|
|
|
|
}
|
2005-12-29 13:00:42 +00:00
|
|
|
} else if (p->p_state == PRS_ZOMBIE) {
|
|
|
|
kp->ki_stat = SZOMB;
|
2005-10-02 23:27:56 +00:00
|
|
|
} else {
|
|
|
|
kp->ki_stat = SIDL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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_tid = td->td_tid;
|
|
|
|
kp->ki_numthreads = p->p_numthreads;
|
|
|
|
kp->ki_pcb = td->td_pcb;
|
|
|
|
kp->ki_kstack = (void *)td->td_kstack;
|
2007-09-21 04:10:23 +00:00
|
|
|
kp->ki_slptime = (ticks - td->td_slptick) / hz;
|
2006-10-26 21:42:22 +00:00
|
|
|
kp->ki_pri.pri_class = td->td_pri_class;
|
|
|
|
kp->ki_pri.pri_user = td->td_user_pri;
|
2005-10-02 23:27:56 +00:00
|
|
|
|
2009-02-18 21:52:13 +00:00
|
|
|
if (preferthread) {
|
2011-07-18 17:33:08 +00:00
|
|
|
rufetchtd(td, &kp->ki_rusage);
|
2010-05-05 16:05:51 +00:00
|
|
|
kp->ki_runtime = cputick2usec(td->td_rux.rux_runtime);
|
2009-02-18 21:52:13 +00:00
|
|
|
kp->ki_pctcpu = sched_pctcpu(td);
|
|
|
|
kp->ki_estcpu = td->td_estcpu;
|
|
|
|
}
|
2008-01-10 22:11:20 +00:00
|
|
|
|
2005-10-02 23:27:56 +00:00
|
|
|
/* We can't get this anymore but ps etc never used it anyway. */
|
|
|
|
kp->ki_rqindex = 0;
|
|
|
|
|
2010-02-27 15:32:49 +00:00
|
|
|
if (preferthread)
|
|
|
|
kp->ki_siglist = td->td_siglist;
|
2005-10-02 23:27:56 +00:00
|
|
|
kp->ki_sigmask = td->td_sigmask;
|
Commit 14/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.
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-05 00:00:57 +00:00
|
|
|
thread_unlock(td);
|
2011-07-18 17:33:08 +00:00
|
|
|
if (preferthread)
|
|
|
|
PROC_SUNLOCK(p);
|
2005-10-02 23:27:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fill in a kinfo_proc structure for the specified process.
|
|
|
|
* Must be called with the target process locked.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
fill_kinfo_proc(struct proc *p, struct kinfo_proc *kp)
|
|
|
|
{
|
|
|
|
|
2009-02-18 21:52:13 +00:00
|
|
|
MPASS(FIRST_THREAD_IN_PROC(p) != NULL);
|
|
|
|
|
2005-10-02 23:27:56 +00:00
|
|
|
fill_kinfo_proc_only(p, kp);
|
2009-02-18 21:52:13 +00:00
|
|
|
fill_kinfo_thread(FIRST_THREAD_IN_PROC(p), kp, 0);
|
|
|
|
fill_kinfo_aggregate(p, kp);
|
2005-10-02 23:27:56 +00:00
|
|
|
}
|
|
|
|
|
2004-11-20 02:28:48 +00:00
|
|
|
struct pstats *
|
|
|
|
pstats_alloc(void)
|
|
|
|
{
|
|
|
|
|
|
|
|
return (malloc(sizeof(struct pstats), M_SUBPROC, M_ZERO|M_WAITOK));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy parts of p_stats; zero the rest of p_stats (statistics).
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
pstats_fork(struct pstats *src, struct pstats *dst)
|
|
|
|
{
|
|
|
|
|
|
|
|
bzero(&dst->pstat_startzero,
|
2004-11-20 23:00:59 +00:00
|
|
|
__rangeof(struct pstats, pstat_startzero, pstat_endzero));
|
2004-11-20 02:28:48 +00:00
|
|
|
bcopy(&src->pstat_startcopy, &dst->pstat_startcopy,
|
2004-11-20 23:00:59 +00:00
|
|
|
__rangeof(struct pstats, pstat_startcopy, pstat_endcopy));
|
2004-11-20 02:28:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
pstats_free(struct pstats *ps)
|
|
|
|
{
|
|
|
|
|
|
|
|
free(ps, M_SUBPROC);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
2010-04-21 19:32:00 +00:00
|
|
|
#ifdef COMPAT_FREEBSD32
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This function is typically used to copy out the kernel address, so
|
|
|
|
* it can be replaced by assignment of zero.
|
|
|
|
*/
|
|
|
|
static inline uint32_t
|
|
|
|
ptr32_trim(void *ptr)
|
|
|
|
{
|
|
|
|
uintptr_t uptr;
|
|
|
|
|
|
|
|
uptr = (uintptr_t)ptr;
|
|
|
|
return ((uptr > UINT_MAX) ? 0 : uptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define PTRTRIM_CP(src,dst,fld) \
|
|
|
|
do { (dst).fld = ptr32_trim((src).fld); } while (0)
|
|
|
|
|
|
|
|
static void
|
|
|
|
freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
bzero(ki32, sizeof(struct kinfo_proc32));
|
|
|
|
ki32->ki_structsize = sizeof(struct kinfo_proc32);
|
|
|
|
CP(*ki, *ki32, ki_layout);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_args);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_paddr);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_addr);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_tracep);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_textvp);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_fd);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_vmspace);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_wchan);
|
|
|
|
CP(*ki, *ki32, ki_pid);
|
|
|
|
CP(*ki, *ki32, ki_ppid);
|
|
|
|
CP(*ki, *ki32, ki_pgid);
|
|
|
|
CP(*ki, *ki32, ki_tpgid);
|
|
|
|
CP(*ki, *ki32, ki_sid);
|
|
|
|
CP(*ki, *ki32, ki_tsid);
|
|
|
|
CP(*ki, *ki32, ki_jobc);
|
|
|
|
CP(*ki, *ki32, ki_tdev);
|
|
|
|
CP(*ki, *ki32, ki_siglist);
|
|
|
|
CP(*ki, *ki32, ki_sigmask);
|
|
|
|
CP(*ki, *ki32, ki_sigignore);
|
|
|
|
CP(*ki, *ki32, ki_sigcatch);
|
|
|
|
CP(*ki, *ki32, ki_uid);
|
|
|
|
CP(*ki, *ki32, ki_ruid);
|
|
|
|
CP(*ki, *ki32, ki_svuid);
|
|
|
|
CP(*ki, *ki32, ki_rgid);
|
|
|
|
CP(*ki, *ki32, ki_svgid);
|
|
|
|
CP(*ki, *ki32, ki_ngroups);
|
|
|
|
for (i = 0; i < KI_NGROUPS; i++)
|
|
|
|
CP(*ki, *ki32, ki_groups[i]);
|
|
|
|
CP(*ki, *ki32, ki_size);
|
|
|
|
CP(*ki, *ki32, ki_rssize);
|
|
|
|
CP(*ki, *ki32, ki_swrss);
|
|
|
|
CP(*ki, *ki32, ki_tsize);
|
|
|
|
CP(*ki, *ki32, ki_dsize);
|
|
|
|
CP(*ki, *ki32, ki_ssize);
|
|
|
|
CP(*ki, *ki32, ki_xstat);
|
|
|
|
CP(*ki, *ki32, ki_acflag);
|
|
|
|
CP(*ki, *ki32, ki_pctcpu);
|
|
|
|
CP(*ki, *ki32, ki_estcpu);
|
|
|
|
CP(*ki, *ki32, ki_slptime);
|
|
|
|
CP(*ki, *ki32, ki_swtime);
|
|
|
|
CP(*ki, *ki32, ki_runtime);
|
|
|
|
TV_CP(*ki, *ki32, ki_start);
|
|
|
|
TV_CP(*ki, *ki32, ki_childtime);
|
|
|
|
CP(*ki, *ki32, ki_flag);
|
|
|
|
CP(*ki, *ki32, ki_kiflag);
|
|
|
|
CP(*ki, *ki32, ki_traceflag);
|
|
|
|
CP(*ki, *ki32, ki_stat);
|
|
|
|
CP(*ki, *ki32, ki_nice);
|
|
|
|
CP(*ki, *ki32, ki_lock);
|
|
|
|
CP(*ki, *ki32, ki_rqindex);
|
|
|
|
CP(*ki, *ki32, ki_oncpu);
|
|
|
|
CP(*ki, *ki32, ki_lastcpu);
|
2011-07-18 20:06:15 +00:00
|
|
|
bcopy(ki->ki_tdname, ki32->ki_tdname, TDNAMLEN + 1);
|
2010-04-21 19:32:00 +00:00
|
|
|
bcopy(ki->ki_wmesg, ki32->ki_wmesg, WMESGLEN + 1);
|
|
|
|
bcopy(ki->ki_login, ki32->ki_login, LOGNAMELEN + 1);
|
|
|
|
bcopy(ki->ki_lockname, ki32->ki_lockname, LOCKNAMELEN + 1);
|
|
|
|
bcopy(ki->ki_comm, ki32->ki_comm, COMMLEN + 1);
|
|
|
|
bcopy(ki->ki_emul, ki32->ki_emul, KI_EMULNAMELEN + 1);
|
2011-03-05 14:41:49 +00:00
|
|
|
bcopy(ki->ki_loginclass, ki32->ki_loginclass, LOGINCLASSLEN + 1);
|
2010-04-21 19:32:00 +00:00
|
|
|
CP(*ki, *ki32, ki_cr_flags);
|
|
|
|
CP(*ki, *ki32, ki_jid);
|
|
|
|
CP(*ki, *ki32, ki_numthreads);
|
|
|
|
CP(*ki, *ki32, ki_tid);
|
|
|
|
CP(*ki, *ki32, ki_pri);
|
|
|
|
freebsd32_rusage_out(&ki->ki_rusage, &ki32->ki_rusage);
|
|
|
|
freebsd32_rusage_out(&ki->ki_rusage_ch, &ki32->ki_rusage_ch);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_pcb);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_kstack);
|
|
|
|
PTRTRIM_CP(*ki, *ki32, ki_udata);
|
|
|
|
CP(*ki, *ki32, ki_sflag);
|
|
|
|
CP(*ki, *ki32, ki_tdflags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysctl_out_proc_copyout(struct kinfo_proc *ki, struct sysctl_req *req)
|
|
|
|
{
|
|
|
|
struct kinfo_proc32 ki32;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
if (req->flags & SCTL_MASK32) {
|
|
|
|
freebsd32_kinfo_proc_out(ki, &ki32);
|
2010-04-29 09:55:51 +00:00
|
|
|
error = SYSCTL_OUT(req, &ki32, sizeof(struct kinfo_proc32));
|
2010-04-21 19:32:00 +00:00
|
|
|
} else
|
2010-04-29 09:55:51 +00:00
|
|
|
error = SYSCTL_OUT(req, ki, sizeof(struct kinfo_proc));
|
2010-04-21 19:32:00 +00:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static int
|
|
|
|
sysctl_out_proc_copyout(struct kinfo_proc *ki, struct sysctl_req *req)
|
|
|
|
{
|
|
|
|
|
2010-04-29 09:55:51 +00:00
|
|
|
return (SYSCTL_OUT(req, ki, sizeof(struct kinfo_proc)));
|
2010-04-21 19:32:00 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
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);
|
2009-02-18 21:52:13 +00:00
|
|
|
MPASS(FIRST_THREAD_IN_PROC(p) != NULL);
|
2003-06-12 16:41:50 +00:00
|
|
|
|
2009-02-18 21:52:13 +00:00
|
|
|
fill_kinfo_proc(p, &kinfo_proc);
|
|
|
|
if (flags & KERN_PROC_NOTHREADS)
|
2010-04-21 19:32:00 +00:00
|
|
|
error = sysctl_out_proc_copyout(&kinfo_proc, req);
|
2009-02-18 21:52:13 +00:00
|
|
|
else {
|
|
|
|
FOREACH_THREAD_IN_PROC(p, td) {
|
|
|
|
fill_kinfo_thread(td, &kinfo_proc, 1);
|
2010-04-21 19:32:00 +00:00
|
|
|
error = sysctl_out_proc_copyout(&kinfo_proc, req);
|
2009-02-18 21:52:13 +00:00
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
}
|
2003-06-12 16:41:50 +00:00
|
|
|
}
|
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)
|
2008-09-04 10:44:33 +00:00
|
|
|
return (ESRCH);
|
2001-04-24 00:51:53 +00:00
|
|
|
if (np != p) {
|
|
|
|
PROC_UNLOCK(np);
|
2008-09-04 10:44:33 +00:00
|
|
|
return (ESRCH);
|
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);
|
2005-10-02 23:27:56 +00:00
|
|
|
error = sysctl_wire_old_buffer(req, 0);
|
|
|
|
if (error)
|
|
|
|
return (error);
|
1996-06-06 17:19:21 +00:00
|
|
|
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
|
|
|
*/
|
2011-03-24 18:40:11 +00:00
|
|
|
PROC_LOCK(p);
|
2003-04-18 20:17:05 +00:00
|
|
|
if (p->p_state == PRS_NEW) {
|
2011-03-24 18:40:11 +00:00
|
|
|
PROC_UNLOCK(p);
|
2000-08-23 21:41:25 +00:00
|
|
|
continue;
|
2002-04-09 20:10:46 +00:00
|
|
|
}
|
2006-01-17 20:25:01 +00:00
|
|
|
KASSERT(p->p_ucred != NULL,
|
|
|
|
("process credential is NULL for non-NEW proc"));
|
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
|
|
|
|
2004-06-19 14:03:00 +00:00
|
|
|
case KERN_PROC_GID:
|
2006-01-17 20:25:01 +00:00
|
|
|
if (p->p_ucred->cr_gid != (gid_t)name[0]) {
|
2004-06-19 14:03:00 +00:00
|
|
|
PROC_UNLOCK(p);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1996-06-06 17:19:21 +00:00
|
|
|
case KERN_PROC_PGRP:
|
|
|
|
/* could do this by traversing pgrp */
|
2006-01-17 20:25:01 +00:00
|
|
|
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;
|
|
|
|
|
2004-05-22 23:11:44 +00:00
|
|
|
case KERN_PROC_RGID:
|
2006-01-17 20:25:01 +00:00
|
|
|
if (p->p_ucred->cr_rgid != (gid_t)name[0]) {
|
2004-05-22 23:11:44 +00:00
|
|
|
PROC_UNLOCK(p);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case KERN_PROC_SESSION:
|
|
|
|
if (p->p_session == NULL ||
|
|
|
|
p->p_session->s_sid != (pid_t)name[0]) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1996-06-06 17:19:21 +00:00
|
|
|
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;
|
|
|
|
}
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
/* XXX proctree_lock */
|
2002-02-23 11:12:57 +00:00
|
|
|
SESS_LOCK(p->p_session);
|
|
|
|
if (p->p_session->s_ttyp == NULL ||
|
Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:
- Improved driver model:
The old TTY layer has a driver model that is not abstract enough to
make it friendly to use. A good example is the output path, where the
device drivers directly access the output buffers. This means that an
in-kernel PPP implementation must always convert network buffers into
TTY buffers.
If a PPP implementation would be built on top of the new TTY layer
(still needs a hooks layer, though), it would allow the PPP
implementation to directly hand the data to the TTY driver.
- Improved hotplugging:
With the old TTY layer, it isn't entirely safe to destroy TTY's from
the system. This implementation has a two-step destructing design,
where the driver first abandons the TTY. After all threads have left
the TTY, the TTY layer calls a routine in the driver, which can be
used to free resources (unit numbers, etc).
The pts(4) driver also implements this feature, which means
posix_openpt() will now return PTY's that are created on the fly.
- Improved performance:
One of the major improvements is the per-TTY mutex, which is expected
to improve scalability when compared to the old Giant locking.
Another change is the unbuffered copying to userspace, which is both
used on TTY device nodes and PTY masters.
Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.
Obtained from: //depot/projects/mpsafetty/...
Approved by: philip (ex-mentor)
Discussed: on the lists, at BSDCan, at the DevSummit
Sponsored by: Snow B.V., the Netherlands
dcons(4) fixed by: kan
2008-08-20 08:31:58 +00:00
|
|
|
tty_udev(p->p_session->s_ttyp) !=
|
2004-06-17 17:16:53 +00:00
|
|
|
(dev_t)name[0]) {
|
2002-02-23 11:12:57 +00:00
|
|
|
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:
|
2006-01-17 20:25:01 +00:00
|
|
|
if (p->p_ucred->cr_uid != (uid_t)name[0]) {
|
2002-04-09 20:10:46 +00:00
|
|
|
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:
|
2006-01-17 20:25:01 +00:00
|
|
|
if (p->p_ucred->cr_ruid != (uid_t)name[0]) {
|
2002-04-09 20:10:46 +00:00
|
|
|
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;
|
|
|
|
|
2008-10-23 15:53:51 +00:00
|
|
|
pa = malloc(sizeof(struct pargs) + len, M_PARGS,
|
2003-02-19 05:47:46 +00:00
|
|
|
M_WAITOK);
|
2005-09-27 18:03:15 +00:00
|
|
|
refcount_init(&pa->ar_ref, 1);
|
2002-03-28 18:12:27 +00:00
|
|
|
pa->ar_length = len;
|
|
|
|
return (pa);
|
|
|
|
}
|
|
|
|
|
2008-07-25 11:55:32 +00:00
|
|
|
static void
|
2002-03-28 18:12:27 +00:00
|
|
|
pargs_free(struct pargs *pa)
|
|
|
|
{
|
|
|
|
|
2008-10-23 15:53:51 +00:00
|
|
|
free(pa, M_PARGS);
|
2002-03-28 18:12:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
pargs_hold(struct pargs *pa)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (pa == NULL)
|
|
|
|
return;
|
2005-09-27 18:03:15 +00:00
|
|
|
refcount_acquire(&pa->ar_ref);
|
2002-03-28 18:12:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
pargs_drop(struct pargs *pa)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (pa == NULL)
|
|
|
|
return;
|
2005-09-27 18:03:15 +00:00
|
|
|
if (refcount_release(&pa->ar_ref))
|
2002-03-28 18:12:27 +00:00
|
|
|
pargs_free(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);
|
2011-08-18 22:20:45 +00:00
|
|
|
if (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
|
|
|
|
2005-04-18 02:10:37 +00:00
|
|
|
/*
|
|
|
|
* This sysctl allows a process to retrieve the path of the executable for
|
|
|
|
* itself or another process.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
sysctl_kern_proc_pathname(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
pid_t *pidp = (pid_t *)arg1;
|
|
|
|
unsigned int arglen = arg2;
|
|
|
|
struct proc *p;
|
|
|
|
struct vnode *vp;
|
|
|
|
char *retbuf, *freebuf;
|
2009-01-23 22:46:45 +00:00
|
|
|
int error, vfslocked;
|
2005-04-18 02:10:37 +00:00
|
|
|
|
|
|
|
if (arglen != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
if (*pidp == -1) { /* -1 means this process */
|
|
|
|
p = req->td->td_proc;
|
|
|
|
} else {
|
|
|
|
p = pfind(*pidp);
|
|
|
|
if (p == NULL)
|
|
|
|
return (ESRCH);
|
|
|
|
if ((error = p_cansee(curthread, p)) != 0) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
vp = p->p_textvp;
|
2007-11-20 18:03:09 +00:00
|
|
|
if (vp == NULL) {
|
|
|
|
if (*pidp != -1)
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (0);
|
|
|
|
}
|
2005-04-18 02:10:37 +00:00
|
|
|
vref(vp);
|
|
|
|
if (*pidp != -1)
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
error = vn_fullpath(req->td, vp, &retbuf, &freebuf);
|
2009-01-23 22:46:45 +00:00
|
|
|
vfslocked = VFS_LOCK_GIANT(vp->v_mount);
|
2005-04-18 02:10:37 +00:00
|
|
|
vrele(vp);
|
2009-01-23 22:46:45 +00:00
|
|
|
VFS_UNLOCK_GIANT(vfslocked);
|
2005-04-18 02:10:37 +00:00
|
|
|
if (error)
|
|
|
|
return (error);
|
|
|
|
error = SYSCTL_OUT(req, retbuf, strlen(retbuf) + 1);
|
|
|
|
free(freebuf, M_TEMP);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
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));
|
|
|
|
}
|
|
|
|
|
2008-12-02 06:50:26 +00:00
|
|
|
#ifdef KINFO_OVMENTRY_SIZE
|
|
|
|
CTASSERT(sizeof(struct kinfo_ovmentry) == KINFO_OVMENTRY_SIZE);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef COMPAT_FREEBSD7
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
static int
|
2008-12-02 06:50:26 +00:00
|
|
|
sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS)
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
{
|
|
|
|
vm_map_entry_t entry, tmp_entry;
|
|
|
|
unsigned int last_timestamp;
|
|
|
|
char *fullpath, *freepath;
|
2008-12-02 06:50:26 +00:00
|
|
|
struct kinfo_ovmentry *kve;
|
2008-10-31 05:43:19 +00:00
|
|
|
struct vattr va;
|
|
|
|
struct ucred *cred;
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
int error, *name;
|
|
|
|
struct vnode *vp;
|
|
|
|
struct proc *p;
|
|
|
|
vm_map_t map;
|
2008-12-12 12:12:36 +00:00
|
|
|
struct vmspace *vm;
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
|
|
|
|
name = (int *)arg1;
|
|
|
|
if ((p = pfind((pid_t)name[0])) == NULL)
|
|
|
|
return (ESRCH);
|
2007-12-09 17:22:27 +00:00
|
|
|
if (p->p_flag & P_WEXIT) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (ESRCH);
|
|
|
|
}
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
if ((error = p_candebug(curthread, p))) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
_PHOLD(p);
|
|
|
|
PROC_UNLOCK(p);
|
2008-12-12 12:12:36 +00:00
|
|
|
vm = vmspace_acquire_ref(p);
|
|
|
|
if (vm == NULL) {
|
|
|
|
PRELE(p);
|
|
|
|
return (ESRCH);
|
|
|
|
}
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
kve = malloc(sizeof(*kve), M_TEMP, M_WAITOK);
|
|
|
|
|
|
|
|
map = &p->p_vmspace->vm_map; /* XXXRW: More locking required? */
|
|
|
|
vm_map_lock_read(map);
|
|
|
|
for (entry = map->header.next; entry != &map->header;
|
|
|
|
entry = entry->next) {
|
|
|
|
vm_object_t obj, tobj, lobj;
|
|
|
|
vm_offset_t addr;
|
|
|
|
int vfslocked;
|
|
|
|
|
|
|
|
if (entry->eflags & MAP_ENTRY_IS_SUB_MAP)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bzero(kve, sizeof(*kve));
|
|
|
|
kve->kve_structsize = sizeof(*kve);
|
|
|
|
|
|
|
|
kve->kve_private_resident = 0;
|
|
|
|
obj = entry->object.vm_object;
|
|
|
|
if (obj != NULL) {
|
|
|
|
VM_OBJECT_LOCK(obj);
|
|
|
|
if (obj->shadow_count == 1)
|
|
|
|
kve->kve_private_resident =
|
|
|
|
obj->resident_page_count;
|
|
|
|
}
|
|
|
|
kve->kve_resident = 0;
|
|
|
|
addr = entry->start;
|
|
|
|
while (addr < entry->end) {
|
|
|
|
if (pmap_extract(map->pmap, addr))
|
|
|
|
kve->kve_resident++;
|
|
|
|
addr += PAGE_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) {
|
|
|
|
if (tobj != obj)
|
|
|
|
VM_OBJECT_LOCK(tobj);
|
|
|
|
if (lobj != obj)
|
|
|
|
VM_OBJECT_UNLOCK(lobj);
|
|
|
|
lobj = tobj;
|
|
|
|
}
|
|
|
|
|
2008-12-08 12:29:30 +00:00
|
|
|
kve->kve_start = (void*)entry->start;
|
|
|
|
kve->kve_end = (void*)entry->end;
|
|
|
|
kve->kve_offset = (off_t)entry->offset;
|
|
|
|
|
|
|
|
if (entry->protection & VM_PROT_READ)
|
|
|
|
kve->kve_protection |= KVME_PROT_READ;
|
|
|
|
if (entry->protection & VM_PROT_WRITE)
|
|
|
|
kve->kve_protection |= KVME_PROT_WRITE;
|
|
|
|
if (entry->protection & VM_PROT_EXECUTE)
|
|
|
|
kve->kve_protection |= KVME_PROT_EXEC;
|
|
|
|
|
|
|
|
if (entry->eflags & MAP_ENTRY_COW)
|
|
|
|
kve->kve_flags |= KVME_FLAG_COW;
|
|
|
|
if (entry->eflags & MAP_ENTRY_NEEDS_COPY)
|
|
|
|
kve->kve_flags |= KVME_FLAG_NEEDS_COPY;
|
2010-05-27 08:10:12 +00:00
|
|
|
if (entry->eflags & MAP_ENTRY_NOCOREDUMP)
|
|
|
|
kve->kve_flags |= KVME_FLAG_NOCOREDUMP;
|
2008-12-08 12:29:30 +00:00
|
|
|
|
|
|
|
last_timestamp = map->timestamp;
|
|
|
|
vm_map_unlock_read(map);
|
|
|
|
|
2008-10-31 05:43:19 +00:00
|
|
|
kve->kve_fileid = 0;
|
|
|
|
kve->kve_fsid = 0;
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
freepath = NULL;
|
|
|
|
fullpath = "";
|
|
|
|
if (lobj) {
|
|
|
|
vp = NULL;
|
2008-12-08 12:29:30 +00:00
|
|
|
switch (lobj->type) {
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
case OBJT_DEFAULT:
|
|
|
|
kve->kve_type = KVME_TYPE_DEFAULT;
|
|
|
|
break;
|
|
|
|
case OBJT_VNODE:
|
|
|
|
kve->kve_type = KVME_TYPE_VNODE;
|
|
|
|
vp = lobj->handle;
|
|
|
|
vref(vp);
|
|
|
|
break;
|
|
|
|
case OBJT_SWAP:
|
|
|
|
kve->kve_type = KVME_TYPE_SWAP;
|
|
|
|
break;
|
|
|
|
case OBJT_DEVICE:
|
|
|
|
kve->kve_type = KVME_TYPE_DEVICE;
|
|
|
|
break;
|
|
|
|
case OBJT_PHYS:
|
|
|
|
kve->kve_type = KVME_TYPE_PHYS;
|
|
|
|
break;
|
|
|
|
case OBJT_DEAD:
|
|
|
|
kve->kve_type = KVME_TYPE_DEAD;
|
|
|
|
break;
|
2009-07-24 13:50:29 +00:00
|
|
|
case OBJT_SG:
|
|
|
|
kve->kve_type = KVME_TYPE_SG;
|
|
|
|
break;
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
default:
|
|
|
|
kve->kve_type = KVME_TYPE_UNKNOWN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (lobj != obj)
|
|
|
|
VM_OBJECT_UNLOCK(lobj);
|
|
|
|
|
|
|
|
kve->kve_ref_count = obj->ref_count;
|
|
|
|
kve->kve_shadow_count = obj->shadow_count;
|
|
|
|
VM_OBJECT_UNLOCK(obj);
|
|
|
|
if (vp != NULL) {
|
|
|
|
vn_fullpath(curthread, vp, &fullpath,
|
|
|
|
&freepath);
|
2008-10-31 05:43:19 +00:00
|
|
|
cred = curthread->td_ucred;
|
2008-11-04 19:04:01 +00:00
|
|
|
vfslocked = VFS_LOCK_GIANT(vp->v_mount);
|
|
|
|
vn_lock(vp, LK_SHARED | LK_RETRY);
|
2008-10-31 05:43:19 +00:00
|
|
|
if (VOP_GETATTR(vp, &va, cred) == 0) {
|
|
|
|
kve->kve_fileid = va.va_fileid;
|
|
|
|
kve->kve_fsid = va.va_fsid;
|
|
|
|
}
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
vput(vp);
|
|
|
|
VFS_UNLOCK_GIANT(vfslocked);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
kve->kve_type = KVME_TYPE_NONE;
|
|
|
|
kve->kve_ref_count = 0;
|
|
|
|
kve->kve_shadow_count = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
strlcpy(kve->kve_path, fullpath, sizeof(kve->kve_path));
|
|
|
|
if (freepath != NULL)
|
|
|
|
free(freepath, M_TEMP);
|
|
|
|
|
|
|
|
error = SYSCTL_OUT(req, kve, sizeof(*kve));
|
|
|
|
vm_map_lock_read(map);
|
|
|
|
if (error)
|
|
|
|
break;
|
2008-12-29 12:45:11 +00:00
|
|
|
if (last_timestamp != map->timestamp) {
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
vm_map_lookup_entry(map, addr - 1, &tmp_entry);
|
|
|
|
entry = tmp_entry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
vm_map_unlock_read(map);
|
2008-12-12 12:12:36 +00:00
|
|
|
vmspace_free(vm);
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
PRELE(p);
|
|
|
|
free(kve, M_TEMP);
|
|
|
|
return (error);
|
|
|
|
}
|
2008-12-02 06:50:26 +00:00
|
|
|
#endif /* COMPAT_FREEBSD7 */
|
|
|
|
|
|
|
|
#ifdef KINFO_VMENTRY_SIZE
|
|
|
|
CTASSERT(sizeof(struct kinfo_vmentry) == KINFO_VMENTRY_SIZE);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysctl_kern_proc_vmmap(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
vm_map_entry_t entry, tmp_entry;
|
|
|
|
unsigned int last_timestamp;
|
|
|
|
char *fullpath, *freepath;
|
|
|
|
struct kinfo_vmentry *kve;
|
|
|
|
struct vattr va;
|
|
|
|
struct ucred *cred;
|
|
|
|
int error, *name;
|
|
|
|
struct vnode *vp;
|
|
|
|
struct proc *p;
|
2008-12-12 12:12:36 +00:00
|
|
|
struct vmspace *vm;
|
2008-12-02 06:50:26 +00:00
|
|
|
vm_map_t map;
|
|
|
|
|
|
|
|
name = (int *)arg1;
|
|
|
|
if ((p = pfind((pid_t)name[0])) == NULL)
|
|
|
|
return (ESRCH);
|
|
|
|
if (p->p_flag & P_WEXIT) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (ESRCH);
|
|
|
|
}
|
|
|
|
if ((error = p_candebug(curthread, p))) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
_PHOLD(p);
|
|
|
|
PROC_UNLOCK(p);
|
2008-12-12 12:12:36 +00:00
|
|
|
vm = vmspace_acquire_ref(p);
|
|
|
|
if (vm == NULL) {
|
|
|
|
PRELE(p);
|
|
|
|
return (ESRCH);
|
|
|
|
}
|
2008-12-02 06:50:26 +00:00
|
|
|
kve = malloc(sizeof(*kve), M_TEMP, M_WAITOK);
|
|
|
|
|
2008-12-12 12:12:36 +00:00
|
|
|
map = &vm->vm_map; /* XXXRW: More locking required? */
|
2008-12-02 06:50:26 +00:00
|
|
|
vm_map_lock_read(map);
|
|
|
|
for (entry = map->header.next; entry != &map->header;
|
|
|
|
entry = entry->next) {
|
|
|
|
vm_object_t obj, tobj, lobj;
|
|
|
|
vm_offset_t addr;
|
|
|
|
int vfslocked;
|
|
|
|
|
|
|
|
if (entry->eflags & MAP_ENTRY_IS_SUB_MAP)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bzero(kve, sizeof(*kve));
|
|
|
|
|
|
|
|
kve->kve_private_resident = 0;
|
|
|
|
obj = entry->object.vm_object;
|
|
|
|
if (obj != NULL) {
|
|
|
|
VM_OBJECT_LOCK(obj);
|
|
|
|
if (obj->shadow_count == 1)
|
|
|
|
kve->kve_private_resident =
|
|
|
|
obj->resident_page_count;
|
|
|
|
}
|
|
|
|
kve->kve_resident = 0;
|
|
|
|
addr = entry->start;
|
|
|
|
while (addr < entry->end) {
|
|
|
|
if (pmap_extract(map->pmap, addr))
|
|
|
|
kve->kve_resident++;
|
|
|
|
addr += PAGE_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) {
|
|
|
|
if (tobj != obj)
|
|
|
|
VM_OBJECT_LOCK(tobj);
|
|
|
|
if (lobj != obj)
|
|
|
|
VM_OBJECT_UNLOCK(lobj);
|
|
|
|
lobj = tobj;
|
|
|
|
}
|
|
|
|
|
2008-12-08 12:29:30 +00:00
|
|
|
kve->kve_start = entry->start;
|
|
|
|
kve->kve_end = entry->end;
|
|
|
|
kve->kve_offset = entry->offset;
|
|
|
|
|
|
|
|
if (entry->protection & VM_PROT_READ)
|
|
|
|
kve->kve_protection |= KVME_PROT_READ;
|
|
|
|
if (entry->protection & VM_PROT_WRITE)
|
|
|
|
kve->kve_protection |= KVME_PROT_WRITE;
|
|
|
|
if (entry->protection & VM_PROT_EXECUTE)
|
|
|
|
kve->kve_protection |= KVME_PROT_EXEC;
|
|
|
|
|
|
|
|
if (entry->eflags & MAP_ENTRY_COW)
|
|
|
|
kve->kve_flags |= KVME_FLAG_COW;
|
|
|
|
if (entry->eflags & MAP_ENTRY_NEEDS_COPY)
|
|
|
|
kve->kve_flags |= KVME_FLAG_NEEDS_COPY;
|
2010-05-27 08:10:12 +00:00
|
|
|
if (entry->eflags & MAP_ENTRY_NOCOREDUMP)
|
|
|
|
kve->kve_flags |= KVME_FLAG_NOCOREDUMP;
|
2008-12-08 12:29:30 +00:00
|
|
|
|
|
|
|
last_timestamp = map->timestamp;
|
|
|
|
vm_map_unlock_read(map);
|
|
|
|
|
2008-12-02 06:50:26 +00:00
|
|
|
freepath = NULL;
|
|
|
|
fullpath = "";
|
|
|
|
if (lobj) {
|
|
|
|
vp = NULL;
|
2008-12-08 12:29:30 +00:00
|
|
|
switch (lobj->type) {
|
2008-12-02 06:50:26 +00:00
|
|
|
case OBJT_DEFAULT:
|
|
|
|
kve->kve_type = KVME_TYPE_DEFAULT;
|
|
|
|
break;
|
|
|
|
case OBJT_VNODE:
|
|
|
|
kve->kve_type = KVME_TYPE_VNODE;
|
|
|
|
vp = lobj->handle;
|
|
|
|
vref(vp);
|
|
|
|
break;
|
|
|
|
case OBJT_SWAP:
|
|
|
|
kve->kve_type = KVME_TYPE_SWAP;
|
|
|
|
break;
|
|
|
|
case OBJT_DEVICE:
|
|
|
|
kve->kve_type = KVME_TYPE_DEVICE;
|
|
|
|
break;
|
|
|
|
case OBJT_PHYS:
|
|
|
|
kve->kve_type = KVME_TYPE_PHYS;
|
|
|
|
break;
|
|
|
|
case OBJT_DEAD:
|
|
|
|
kve->kve_type = KVME_TYPE_DEAD;
|
|
|
|
break;
|
2009-07-24 13:50:29 +00:00
|
|
|
case OBJT_SG:
|
|
|
|
kve->kve_type = KVME_TYPE_SG;
|
|
|
|
break;
|
2008-12-02 06:50:26 +00:00
|
|
|
default:
|
|
|
|
kve->kve_type = KVME_TYPE_UNKNOWN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (lobj != obj)
|
|
|
|
VM_OBJECT_UNLOCK(lobj);
|
|
|
|
|
|
|
|
kve->kve_ref_count = obj->ref_count;
|
|
|
|
kve->kve_shadow_count = obj->shadow_count;
|
|
|
|
VM_OBJECT_UNLOCK(obj);
|
|
|
|
if (vp != NULL) {
|
|
|
|
vn_fullpath(curthread, vp, &fullpath,
|
|
|
|
&freepath);
|
2011-05-12 10:11:39 +00:00
|
|
|
kve->kve_vn_type = vntype_to_kinfo(vp->v_type);
|
2008-12-02 06:50:26 +00:00
|
|
|
cred = curthread->td_ucred;
|
|
|
|
vfslocked = VFS_LOCK_GIANT(vp->v_mount);
|
|
|
|
vn_lock(vp, LK_SHARED | LK_RETRY);
|
|
|
|
if (VOP_GETATTR(vp, &va, cred) == 0) {
|
2011-05-12 10:11:39 +00:00
|
|
|
kve->kve_vn_fileid = va.va_fileid;
|
|
|
|
kve->kve_vn_fsid = va.va_fsid;
|
|
|
|
kve->kve_vn_mode =
|
|
|
|
MAKEIMODE(va.va_type, va.va_mode);
|
|
|
|
kve->kve_vn_size = va.va_size;
|
|
|
|
kve->kve_vn_rdev = va.va_rdev;
|
|
|
|
kve->kve_status = KF_ATTR_VALID;
|
2008-12-02 06:50:26 +00:00
|
|
|
}
|
|
|
|
vput(vp);
|
|
|
|
VFS_UNLOCK_GIANT(vfslocked);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
kve->kve_type = KVME_TYPE_NONE;
|
|
|
|
kve->kve_ref_count = 0;
|
|
|
|
kve->kve_shadow_count = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
strlcpy(kve->kve_path, fullpath, sizeof(kve->kve_path));
|
|
|
|
if (freepath != NULL)
|
|
|
|
free(freepath, M_TEMP);
|
|
|
|
|
|
|
|
/* Pack record size down */
|
|
|
|
kve->kve_structsize = offsetof(struct kinfo_vmentry, kve_path) +
|
|
|
|
strlen(kve->kve_path) + 1;
|
|
|
|
kve->kve_structsize = roundup(kve->kve_structsize,
|
|
|
|
sizeof(uint64_t));
|
|
|
|
error = SYSCTL_OUT(req, kve, kve->kve_structsize);
|
|
|
|
vm_map_lock_read(map);
|
|
|
|
if (error)
|
|
|
|
break;
|
2008-12-29 12:45:11 +00:00
|
|
|
if (last_timestamp != map->timestamp) {
|
2008-12-02 06:50:26 +00:00
|
|
|
vm_map_lookup_entry(map, addr - 1, &tmp_entry);
|
|
|
|
entry = tmp_entry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
vm_map_unlock_read(map);
|
2008-12-12 12:12:36 +00:00
|
|
|
vmspace_free(vm);
|
2008-12-02 06:50:26 +00:00
|
|
|
PRELE(p);
|
|
|
|
free(kve, M_TEMP);
|
|
|
|
return (error);
|
|
|
|
}
|
2003-07-12 02:00:16 +00:00
|
|
|
|
2007-12-02 21:52:18 +00:00
|
|
|
#if defined(STACK) || defined(DDB)
|
|
|
|
static int
|
|
|
|
sysctl_kern_proc_kstack(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
struct kinfo_kstack *kkstp;
|
|
|
|
int error, i, *name, numthreads;
|
|
|
|
lwpid_t *lwpidarray;
|
|
|
|
struct thread *td;
|
|
|
|
struct stack *st;
|
|
|
|
struct sbuf sb;
|
|
|
|
struct proc *p;
|
|
|
|
|
|
|
|
name = (int *)arg1;
|
|
|
|
if ((p = pfind((pid_t)name[0])) == NULL)
|
|
|
|
return (ESRCH);
|
2007-12-27 22:44:01 +00:00
|
|
|
/* XXXRW: Not clear ESRCH is the right error during proc execve(). */
|
|
|
|
if (p->p_flag & P_WEXIT || p->p_flag & P_INEXEC) {
|
2007-12-09 17:22:27 +00:00
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (ESRCH);
|
|
|
|
}
|
2007-12-02 21:52:18 +00:00
|
|
|
if ((error = p_candebug(curthread, p))) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
_PHOLD(p);
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
|
|
|
|
kkstp = malloc(sizeof(*kkstp), M_TEMP, M_WAITOK);
|
|
|
|
st = stack_create();
|
|
|
|
|
|
|
|
lwpidarray = NULL;
|
|
|
|
numthreads = 0;
|
2008-03-19 06:19:01 +00:00
|
|
|
PROC_LOCK(p);
|
2007-12-02 21:52:18 +00:00
|
|
|
repeat:
|
|
|
|
if (numthreads < p->p_numthreads) {
|
|
|
|
if (lwpidarray != NULL) {
|
|
|
|
free(lwpidarray, M_TEMP);
|
|
|
|
lwpidarray = NULL;
|
|
|
|
}
|
|
|
|
numthreads = p->p_numthreads;
|
2008-03-19 06:19:01 +00:00
|
|
|
PROC_UNLOCK(p);
|
2007-12-02 21:52:18 +00:00
|
|
|
lwpidarray = malloc(sizeof(*lwpidarray) * numthreads, M_TEMP,
|
|
|
|
M_WAITOK | M_ZERO);
|
2008-03-19 06:19:01 +00:00
|
|
|
PROC_LOCK(p);
|
2007-12-02 21:52:18 +00:00
|
|
|
goto repeat;
|
|
|
|
}
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XXXRW: During the below loop, execve(2) and countless other sorts
|
|
|
|
* of changes could have taken place. Should we check to see if the
|
|
|
|
* vmspace has been replaced, or the like, in order to prevent
|
|
|
|
* giving a snapshot that spans, say, execve(2), with some threads
|
|
|
|
* before and some after? Among other things, the credentials could
|
|
|
|
* have changed, in which case the right to extract debug info might
|
|
|
|
* no longer be assured.
|
|
|
|
*/
|
|
|
|
FOREACH_THREAD_IN_PROC(p, td) {
|
|
|
|
KASSERT(i < numthreads,
|
|
|
|
("sysctl_kern_proc_kstack: numthreads"));
|
|
|
|
lwpidarray[i] = td->td_tid;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
numthreads = i;
|
|
|
|
for (i = 0; i < numthreads; i++) {
|
|
|
|
td = thread_find(p, lwpidarray[i]);
|
|
|
|
if (td == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
bzero(kkstp, sizeof(*kkstp));
|
|
|
|
(void)sbuf_new(&sb, kkstp->kkst_trace,
|
|
|
|
sizeof(kkstp->kkst_trace), SBUF_FIXEDLEN);
|
|
|
|
thread_lock(td);
|
|
|
|
kkstp->kkst_tid = td->td_tid;
|
|
|
|
if (TD_IS_SWAPPED(td))
|
|
|
|
kkstp->kkst_state = KKST_STATE_SWAPPED;
|
|
|
|
else if (TD_IS_RUNNING(td))
|
|
|
|
kkstp->kkst_state = KKST_STATE_RUNNING;
|
|
|
|
else {
|
|
|
|
kkstp->kkst_state = KKST_STATE_STACKOK;
|
|
|
|
stack_save_td(st, td);
|
|
|
|
}
|
|
|
|
thread_unlock(td);
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
stack_sbuf_print(&sb, st);
|
|
|
|
sbuf_finish(&sb);
|
|
|
|
sbuf_delete(&sb);
|
|
|
|
error = SYSCTL_OUT(req, kkstp, sizeof(*kkstp));
|
|
|
|
PROC_LOCK(p);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
_PRELE(p);
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
if (lwpidarray != NULL)
|
|
|
|
free(lwpidarray, M_TEMP);
|
|
|
|
stack_destroy(st);
|
|
|
|
free(kkstp, M_TEMP);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-07-24 19:12:19 +00:00
|
|
|
/*
|
|
|
|
* This sysctl allows a process to retrieve the full list of groups from
|
|
|
|
* itself or another process.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
sysctl_kern_proc_groups(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
pid_t *pidp = (pid_t *)arg1;
|
|
|
|
unsigned int arglen = arg2;
|
|
|
|
struct proc *p;
|
|
|
|
struct ucred *cred;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
if (arglen != 1)
|
|
|
|
return (EINVAL);
|
|
|
|
if (*pidp == -1) { /* -1 means this process */
|
|
|
|
p = req->td->td_proc;
|
|
|
|
} else {
|
|
|
|
p = pfind(*pidp);
|
|
|
|
if (p == NULL)
|
|
|
|
return (ESRCH);
|
|
|
|
if ((error = p_cansee(curthread, p)) != 0) {
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cred = crhold(p->p_ucred);
|
|
|
|
if (*pidp != -1)
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
|
|
|
|
error = SYSCTL_OUT(req, cred->cr_groups,
|
|
|
|
cred->cr_ngroups * sizeof(gid_t));
|
|
|
|
crfree(cred);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, "Process table");
|
1996-06-06 17:19:21 +00:00
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT|
|
|
|
|
CTLFLAG_MPSAFE, 0, 0, sysctl_kern_proc, "S,proc",
|
|
|
|
"Return entire process table");
|
1996-06-06 17:19:21 +00:00
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_GID, gid, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
2004-06-19 14:03:00 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_PGRP, pgrp, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
1996-06-06 17:19:21 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_RGID, rgid, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
2004-05-22 23:11:44 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_SESSION, sid, CTLFLAG_RD |
|
|
|
|
CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-05-22 23:11:44 +00:00
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_TTY, tty, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
1996-06-06 17:19:21 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_UID, uid, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
1996-06-06 17:19:21 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_RUID, ruid, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
1996-06-06 17:19:21 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_PID, pid, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
1995-11-14 09:16:27 +00:00
|
|
|
sysctl_kern_proc, "Process table");
|
1999-11-16 20:31:58 +00:00
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_PROC, proc, CTLFLAG_RD | CTLFLAG_MPSAFE,
|
2003-06-12 16:41:50 +00:00
|
|
|
sysctl_kern_proc, "Return process table, no threads");
|
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_ARGS, args,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE,
|
2000-02-08 19:54:15 +00:00
|
|
|
sysctl_kern_proc_args, "Process argument list");
|
2003-07-12 02:00:16 +00:00
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_PATHNAME, pathname, CTLFLAG_RD |
|
|
|
|
CTLFLAG_MPSAFE, sysctl_kern_proc_pathname, "Process executable path");
|
2005-04-18 02:10:37 +00:00
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_SV_NAME, sv_name, CTLFLAG_RD |
|
|
|
|
CTLFLAG_MPSAFE, sysctl_kern_proc_sv_name,
|
|
|
|
"Process syscall vector name (ABI type)");
|
2004-02-22 17:54:32 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_GID | KERN_PROC_INC_THREAD), gid_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-06-19 14:03:00 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_PGRP | KERN_PROC_INC_THREAD), pgrp_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-02-22 17:54:32 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_RGID | KERN_PROC_INC_THREAD), rgid_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-05-22 23:11:44 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_SESSION | KERN_PROC_INC_THREAD),
|
2009-01-23 22:46:45 +00:00
|
|
|
sid_td, CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-05-22 23:11:44 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_TTY | KERN_PROC_INC_THREAD), tty_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-02-22 17:54:32 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_UID | KERN_PROC_INC_THREAD), uid_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-02-22 17:54:32 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_RUID | KERN_PROC_INC_THREAD), ruid_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-02-22 17:54:32 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_PID | KERN_PROC_INC_THREAD), pid_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc, "Process table");
|
2004-02-22 17:54:32 +00:00
|
|
|
|
2005-02-10 12:15:49 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, (KERN_PROC_PROC | KERN_PROC_INC_THREAD), proc_td,
|
2009-01-23 22:46:45 +00:00
|
|
|
CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_kern_proc,
|
|
|
|
"Return process table, no threads");
|
Add two new sysctls in support of the forthcoming procstat(1) to support
its -f and -v arguments:
kern.proc.filedesc - dump file descriptor information for a process, if
debugging is permitted, including socket addresses, open flags, file
offsets, file paths, etc.
kern.proc.vmmap - dump virtual memory mapping information for a process,
if debugging is permitted, including layout and information on
underlying objects, such as the type of object and path.
These provide a superset of the information historically available
through the now-deprecated procfs(4), and are intended to be exported
in an ABI-robust form.
2007-12-02 10:10:27 +00:00
|
|
|
|
2008-12-02 06:50:26 +00:00
|
|
|
#ifdef COMPAT_FREEBSD7
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_OVMMAP, ovmmap, CTLFLAG_RD |
|
|
|
|
CTLFLAG_MPSAFE, sysctl_kern_proc_ovmmap, "Old Process vm map entries");
|
2008-12-02 06:50:26 +00:00
|
|
|
#endif
|
|
|
|
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_VMMAP, vmmap, CTLFLAG_RD |
|
|
|
|
CTLFLAG_MPSAFE, sysctl_kern_proc_vmmap, "Process vm map entries");
|
2007-12-02 21:52:18 +00:00
|
|
|
|
|
|
|
#if defined(STACK) || defined(DDB)
|
2009-01-23 22:46:45 +00:00
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_KSTACK, kstack, CTLFLAG_RD |
|
|
|
|
CTLFLAG_MPSAFE, sysctl_kern_proc_kstack, "Process kernel stacks");
|
2007-12-02 21:52:18 +00:00
|
|
|
#endif
|
2009-07-24 19:12:19 +00:00
|
|
|
|
|
|
|
static SYSCTL_NODE(_kern_proc, KERN_PROC_GROUPS, groups, CTLFLAG_RD |
|
|
|
|
CTLFLAG_MPSAFE, sysctl_kern_proc_groups, "Process groups");
|