2000-04-20 03:54:27 +00:00
|
|
|
|
/*
|
2000-09-07 16:44:26 +00:00
|
|
|
|
* Copyright (c) 2000 Dag-Erling Co<EFBFBD>dan Sm<EFBFBD>rgrav
|
|
|
|
|
* Copyright (c) 1999 Pierre Beyssac
|
2000-04-20 03:54:27 +00:00
|
|
|
|
* Copyright (c) 1993 Jan-Simon Pendry
|
|
|
|
|
* Copyright (c) 1993
|
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* This code is derived from software contributed to Berkeley by
|
|
|
|
|
* Jan-Simon Pendry.
|
|
|
|
|
*
|
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
|
* are met:
|
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
|
* without specific prior written permission.
|
|
|
|
|
*
|
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
|
*
|
|
|
|
|
* @(#)procfs_status.c 8.4 (Berkeley) 6/15/94
|
|
|
|
|
*
|
|
|
|
|
* $FreeBSD$
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/systm.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
#include <sys/blist.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/conf.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
#include <sys/dkstat.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/jail.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
#include <sys/kernel.h>
|
2001-05-01 08:13:21 +00:00
|
|
|
|
#include <sys/lock.h>
|
2001-03-12 03:16:56 +00:00
|
|
|
|
#include <sys/malloc.h>
|
2001-05-19 01:28:09 +00:00
|
|
|
|
#include <sys/mutex.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
#include <sys/proc.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
#include <sys/resourcevar.h>
|
2000-12-13 20:22:24 +00:00
|
|
|
|
#include <sys/sbuf.h>
|
2001-05-19 05:54:26 +00:00
|
|
|
|
#include <sys/sysctl.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
#include <sys/tty.h>
|
|
|
|
|
#include <sys/vnode.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
|
|
|
|
#include <vm/vm.h>
|
|
|
|
|
#include <vm/pmap.h>
|
2000-10-25 22:12:59 +00:00
|
|
|
|
#include <vm/vm_map.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
#include <vm/vm_param.h>
|
2000-05-24 07:37:02 +00:00
|
|
|
|
#include <vm/vm_object.h>
|
2000-12-13 20:22:24 +00:00
|
|
|
|
#include <vm/vm_zone.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
#include <vm/swap_pager.h>
|
2000-12-09 13:25:54 +00:00
|
|
|
|
|
2000-04-20 03:54:27 +00:00
|
|
|
|
#include <sys/exec.h>
|
2000-12-09 13:25:54 +00:00
|
|
|
|
#include <sys/user.h>
|
|
|
|
|
#include <sys/vmmeter.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
2000-10-25 22:38:23 +00:00
|
|
|
|
#include <machine/clock.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
#include <machine/cputypes.h>
|
2000-10-25 22:38:23 +00:00
|
|
|
|
#include <machine/md_var.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
2001-03-12 03:16:56 +00:00
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <net/if.h>
|
|
|
|
|
|
2000-12-13 20:22:24 +00:00
|
|
|
|
#include <compat/linux/linux_mib.h>
|
2000-12-12 22:06:05 +00:00
|
|
|
|
#include <compat/linprocfs/linprocfs.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
|
2001-03-12 03:16:56 +00:00
|
|
|
|
extern struct cdevsw *cdevsw[];
|
|
|
|
|
|
2000-10-25 22:12:59 +00:00
|
|
|
|
/*
|
|
|
|
|
* Various conversion macros
|
|
|
|
|
*/
|
2001-05-09 11:41:54 +00:00
|
|
|
|
#define T2J(x) (((x) * 100UL) / (stathz ? stathz : hz)) /* ticks to jiffies */
|
2000-10-25 22:12:59 +00:00
|
|
|
|
#define T2S(x) ((x) / (stathz ? stathz : hz)) /* ticks to seconds */
|
|
|
|
|
#define B2K(x) ((x) >> 10) /* bytes to kbytes */
|
2000-12-09 13:25:54 +00:00
|
|
|
|
#define B2P(x) ((x) >> PAGE_SHIFT) /* bytes to pages */
|
2000-10-25 22:12:59 +00:00
|
|
|
|
#define P2B(x) ((x) << PAGE_SHIFT) /* pages to bytes */
|
|
|
|
|
#define P2K(x) ((x) << (PAGE_SHIFT - 10)) /* pages to kbytes */
|
2001-03-12 03:16:56 +00:00
|
|
|
|
|
|
|
|
|
#define COMMON_START \
|
|
|
|
|
struct sbuf sb; \
|
|
|
|
|
char *ps; \
|
|
|
|
|
int error, xlen
|
|
|
|
|
|
|
|
|
|
#define COMMON_END \
|
|
|
|
|
sbuf_finish(&sb); \
|
|
|
|
|
ps = sbuf_data(&sb) + uio->uio_offset; \
|
|
|
|
|
xlen = sbuf_len(&sb) - uio->uio_offset; \
|
|
|
|
|
xlen = imin(xlen, uio->uio_resid); \
|
|
|
|
|
error = (xlen <= 0 ? 0 : uiomove(ps, xlen, uio)); \
|
|
|
|
|
sbuf_delete(&sb); \
|
|
|
|
|
return (error)
|
2000-12-09 13:25:54 +00:00
|
|
|
|
|
2000-04-20 03:54:27 +00:00
|
|
|
|
int
|
|
|
|
|
linprocfs_domeminfo(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_START;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
unsigned long memtotal; /* total memory in bytes */
|
|
|
|
|
unsigned long memused; /* used memory in bytes */
|
|
|
|
|
unsigned long memfree; /* free memory in bytes */
|
|
|
|
|
unsigned long memshared; /* shared memory ??? */
|
|
|
|
|
unsigned long buffers, cached; /* buffer / cache memory ??? */
|
2001-05-19 05:54:26 +00:00
|
|
|
|
u_quad_t swaptotal; /* total swap space in bytes */
|
|
|
|
|
u_quad_t swapused; /* used swap space in bytes */
|
|
|
|
|
u_quad_t swapfree; /* free swap space in bytes */
|
2000-05-24 07:37:02 +00:00
|
|
|
|
vm_object_t object;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
|
|
|
|
if (uio->uio_rw != UIO_READ)
|
|
|
|
|
return (EOPNOTSUPP);
|
|
|
|
|
|
|
|
|
|
memtotal = physmem * PAGE_SIZE;
|
|
|
|
|
/*
|
|
|
|
|
* The correct thing here would be:
|
|
|
|
|
*
|
|
|
|
|
memfree = cnt.v_free_count * PAGE_SIZE;
|
|
|
|
|
memused = memtotal - memfree;
|
|
|
|
|
*
|
|
|
|
|
* but it might mislead linux binaries into thinking there
|
|
|
|
|
* is very little memory left, so we cheat and tell them that
|
|
|
|
|
* all memory that isn't wired down is free.
|
|
|
|
|
*/
|
|
|
|
|
memused = cnt.v_wire_count * PAGE_SIZE;
|
|
|
|
|
memfree = memtotal - memused;
|
2000-08-12 21:08:42 +00:00
|
|
|
|
if (swapblist == NULL) {
|
|
|
|
|
swaptotal = 0;
|
|
|
|
|
swapfree = 0;
|
|
|
|
|
} else {
|
2001-05-19 05:54:26 +00:00
|
|
|
|
swaptotal = (u_quad_t)swapblist->bl_blocks * 1024; /* XXX why 1024? */
|
|
|
|
|
swapfree = (u_quad_t)swapblist->bl_root->u.bmu_avail * PAGE_SIZE;
|
2000-08-12 21:08:42 +00:00
|
|
|
|
}
|
2000-04-20 03:54:27 +00:00
|
|
|
|
swapused = swaptotal - swapfree;
|
2000-05-24 07:37:02 +00:00
|
|
|
|
memshared = 0;
|
2001-01-23 22:13:07 +00:00
|
|
|
|
TAILQ_FOREACH(object, &vm_object_list, object_list)
|
2000-05-24 07:37:02 +00:00
|
|
|
|
if (object->shadow_count > 1)
|
|
|
|
|
memshared += object->resident_page_count;
|
|
|
|
|
memshared *= PAGE_SIZE;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
/*
|
|
|
|
|
* We'd love to be able to write:
|
|
|
|
|
*
|
|
|
|
|
buffers = bufspace;
|
|
|
|
|
*
|
|
|
|
|
* but bufspace is internal to vfs_bio.c and we don't feel
|
|
|
|
|
* like unstaticizing it just for linprocfs's sake.
|
|
|
|
|
*/
|
|
|
|
|
buffers = 0;
|
|
|
|
|
cached = cnt.v_cache_count * PAGE_SIZE;
|
|
|
|
|
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_new(&sb, NULL, 512, 0);
|
|
|
|
|
sbuf_printf(&sb,
|
2000-12-09 13:25:54 +00:00
|
|
|
|
" total: used: free: shared: buffers: cached:\n"
|
|
|
|
|
"Mem: %lu %lu %lu %lu %lu %lu\n"
|
2001-05-19 05:54:26 +00:00
|
|
|
|
"Swap: %llu %llu %llu\n"
|
2000-12-09 13:25:54 +00:00
|
|
|
|
"MemTotal: %9lu kB\n"
|
|
|
|
|
"MemFree: %9lu kB\n"
|
|
|
|
|
"MemShared:%9lu kB\n"
|
|
|
|
|
"Buffers: %9lu kB\n"
|
|
|
|
|
"Cached: %9lu kB\n"
|
2001-05-19 05:54:26 +00:00
|
|
|
|
"SwapTotal:%9llu kB\n"
|
|
|
|
|
"SwapFree: %9llu kB\n",
|
2000-12-09 13:25:54 +00:00
|
|
|
|
memtotal, memused, memfree, memshared, buffers, cached,
|
|
|
|
|
swaptotal, swapused, swapfree,
|
|
|
|
|
B2K(memtotal), B2K(memfree),
|
|
|
|
|
B2K(memshared), B2K(buffers), B2K(cached),
|
|
|
|
|
B2K(swaptotal), B2K(swapfree));
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_END;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_docpuinfo(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_START;
|
2000-12-09 13:25:54 +00:00
|
|
|
|
int class, i, fqmhz, fqkhz;
|
2000-10-25 22:38:23 +00:00
|
|
|
|
|
2000-12-09 13:25:54 +00:00
|
|
|
|
/*
|
|
|
|
|
* We default the flags to include all non-conflicting flags,
|
|
|
|
|
* and the Intel versions of conflicting flags.
|
|
|
|
|
*/
|
2000-10-25 22:38:23 +00:00
|
|
|
|
static char *flags[] = {
|
|
|
|
|
"fpu", "vme", "de", "pse", "tsc",
|
|
|
|
|
"msr", "pae", "mce", "cx8", "apic",
|
|
|
|
|
"sep", "sep", "mtrr", "pge", "mca",
|
|
|
|
|
"cmov", "pat", "pse36", "pn", "b19",
|
|
|
|
|
"b20", "b21", "mmxext", "mmx", "fxsr",
|
|
|
|
|
"xmm", "b26", "b27", "b28", "b29",
|
|
|
|
|
"3dnowext", "3dnow"
|
|
|
|
|
};
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
|
|
|
|
if (uio->uio_rw != UIO_READ)
|
|
|
|
|
return (EOPNOTSUPP);
|
|
|
|
|
|
|
|
|
|
switch (cpu_class) {
|
|
|
|
|
case CPUCLASS_286:
|
2000-10-25 22:38:23 +00:00
|
|
|
|
class = 2;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
break;
|
|
|
|
|
case CPUCLASS_386:
|
2000-10-25 22:38:23 +00:00
|
|
|
|
class = 3;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
break;
|
|
|
|
|
case CPUCLASS_486:
|
2000-10-25 22:38:23 +00:00
|
|
|
|
class = 4;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
break;
|
|
|
|
|
case CPUCLASS_586:
|
2000-10-25 22:38:23 +00:00
|
|
|
|
class = 5;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
break;
|
|
|
|
|
case CPUCLASS_686:
|
2000-10-25 22:38:23 +00:00
|
|
|
|
class = 6;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2000-10-25 22:38:23 +00:00
|
|
|
|
class = 0;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_new(&sb, NULL, 512, 0);
|
|
|
|
|
sbuf_printf(&sb,
|
2000-12-09 13:25:54 +00:00
|
|
|
|
"processor\t: %d\n"
|
|
|
|
|
"vendor_id\t: %.20s\n"
|
|
|
|
|
"cpu family\t: %d\n"
|
|
|
|
|
"model\t\t: %d\n"
|
|
|
|
|
"stepping\t: %d\n",
|
|
|
|
|
0, cpu_vendor, class, cpu, cpu_id & 0xf);
|
2000-10-25 22:38:23 +00:00
|
|
|
|
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_cat(&sb,
|
2000-12-09 13:25:54 +00:00
|
|
|
|
"flags\t\t:");
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
2000-10-25 22:38:23 +00:00
|
|
|
|
if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) {
|
|
|
|
|
flags[16] = "fcmov";
|
|
|
|
|
} else if (!strcmp(cpu_vendor, "CyrixInstead")) {
|
|
|
|
|
flags[24] = "cxmmx";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 32; i++)
|
|
|
|
|
if (cpu_feature & (1 << i))
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb, " %s", flags[i]);
|
|
|
|
|
sbuf_cat(&sb, "\n");
|
2000-10-25 22:38:23 +00:00
|
|
|
|
if (class >= 5) {
|
2000-12-09 13:25:54 +00:00
|
|
|
|
fqmhz = (tsc_freq + 4999) / 1000000;
|
|
|
|
|
fqkhz = ((tsc_freq + 4999) / 10000) % 100;
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb,
|
2000-12-09 13:25:54 +00:00
|
|
|
|
"cpu MHz\t\t: %d.%02d\n"
|
|
|
|
|
"bogomips\t: %d.%02d\n",
|
|
|
|
|
fqmhz, fqkhz, fqmhz, fqkhz);
|
2000-10-25 22:38:23 +00:00
|
|
|
|
}
|
2000-12-13 20:22:24 +00:00
|
|
|
|
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_END;
|
2000-09-09 11:44:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_dostat(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_START;
|
2000-09-09 11:44:58 +00:00
|
|
|
|
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_new(&sb, NULL, 512, 0);
|
|
|
|
|
sbuf_printf(&sb,
|
2000-12-09 13:25:54 +00:00
|
|
|
|
"cpu %ld %ld %ld %ld\n"
|
|
|
|
|
"disk 0 0 0 0\n"
|
|
|
|
|
"page %u %u\n"
|
|
|
|
|
"swap %u %u\n"
|
|
|
|
|
"intr %u\n"
|
|
|
|
|
"ctxt %u\n"
|
|
|
|
|
"btime %ld\n",
|
|
|
|
|
T2J(cp_time[CP_USER]),
|
|
|
|
|
T2J(cp_time[CP_NICE]),
|
|
|
|
|
T2J(cp_time[CP_SYS] /*+ cp_time[CP_INTR]*/),
|
|
|
|
|
T2J(cp_time[CP_IDLE]),
|
|
|
|
|
cnt.v_vnodepgsin,
|
|
|
|
|
cnt.v_vnodepgsout,
|
|
|
|
|
cnt.v_swappgsin,
|
|
|
|
|
cnt.v_swappgsout,
|
|
|
|
|
cnt.v_intr,
|
|
|
|
|
cnt.v_swtch,
|
|
|
|
|
boottime.tv_sec);
|
2000-12-13 20:22:24 +00:00
|
|
|
|
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_END;
|
2000-09-09 11:44:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_douptime(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_START;
|
2000-09-09 11:44:58 +00:00
|
|
|
|
struct timeval tv;
|
|
|
|
|
|
|
|
|
|
getmicrouptime(&tv);
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_new(&sb, NULL, 64, 0);
|
|
|
|
|
sbuf_printf(&sb, "%ld.%02ld %ld.%02ld\n",
|
2000-12-09 13:25:54 +00:00
|
|
|
|
tv.tv_sec, tv.tv_usec / 10000,
|
|
|
|
|
T2S(cp_time[CP_IDLE]), T2J(cp_time[CP_IDLE]) % 100);
|
2001-03-12 03:16:56 +00:00
|
|
|
|
|
|
|
|
|
COMMON_END;
|
2000-09-09 11:44:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_doversion(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_START;
|
2000-12-13 20:22:24 +00:00
|
|
|
|
|
|
|
|
|
sbuf_new(&sb, NULL, 128, 0);
|
|
|
|
|
sbuf_printf(&sb,
|
|
|
|
|
"%s version %s (des@freebsd.org) (gcc version " __VERSION__ ")"
|
|
|
|
|
" #4 Sun Dec 18 04:30:00 CET 1977\n",
|
|
|
|
|
linux_get_osname(curp),
|
|
|
|
|
linux_get_osrelease(curp));
|
2001-03-12 03:16:56 +00:00
|
|
|
|
|
|
|
|
|
COMMON_END;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
}
|
2000-09-09 11:44:58 +00:00
|
|
|
|
|
2001-05-19 05:54:26 +00:00
|
|
|
|
int
|
|
|
|
|
linprocfs_doloadavg(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
|
|
|
|
COMMON_START;
|
|
|
|
|
int lastpid, ilen;
|
|
|
|
|
|
|
|
|
|
ilen = sizeof(lastpid);
|
|
|
|
|
if (kernel_sysctlbyname(p, "kern.lastpid",
|
|
|
|
|
&lastpid, &ilen, NULL, 0, NULL) != 0)
|
|
|
|
|
lastpid = -1; /* fake it */
|
|
|
|
|
|
|
|
|
|
sbuf_new(&sb, NULL, 128, 0);
|
|
|
|
|
sbuf_printf(&sb,
|
|
|
|
|
"%d.%02d %d.%02d %d.%02d %d/%d %d\n",
|
|
|
|
|
(int)(averunnable.ldavg[0] / averunnable.fscale),
|
|
|
|
|
(int)(averunnable.ldavg[0] * 100 / averunnable.fscale % 100),
|
|
|
|
|
(int)(averunnable.ldavg[1] / averunnable.fscale),
|
|
|
|
|
(int)(averunnable.ldavg[1] * 100 / averunnable.fscale % 100),
|
|
|
|
|
(int)(averunnable.ldavg[2] / averunnable.fscale),
|
|
|
|
|
(int)(averunnable.ldavg[2] * 100 / averunnable.fscale % 100),
|
|
|
|
|
1, /* number of running tasks */
|
|
|
|
|
nprocs, /* number of tasks */
|
|
|
|
|
lastpid /* the last pid */
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
COMMON_END;
|
|
|
|
|
}
|
|
|
|
|
|
2000-10-25 22:12:59 +00:00
|
|
|
|
int
|
|
|
|
|
linprocfs_doprocstat(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_START;
|
2000-12-13 20:22:24 +00:00
|
|
|
|
struct kinfo_proc kp;
|
|
|
|
|
|
|
|
|
|
fill_kinfo_proc(p, &kp);
|
|
|
|
|
sbuf_new(&sb, NULL, 1024, 0);
|
|
|
|
|
sbuf_printf(&sb, "%d", p->p_pid);
|
|
|
|
|
#define PS_ADD(name, fmt, arg) sbuf_printf(&sb, " " fmt, arg)
|
2000-10-25 22:12:59 +00:00
|
|
|
|
PS_ADD("comm", "(%s)", p->p_comm);
|
|
|
|
|
PS_ADD("statr", "%c", '0'); /* XXX */
|
2001-03-07 03:21:26 +00:00
|
|
|
|
PROC_LOCK(p);
|
|
|
|
|
PS_ADD("ppid", "%d", p->p_pptr ? p->p_pptr->p_pid : 0);
|
|
|
|
|
PROC_UNLOCK(p);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
PS_ADD("pgrp", "%d", p->p_pgid);
|
|
|
|
|
PS_ADD("session", "%d", p->p_session->s_sid);
|
|
|
|
|
PS_ADD("tty", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("tpgid", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("flags", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("minflt", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("cminflt", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("majflt", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("cminflt", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("utime", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("stime", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("cutime", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("cstime", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("counter", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("priority", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("timeout", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("itrealvalue", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("starttime", "%d", 0); /* XXX */
|
2000-12-13 20:22:24 +00:00
|
|
|
|
PS_ADD("vsize", "%u", kp.ki_size);
|
|
|
|
|
PS_ADD("rss", "%u", P2K(kp.ki_rssize));
|
2000-10-25 22:12:59 +00:00
|
|
|
|
PS_ADD("rlim", "%u", 0); /* XXX */
|
2000-12-13 20:22:24 +00:00
|
|
|
|
PS_ADD("startcode", "%u", (unsigned)0);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
PS_ADD("endcode", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("startstack", "%u", 0); /* XXX */
|
2000-12-09 13:25:54 +00:00
|
|
|
|
PS_ADD("esp", "%u", 0); /* XXX */
|
|
|
|
|
PS_ADD("eip", "%u", 0); /* XXX */
|
2000-10-25 22:12:59 +00:00
|
|
|
|
PS_ADD("signal", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("blocked", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("sigignore", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("sigcatch", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("wchan", "%u", 0); /* XXX */
|
2000-12-09 13:25:54 +00:00
|
|
|
|
PS_ADD("nswap", "%lu", (long unsigned)0); /* XXX */
|
|
|
|
|
PS_ADD("cnswap", "%lu", (long unsigned)0); /* XXX */
|
|
|
|
|
PS_ADD("exitsignal", "%d", 0); /* XXX */
|
|
|
|
|
PS_ADD("processor", "%d", 0); /* XXX */
|
2000-10-25 22:12:59 +00:00
|
|
|
|
#undef PS_ADD
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_putc(&sb, '\n');
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_END;
|
2000-10-25 22:12:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Map process state to descriptive letter. Note that this does not
|
|
|
|
|
* quite correspond to what Linux outputs, but it's close enough.
|
|
|
|
|
*/
|
|
|
|
|
static char *state_str[] = {
|
|
|
|
|
"? (unknown)",
|
|
|
|
|
"I (idle)",
|
|
|
|
|
"R (running)",
|
|
|
|
|
"S (sleeping)",
|
|
|
|
|
"T (stopped)",
|
|
|
|
|
"Z (zombie)",
|
|
|
|
|
"W (waiting)",
|
|
|
|
|
"M (mutex)"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_doprocstatus(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_START;
|
2000-12-13 20:22:24 +00:00
|
|
|
|
struct kinfo_proc kp;
|
2000-10-25 22:12:59 +00:00
|
|
|
|
char *state;
|
2000-12-09 13:25:54 +00:00
|
|
|
|
segsz_t lsize;
|
2001-03-12 03:16:56 +00:00
|
|
|
|
int i;
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_new(&sb, NULL, 1024, 0);
|
|
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
|
mtx_lock_spin(&sched_lock);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
if (p->p_stat > sizeof state_str / sizeof *state_str)
|
|
|
|
|
state = state_str[0];
|
|
|
|
|
else
|
|
|
|
|
state = state_str[(int)p->p_stat];
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
|
mtx_unlock_spin(&sched_lock);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
2000-12-13 20:22:24 +00:00
|
|
|
|
fill_kinfo_proc(p, &kp);
|
|
|
|
|
sbuf_printf(&sb, "Name:\t%s\n", p->p_comm); /* XXX escape */
|
|
|
|
|
sbuf_printf(&sb, "State:\t%s\n", state);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Credentials
|
|
|
|
|
*/
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb, "Pid:\t%d\n", p->p_pid);
|
2001-01-23 22:13:07 +00:00
|
|
|
|
PROC_LOCK(p);
|
2001-03-07 03:21:26 +00:00
|
|
|
|
sbuf_printf(&sb, "PPid:\t%d\n", p->p_pptr ?
|
|
|
|
|
p->p_pptr->p_pid : 0);
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
sbuf_printf(&sb, "Uid:\t%d %d %d %d\n", p->p_ucred->cr_ruid,
|
2000-12-13 20:22:24 +00:00
|
|
|
|
p->p_ucred->cr_uid,
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
p->p_ucred->cr_svuid,
|
2000-12-13 20:22:24 +00:00
|
|
|
|
/* FreeBSD doesn't have fsuid */
|
|
|
|
|
p->p_ucred->cr_uid);
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
sbuf_printf(&sb, "Gid:\t%d %d %d %d\n", p->p_ucred->cr_rgid,
|
2000-12-13 20:22:24 +00:00
|
|
|
|
p->p_ucred->cr_gid,
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
p->p_ucred->cr_svgid,
|
2000-12-13 20:22:24 +00:00
|
|
|
|
/* FreeBSD doesn't have fsgid */
|
|
|
|
|
p->p_ucred->cr_gid);
|
|
|
|
|
sbuf_cat(&sb, "Groups:\t");
|
2000-10-25 22:12:59 +00:00
|
|
|
|
for (i = 0; i < p->p_ucred->cr_ngroups; i++)
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb, "%d ", p->p_ucred->cr_groups[i]);
|
2001-01-23 22:13:07 +00:00
|
|
|
|
PROC_UNLOCK(p);
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_putc(&sb, '\n');
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Memory
|
2000-12-09 13:25:54 +00:00
|
|
|
|
*
|
|
|
|
|
* While our approximation of VmLib may not be accurate (I
|
|
|
|
|
* don't know of a simple way to verify it, and I'm not sure
|
|
|
|
|
* it has much meaning anyway), I believe it's good enough.
|
|
|
|
|
*
|
|
|
|
|
* The same code that could (I think) accurately compute VmLib
|
|
|
|
|
* could also compute VmLck, but I don't really care enough to
|
|
|
|
|
* implement it. Submissions are welcome.
|
2000-10-25 22:12:59 +00:00
|
|
|
|
*/
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb, "VmSize:\t%8u kB\n", B2K(kp.ki_size));
|
|
|
|
|
sbuf_printf(&sb, "VmLck:\t%8u kB\n", P2K(0)); /* XXX */
|
|
|
|
|
sbuf_printf(&sb, "VmRss:\t%8u kB\n", P2K(kp.ki_rssize));
|
|
|
|
|
sbuf_printf(&sb, "VmData:\t%8u kB\n", P2K(kp.ki_dsize));
|
|
|
|
|
sbuf_printf(&sb, "VmStk:\t%8u kB\n", P2K(kp.ki_ssize));
|
|
|
|
|
sbuf_printf(&sb, "VmExe:\t%8u kB\n", P2K(kp.ki_tsize));
|
|
|
|
|
lsize = B2P(kp.ki_size) - kp.ki_dsize -
|
|
|
|
|
kp.ki_ssize - kp.ki_tsize - 1;
|
|
|
|
|
sbuf_printf(&sb, "VmLib:\t%8u kB\n", P2K(lsize));
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Signal masks
|
|
|
|
|
*
|
|
|
|
|
* We support up to 128 signals, while Linux supports 32,
|
|
|
|
|
* but we only define 32 (the same 32 as Linux, to boot), so
|
|
|
|
|
* just show the lower 32 bits of each mask. XXX hack.
|
|
|
|
|
*
|
|
|
|
|
* NB: on certain platforms (Sparc at least) Linux actually
|
|
|
|
|
* supports 64 signals, but this code is a long way from
|
|
|
|
|
* running on anything but i386, so ignore that for now.
|
|
|
|
|
*/
|
2001-01-23 22:13:07 +00:00
|
|
|
|
PROC_LOCK(p);
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb, "SigPnd:\t%08x\n", p->p_siglist.__bits[0]);
|
2000-12-09 13:25:54 +00:00
|
|
|
|
/*
|
|
|
|
|
* I can't seem to find out where the signal mask is in
|
|
|
|
|
* relation to struct proc, so SigBlk is left unimplemented.
|
|
|
|
|
*/
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb, "SigBlk:\t%08x\n", 0); /* XXX */
|
|
|
|
|
sbuf_printf(&sb, "SigIgn:\t%08x\n", p->p_sigignore.__bits[0]);
|
|
|
|
|
sbuf_printf(&sb, "SigCgt:\t%08x\n", p->p_sigcatch.__bits[0]);
|
2001-01-23 22:13:07 +00:00
|
|
|
|
PROC_UNLOCK(p);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Linux also prints the capability masks, but we don't have
|
|
|
|
|
* capabilities yet, and when we do get them they're likely to
|
|
|
|
|
* be meaningless to Linux programs, so we lie. XXX
|
|
|
|
|
*/
|
2000-12-13 20:22:24 +00:00
|
|
|
|
sbuf_printf(&sb, "CapInh:\t%016x\n", 0);
|
|
|
|
|
sbuf_printf(&sb, "CapPrm:\t%016x\n", 0);
|
|
|
|
|
sbuf_printf(&sb, "CapEff:\t%016x\n", 0);
|
|
|
|
|
|
2001-03-12 03:16:56 +00:00
|
|
|
|
COMMON_END;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_doselflink(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
|
|
|
|
char buf[16]; /* should be enough */
|
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
/* XXX shouldn't this be uio->uio_procp->p_pid? */
|
|
|
|
|
len = snprintf(buf, sizeof(buf), "%ld", (long)curproc->p_pid);
|
|
|
|
|
|
|
|
|
|
return (uiomove(buf, len, uio));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_doexelink(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
|
|
|
|
int error = 0;
|
|
|
|
|
char *fullpath = "unknown";
|
|
|
|
|
char *freepath = NULL;
|
|
|
|
|
|
|
|
|
|
p = PFIND(pfs->pfs_pid);
|
o Merge contents of struct pcred into struct ucred. Specifically, add the
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
2001-05-25 16:59:11 +00:00
|
|
|
|
if (p == NULL || p->p_ucred == NULL) {
|
2001-03-12 03:16:56 +00:00
|
|
|
|
if (p != NULL)
|
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
|
printf("doexelink: pid %d disappeared\n", pfs->pfs_pid);
|
|
|
|
|
} else {
|
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
|
/* fullpath/freepath are unchanged if textvp_fullpath fails */
|
|
|
|
|
error = textvp_fullpath(p, &fullpath, &freepath);
|
|
|
|
|
}
|
|
|
|
|
error = uiomove(fullpath, strlen(fullpath), uio);
|
|
|
|
|
if (freepath)
|
|
|
|
|
free(freepath, M_TEMP);
|
|
|
|
|
return (error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_donetdev(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
|
|
|
|
COMMON_START;
|
|
|
|
|
struct ifnet *ifp;
|
|
|
|
|
int eth_index = 0;
|
|
|
|
|
|
|
|
|
|
sbuf_new(&sb, NULL, 1024, 0);
|
|
|
|
|
sbuf_printf(&sb,
|
|
|
|
|
"Inter-| Receive "
|
|
|
|
|
" | Transmit\n"
|
|
|
|
|
" face |bytes packets errs drop fifo frame compressed "
|
|
|
|
|
"multicast|bytes packets errs drop fifo colls carrier "
|
|
|
|
|
"compressed\n");
|
|
|
|
|
|
|
|
|
|
TAILQ_FOREACH(ifp, &ifnet, if_link) {
|
|
|
|
|
if (strcmp(ifp->if_name, "lo") == 0) {
|
|
|
|
|
sbuf_printf(&sb, "%6.6s:", ifp->if_name);
|
|
|
|
|
} else {
|
|
|
|
|
sbuf_printf(&sb, "%5.5s%d:", "eth", eth_index);
|
|
|
|
|
eth_index++;
|
|
|
|
|
}
|
|
|
|
|
sbuf_printf(&sb,
|
|
|
|
|
"%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
|
|
|
|
|
"%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
COMMON_END;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_dodevices(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
|
|
|
|
COMMON_START;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
sbuf_new(&sb, NULL, 1024, 0);
|
|
|
|
|
sbuf_printf(&sb, "Character devices:\n");
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < NUMCDEVSW; i++) {
|
|
|
|
|
if (cdevsw[i] != NULL)
|
|
|
|
|
sbuf_printf(&sb, "%3d %s\n", i, cdevsw[i]->d_name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sbuf_printf(&sb, "\nBlock devices:\n");
|
|
|
|
|
|
|
|
|
|
COMMON_END;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
linprocfs_docmdline(curp, p, pfs, uio)
|
|
|
|
|
struct proc *curp;
|
|
|
|
|
struct proc *p;
|
|
|
|
|
struct pfsnode *pfs;
|
|
|
|
|
struct uio *uio;
|
|
|
|
|
{
|
|
|
|
|
COMMON_START;
|
|
|
|
|
|
|
|
|
|
sbuf_new(&sb, NULL, 128, 0);
|
|
|
|
|
sbuf_printf(&sb, "BOOT_IMAGE=%s", kernelname);
|
|
|
|
|
sbuf_printf(&sb, " ro root=302\n");
|
|
|
|
|
|
|
|
|
|
COMMON_END;
|
2000-10-25 22:12:59 +00:00
|
|
|
|
}
|