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-09-25 13:24:24 +00:00
|
|
|
|
#include <sys/queue.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-09-25 13:24:24 +00:00
|
|
|
|
#include <sys/exec.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-09-25 13:24:24 +00:00
|
|
|
|
#include <sys/linker.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-06-10 23:23:59 +00:00
|
|
|
|
#include <sys/mount.h>
|
2001-05-19 01:28:09 +00:00
|
|
|
|
#include <sys/mutex.h>
|
2001-10-21 15:56:46 +00:00
|
|
|
|
#include <sys/namei.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-09-25 13:24:24 +00:00
|
|
|
|
#include <sys/socket.h>
|
2001-05-19 05:54:26 +00:00
|
|
|
|
#include <sys/sysctl.h>
|
2001-09-25 13:24:24 +00:00
|
|
|
|
#include <sys/systm.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
#include <sys/tty.h>
|
2001-09-25 13:24:24 +00:00
|
|
|
|
#include <sys/user.h>
|
|
|
|
|
#include <sys/vmmeter.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
#include <sys/vnode.h>
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
2001-09-25 13:24:24 +00:00
|
|
|
|
#include <net/if.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-04-20 03:54:27 +00:00
|
|
|
|
#include <vm/swap_pager.h>
|
2000-12-09 13:25:54 +00:00
|
|
|
|
|
2000-10-25 22:38:23 +00:00
|
|
|
|
#include <machine/clock.h>
|
2001-06-11 21:55:40 +00:00
|
|
|
|
|
|
|
|
|
#ifdef __alpha__
|
|
|
|
|
#include <machine/alpha_cpu.h>
|
|
|
|
|
#include <machine/cpuconf.h>
|
|
|
|
|
#include <machine/rpb.h>
|
|
|
|
|
extern int ncpus;
|
|
|
|
|
#endif /* __alpha__ */
|
|
|
|
|
|
|
|
|
|
#ifdef __i386__
|
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>
|
2001-06-11 21:55:40 +00:00
|
|
|
|
#endif /* __i386__ */
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
o Introduce pr_mtx into struct prison, providing protection for the
mutable contents of struct prison (hostname, securelevel, refcount,
pr_linux, ...)
o Generally introduce mtx_lock()/mtx_unlock() calls throughout kern/
so as to enforce these protections, in particular, in kern_mib.c
protection sysctl access to the hostname and securelevel, as well as
kern_prot.c access to the securelevel for access control purposes.
o Rewrite linux emulator abstractions for accessing per-jail linux
mib entries (osname, osrelease, osversion) so that they don't return
a pointer to the text in the struct linux_prison, rather, a copy
to an array passed into the calls. Likewise, update linprocfs to
use these primitives.
o Update in_pcb.c to always use prison_getip() rather than directly
accessing struct prison.
Reviewed by: jhb
2001-12-03 16:12:27 +00:00
|
|
|
|
#include <machine/../linux/linux.h>
|
2001-10-19 01:45:03 +00:00
|
|
|
|
#include <compat/linux/linux_ioctl.h>
|
2000-12-13 20:22:24 +00:00
|
|
|
|
#include <compat/linux/linux_mib.h>
|
2001-10-21 15:56:46 +00:00
|
|
|
|
#include <compat/linux/linux_util.h>
|
2001-06-10 23:23:59 +00:00
|
|
|
|
#include <fs/pseudofs/pseudofs.h>
|
2001-10-01 04:31:05 +00:00
|
|
|
|
#include <fs/procfs/procfs.h>
|
2000-09-09 11:44:58 +00:00
|
|
|
|
|
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
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/meminfo
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_domeminfo(PFS_FILL_ARGS)
|
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
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb,
|
2001-06-11 00:17:59 +00:00
|
|
|
|
" total: used: free: shared: buffers: cached:\n"
|
2000-12-09 13:25:54 +00:00
|
|
|
|
"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-06-10 23:23:59 +00:00
|
|
|
|
return (0);
|
2000-04-20 03:54:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
#ifdef __alpha__
|
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/cpuinfo (Alpha version)
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
linprocfs_docpuinfo(PFS_FILL_ARGS)
|
|
|
|
|
{
|
|
|
|
|
u_int64_t type, major;
|
|
|
|
|
struct pcs *pcsp;
|
|
|
|
|
const char *model, *sysname;
|
|
|
|
|
|
|
|
|
|
static const char *cpuname[] = {
|
|
|
|
|
"EV3", "EV4", "Simulate", "LCA4", "EV5", "EV45", "EV56",
|
|
|
|
|
"EV6", "PCA56", "PCA57", "EV67", "EV68CB", "EV68AL"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
pcsp = LOCATE_PCS(hwrpb, hwrpb->rpb_primary_cpu_id);
|
|
|
|
|
type = pcsp->pcs_proc_type;
|
|
|
|
|
major = (type & PCS_PROC_MAJOR) >> PCS_PROC_MAJORSHIFT;
|
|
|
|
|
if (major < sizeof(cpuname)/sizeof(char *)) {
|
|
|
|
|
model = cpuname[major - 1];
|
|
|
|
|
} else {
|
|
|
|
|
model = "unknown";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sysname = alpha_dsr_sysname();
|
|
|
|
|
|
|
|
|
|
sbuf_printf(sb,
|
|
|
|
|
"cpu\t\t\t: Alpha\n"
|
|
|
|
|
"cpu model\t\t: %s\n"
|
|
|
|
|
"cpu variation\t\t: %ld\n"
|
|
|
|
|
"cpu revision\t\t: %ld\n"
|
|
|
|
|
"cpu serial number\t: %s\n"
|
|
|
|
|
"system type\t\t: %s\n"
|
|
|
|
|
"system variation\t: %s\n"
|
|
|
|
|
"system revision\t\t: %ld\n"
|
|
|
|
|
"system serial number\t: %s\n"
|
|
|
|
|
"cycle frequency [Hz]\t: %lu\n"
|
|
|
|
|
"timer frequency [Hz]\t: %lu\n"
|
|
|
|
|
"page size [bytes]\t: %ld\n"
|
|
|
|
|
"phys. address bits\t: %ld\n"
|
|
|
|
|
"max. addr. space #\t: %ld\n"
|
|
|
|
|
"BogoMIPS\t\t: %lu.%02lu\n"
|
|
|
|
|
"kernel unaligned acc\t: %ld (pc=%lx,va=%lx)\n"
|
|
|
|
|
"user unaligned acc\t: %ld (pc=%lx,va=%lx)\n"
|
|
|
|
|
"platform string\t\t: %s\n"
|
|
|
|
|
"cpus detected\t\t: %d\n"
|
|
|
|
|
,
|
|
|
|
|
model,
|
|
|
|
|
pcsp->pcs_proc_var,
|
|
|
|
|
*(int *)hwrpb->rpb_revision,
|
|
|
|
|
" ",
|
|
|
|
|
" ",
|
|
|
|
|
"0",
|
|
|
|
|
0,
|
|
|
|
|
" ",
|
|
|
|
|
hwrpb->rpb_cc_freq,
|
|
|
|
|
hz,
|
|
|
|
|
hwrpb->rpb_page_size,
|
|
|
|
|
hwrpb->rpb_phys_addr_size,
|
|
|
|
|
hwrpb->rpb_max_asn,
|
|
|
|
|
0, 0,
|
|
|
|
|
0, 0, 0,
|
|
|
|
|
0, 0, 0,
|
|
|
|
|
sysname,
|
|
|
|
|
ncpus);
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
#endif /* __alpha__ */
|
|
|
|
|
|
|
|
|
|
#ifdef __i386__
|
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/cpuinfo (i386 version)
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_docpuinfo(PFS_FILL_ARGS)
|
2000-04-20 03:54:27 +00:00
|
|
|
|
{
|
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
|
|
|
|
/*
|
2001-06-11 00:17:59 +00:00
|
|
|
|
* We default the flags to include all non-conflicting flags,
|
|
|
|
|
* and the Intel versions of conflicting flags.
|
2000-12-09 13:25:54 +00:00
|
|
|
|
*/
|
2001-06-11 00:17:59 +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",
|
2000-10-25 22:38:23 +00:00
|
|
|
|
"3dnowext", "3dnow"
|
|
|
|
|
};
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
|
|
|
|
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:
|
2001-06-11 00:17:59 +00:00
|
|
|
|
class = 0;
|
2000-04-20 03:54:27 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb,
|
2001-06-11 00:17:59 +00:00
|
|
|
|
"processor\t: %d\n"
|
2000-12-09 13:25:54 +00:00
|
|
|
|
"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
|
|
|
|
|
2001-06-11 00:17:59 +00:00
|
|
|
|
sbuf_cat(sb,
|
|
|
|
|
"flags\t\t:");
|
2000-04-20 03:54:27 +00:00
|
|
|
|
|
2001-06-11 00:17:59 +00:00
|
|
|
|
if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) {
|
2000-10-25 22:38:23 +00:00
|
|
|
|
flags[16] = "fcmov";
|
2001-06-11 00:17:59 +00:00
|
|
|
|
} else if (!strcmp(cpu_vendor, "CyrixInstead")) {
|
2000-10-25 22:38:23 +00:00
|
|
|
|
flags[24] = "cxmmx";
|
2001-06-11 00:17:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 32; i++)
|
2000-10-25 22:38:23 +00:00
|
|
|
|
if (cpu_feature & (1 << i))
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb, " %s", flags[i]);
|
|
|
|
|
sbuf_cat(sb, "\n");
|
2001-06-11 00:17:59 +00:00
|
|
|
|
if (class >= 5) {
|
2000-12-09 13:25:54 +00:00
|
|
|
|
fqmhz = (tsc_freq + 4999) / 1000000;
|
|
|
|
|
fqkhz = ((tsc_freq + 4999) / 10000) % 100;
|
2001-06-10 23:23:59 +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);
|
2001-06-11 00:17:59 +00:00
|
|
|
|
}
|
2000-12-13 20:22:24 +00:00
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
return (0);
|
2000-09-09 11:44:58 +00:00
|
|
|
|
}
|
2001-06-11 21:55:40 +00:00
|
|
|
|
#endif /* __i386__ */
|
2000-09-09 11:44:58 +00:00
|
|
|
|
|
2001-10-21 15:56:46 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/mtab
|
|
|
|
|
*
|
|
|
|
|
* This file doesn't exist in Linux' procfs, but is included here so
|
|
|
|
|
* users can symlink /compat/linux/etc/mtab to /proc/mtab
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
linprocfs_domtab(PFS_FILL_ARGS)
|
|
|
|
|
{
|
|
|
|
|
struct nameidata nd;
|
|
|
|
|
struct mount *mp;
|
2002-02-26 23:38:34 +00:00
|
|
|
|
const char *lep;
|
|
|
|
|
char *dlep, *flep, *mntto, *mntfrom, *fstype;
|
2001-10-21 15:56:46 +00:00
|
|
|
|
size_t lep_len;
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
/* resolve symlinks etc. in the emulation tree prefix */
|
|
|
|
|
NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td);
|
|
|
|
|
flep = NULL;
|
2002-02-26 23:38:34 +00:00
|
|
|
|
if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) == -1)
|
2001-10-21 15:56:46 +00:00
|
|
|
|
lep = linux_emul_path;
|
2002-02-26 23:38:34 +00:00
|
|
|
|
else
|
|
|
|
|
lep = dlep;
|
2001-10-21 15:56:46 +00:00
|
|
|
|
lep_len = strlen(lep);
|
|
|
|
|
|
|
|
|
|
mtx_lock(&mountlist_mtx);
|
|
|
|
|
error = 0;
|
|
|
|
|
TAILQ_FOREACH(mp, &mountlist, mnt_list) {
|
|
|
|
|
error = VFS_STATFS(mp, &mp->mnt_stat, td);
|
|
|
|
|
if (error)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* determine device name */
|
|
|
|
|
mntfrom = mp->mnt_stat.f_mntfromname;
|
|
|
|
|
|
|
|
|
|
/* determine mount point */
|
|
|
|
|
mntto = mp->mnt_stat.f_mntonname;
|
|
|
|
|
if (strncmp(mntto, lep, lep_len) == 0 &&
|
|
|
|
|
mntto[lep_len] == '/')
|
|
|
|
|
mntto += lep_len;
|
|
|
|
|
|
|
|
|
|
/* determine fs type */
|
|
|
|
|
fstype = mp->mnt_stat.f_fstypename;
|
|
|
|
|
if (strcmp(fstype, pn->pn_info->pi_name) == 0)
|
|
|
|
|
mntfrom = fstype = "proc";
|
|
|
|
|
else if (strcmp(fstype, "procfs") == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
sbuf_printf(sb, "%s %s %s %s", mntfrom, mntto, fstype,
|
|
|
|
|
mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw");
|
|
|
|
|
#define ADD_OPTION(opt, name) \
|
|
|
|
|
if (mp->mnt_stat.f_flags & (opt)) sbuf_printf(sb, "," name);
|
|
|
|
|
ADD_OPTION(MNT_SYNCHRONOUS, "sync");
|
|
|
|
|
ADD_OPTION(MNT_NOEXEC, "noexec");
|
|
|
|
|
ADD_OPTION(MNT_NOSUID, "nosuid");
|
|
|
|
|
ADD_OPTION(MNT_NODEV, "nodev");
|
|
|
|
|
ADD_OPTION(MNT_UNION, "union");
|
|
|
|
|
ADD_OPTION(MNT_ASYNC, "async");
|
|
|
|
|
ADD_OPTION(MNT_SUIDDIR, "suiddir");
|
|
|
|
|
ADD_OPTION(MNT_NOSYMFOLLOW, "nosymfollow");
|
|
|
|
|
ADD_OPTION(MNT_NOATIME, "noatime");
|
|
|
|
|
#undef ADD_OPTION
|
|
|
|
|
/* a real Linux mtab will also show NFS options */
|
|
|
|
|
sbuf_printf(sb, " 0 0\n");
|
|
|
|
|
}
|
|
|
|
|
mtx_unlock(&mountlist_mtx);
|
|
|
|
|
if (flep != NULL)
|
|
|
|
|
free(flep, M_TEMP);
|
|
|
|
|
return (error);
|
|
|
|
|
}
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/stat
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_dostat(PFS_FILL_ARGS)
|
2000-09-09 11:44:58 +00:00
|
|
|
|
{
|
2001-06-10 23:23:59 +00:00
|
|
|
|
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"
|
2001-10-29 02:17:41 +00:00
|
|
|
|
"btime %lld\n",
|
2000-12-09 13:25:54 +00:00
|
|
|
|
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,
|
2001-10-29 02:17:41 +00:00
|
|
|
|
(quad_t)boottime.tv_sec);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
return (0);
|
2000-09-09 11:44:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/uptime
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_douptime(PFS_FILL_ARGS)
|
2000-09-09 11:44:58 +00:00
|
|
|
|
{
|
|
|
|
|
struct timeval tv;
|
|
|
|
|
|
|
|
|
|
getmicrouptime(&tv);
|
2001-10-29 02:17:41 +00:00
|
|
|
|
sbuf_printf(sb, "%lld.%02ld %ld.%02ld\n",
|
|
|
|
|
(quad_t)tv.tv_sec, tv.tv_usec / 10000,
|
2000-12-09 13:25:54 +00:00
|
|
|
|
T2S(cp_time[CP_IDLE]), T2J(cp_time[CP_IDLE]) % 100);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
return (0);
|
2000-09-09 11:44:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/version
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_doversion(PFS_FILL_ARGS)
|
2000-09-09 11:44:58 +00:00
|
|
|
|
{
|
o Introduce pr_mtx into struct prison, providing protection for the
mutable contents of struct prison (hostname, securelevel, refcount,
pr_linux, ...)
o Generally introduce mtx_lock()/mtx_unlock() calls throughout kern/
so as to enforce these protections, in particular, in kern_mib.c
protection sysctl access to the hostname and securelevel, as well as
kern_prot.c access to the securelevel for access control purposes.
o Rewrite linux emulator abstractions for accessing per-jail linux
mib entries (osname, osrelease, osversion) so that they don't return
a pointer to the text in the struct linux_prison, rather, a copy
to an array passed into the calls. Likewise, update linprocfs to
use these primitives.
o Update in_pcb.c to always use prison_getip() rather than directly
accessing struct prison.
Reviewed by: jhb
2001-12-03 16:12:27 +00:00
|
|
|
|
char osname[LINUX_MAX_UTSNAME];
|
|
|
|
|
char osrelease[LINUX_MAX_UTSNAME];
|
|
|
|
|
|
|
|
|
|
linux_get_osname(td->td_proc, osname);
|
|
|
|
|
linux_get_osrelease(td->td_proc, osrelease);
|
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb,
|
2000-12-13 20:22:24 +00:00
|
|
|
|
"%s version %s (des@freebsd.org) (gcc version " __VERSION__ ")"
|
o Introduce pr_mtx into struct prison, providing protection for the
mutable contents of struct prison (hostname, securelevel, refcount,
pr_linux, ...)
o Generally introduce mtx_lock()/mtx_unlock() calls throughout kern/
so as to enforce these protections, in particular, in kern_mib.c
protection sysctl access to the hostname and securelevel, as well as
kern_prot.c access to the securelevel for access control purposes.
o Rewrite linux emulator abstractions for accessing per-jail linux
mib entries (osname, osrelease, osversion) so that they don't return
a pointer to the text in the struct linux_prison, rather, a copy
to an array passed into the calls. Likewise, update linprocfs to
use these primitives.
o Update in_pcb.c to always use prison_getip() rather than directly
accessing struct prison.
Reviewed by: jhb
2001-12-03 16:12:27 +00:00
|
|
|
|
" #4 Sun Dec 18 04:30:00 CET 1977\n", osname, osrelease);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
return (0);
|
2000-04-20 03:54:27 +00:00
|
|
|
|
}
|
2000-09-09 11:44:58 +00:00
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/loadavg
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_doloadavg(PFS_FILL_ARGS)
|
2001-05-19 05:54:26 +00:00
|
|
|
|
{
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb,
|
2001-05-19 05:54:26 +00:00
|
|
|
|
"%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 */
|
2001-06-11 23:00:35 +00:00
|
|
|
|
lastpid /* the last pid */
|
2001-05-19 05:54:26 +00:00
|
|
|
|
);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
|
|
|
|
|
return (0);
|
2001-05-19 05:54:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/pid/stat
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_doprocstat(PFS_FILL_ARGS)
|
2000-10-25 22:12:59 +00:00
|
|
|
|
{
|
2000-12-13 20:22:24 +00:00
|
|
|
|
struct kinfo_proc kp;
|
|
|
|
|
|
2002-04-09 20:10:46 +00:00
|
|
|
|
PROC_LOCK(p);
|
2000-12-13 20:22:24 +00:00
|
|
|
|
fill_kinfo_proc(p, &kp);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
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
|
|
|
|
PS_ADD("ppid", "%d", p->p_pptr ? p->p_pptr->p_pid : 0);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
PS_ADD("pgrp", "%d", p->p_pgid);
|
|
|
|
|
PS_ADD("session", "%d", p->p_session->s_sid);
|
2002-02-23 11:12:57 +00:00
|
|
|
|
PROC_UNLOCK(p);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
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
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_putc(sb, '\n');
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
return (0);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/pid/status
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_doprocstatus(PFS_FILL_ARGS)
|
2000-10-25 22:12:59 +00:00
|
|
|
|
{
|
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;
|
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
|
|
|
|
struct thread *td2;
|
2001-03-12 03:16:56 +00:00
|
|
|
|
int i;
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
Change and clean the mutex lock interface.
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
2001-02-09 06:11:45 +00:00
|
|
|
|
mtx_lock_spin(&sched_lock);
|
Part 1 of KSE-III
The ability to schedule multiple threads per process
(one one cpu) by making ALL system calls optionally asynchronous.
to come: ia64 and power-pc patches, patches for gdb, test program (in tools)
Reviewed by: Almost everyone who counts
(at various times, peter, jhb, matt, alfred, mini, bernd,
and a cast of thousands)
NOTE: this is still Beta code, and contains lots of debugging stuff.
expect slight instability in signals..
2002-06-29 17:26:22 +00:00
|
|
|
|
td2 = FIRST_THREAD_IN_PROC(p); /* XXXKSE pretend only one thread */
|
|
|
|
|
|
|
|
|
|
if (P_SHOULDSTOP(p)) {
|
|
|
|
|
state = "T (stopped)";
|
|
|
|
|
} else {
|
|
|
|
|
switch(p->p_state) {
|
|
|
|
|
case PRS_NEW:
|
|
|
|
|
state = "I (idle)";
|
|
|
|
|
break;
|
|
|
|
|
case PRS_NORMAL:
|
|
|
|
|
if (p->p_flag & P_WEXIT) {
|
|
|
|
|
state = "X (exiting)";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
switch(td2->td_state) {
|
2002-09-11 08:13:56 +00:00
|
|
|
|
case TDS_INHIBITED:
|
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
|
|
|
|
state = "S (sleeping)";
|
|
|
|
|
break;
|
|
|
|
|
case TDS_RUNQ:
|
|
|
|
|
case TDS_RUNNING:
|
|
|
|
|
state = "R (running)";
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
state = "? (unknown)";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case PRS_ZOMBIE:
|
|
|
|
|
state = "Z (zombie)";
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
state = "? (unknown)";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
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
|
|
|
|
|
2002-04-09 20:10:46 +00:00
|
|
|
|
PROC_LOCK(p);
|
2000-12-13 20:22:24 +00:00
|
|
|
|
fill_kinfo_proc(p, &kp);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb, "Name:\t%s\n", p->p_comm); /* XXX escape */
|
2001-06-11 00:17:59 +00:00
|
|
|
|
sbuf_printf(sb, "State:\t%s\n", state);
|
2000-10-25 22:12:59 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Credentials
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb, "Pid:\t%d\n", p->p_pid);
|
|
|
|
|
sbuf_printf(sb, "PPid:\t%d\n", p->p_pptr ?
|
2001-03-07 03:21:26 +00:00
|
|
|
|
p->p_pptr->p_pid : 0);
|
2001-06-11 00:17:59 +00:00
|
|
|
|
sbuf_printf(sb, "Uid:\t%d %d %d %d\n", p->p_ucred->cr_ruid,
|
|
|
|
|
p->p_ucred->cr_uid,
|
|
|
|
|
p->p_ucred->cr_svuid,
|
|
|
|
|
/* FreeBSD doesn't have fsuid */
|
|
|
|
|
p->p_ucred->cr_uid);
|
|
|
|
|
sbuf_printf(sb, "Gid:\t%d %d %d %d\n", p->p_ucred->cr_rgid,
|
|
|
|
|
p->p_ucred->cr_gid,
|
|
|
|
|
p->p_ucred->cr_svgid,
|
|
|
|
|
/* FreeBSD doesn't have fsgid */
|
|
|
|
|
p->p_ucred->cr_gid);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_cat(sb, "Groups:\t");
|
2000-10-25 22:12:59 +00:00
|
|
|
|
for (i = 0; i < p->p_ucred->cr_ngroups; i++)
|
2001-06-11 00:17:59 +00:00
|
|
|
|
sbuf_printf(sb, "%d ", p->p_ucred->cr_groups[i]);
|
2001-01-23 22:13:07 +00:00
|
|
|
|
PROC_UNLOCK(p);
|
2001-06-10 23:23:59 +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
|
|
|
|
*/
|
2001-06-10 23:23:59 +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));
|
2000-12-13 20:22:24 +00:00
|
|
|
|
lsize = B2P(kp.ki_size) - kp.ki_dsize -
|
|
|
|
|
kp.ki_ssize - kp.ki_tsize - 1;
|
2001-06-10 23:23:59 +00:00
|
|
|
|
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);
|
2002-10-01 17:15:53 +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.
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +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
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +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);
|
|
|
|
|
|
|
|
|
|
return (0);
|
2001-03-12 03:16:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/pid/cmdline
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
linprocfs_doproccmdline(PFS_FILL_ARGS)
|
|
|
|
|
{
|
|
|
|
|
struct ps_strings pstr;
|
|
|
|
|
int error, i;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If we are using the ps/cmdline caching, use that. Otherwise
|
|
|
|
|
* revert back to the old way which only implements full cmdline
|
|
|
|
|
* for the currept process and just p->p_comm for all other
|
|
|
|
|
* processes.
|
|
|
|
|
* Note that if the argv is no longer available, we deliberately
|
|
|
|
|
* don't fall back on p->p_comm or return an error: the authentic
|
|
|
|
|
* Linux behaviour is to return zero-length in this case.
|
|
|
|
|
*/
|
|
|
|
|
|
2002-04-13 23:09:41 +00:00
|
|
|
|
PROC_LOCK(p);
|
2002-05-19 00:14:50 +00:00
|
|
|
|
if (p->p_args && (ps_argsopen || !p_cansee(td, p))) {
|
2002-04-13 23:09:41 +00:00
|
|
|
|
sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length);
|
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
|
} else if (p != td->td_proc) {
|
|
|
|
|
PROC_UNLOCK(p);
|
|
|
|
|
sbuf_printf(sb, "%.*s", MAXCOMLEN, p->p_comm);
|
|
|
|
|
} else {
|
|
|
|
|
PROC_UNLOCK(p);
|
2002-09-21 22:07:17 +00:00
|
|
|
|
error = copyin((void *)p->p_sysent->sv_psstrings, &pstr,
|
|
|
|
|
sizeof(pstr));
|
2002-04-13 23:09:41 +00:00
|
|
|
|
if (error)
|
|
|
|
|
return (error);
|
|
|
|
|
for (i = 0; i < pstr.ps_nargvstr; i++) {
|
|
|
|
|
sbuf_copyin(sb, pstr.ps_argvstr[i], 0);
|
|
|
|
|
sbuf_printf(sb, "%c", '\0');
|
2001-06-11 21:55:40 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/net/dev
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_donetdev(PFS_FILL_ARGS)
|
2001-03-12 03:16:56 +00:00
|
|
|
|
{
|
2001-10-19 01:45:03 +00:00
|
|
|
|
char ifname[16]; /* XXX LINUX_IFNAMSIZ */
|
2001-03-12 03:16:56 +00:00
|
|
|
|
struct ifnet *ifp;
|
|
|
|
|
|
2001-10-19 01:45:03 +00:00
|
|
|
|
sbuf_printf(sb, "%6s|%58s|%s\n%6s|%58s|%58s\n",
|
2001-09-25 13:24:24 +00:00
|
|
|
|
"Inter-", " Receive", " Transmit", " face",
|
2001-10-19 01:45:03 +00:00
|
|
|
|
"bytes packets errs drop fifo frame compressed",
|
2001-09-25 13:24:24 +00:00
|
|
|
|
"bytes packets errs drop fifo frame compressed");
|
2001-03-12 03:16:56 +00:00
|
|
|
|
|
2002-12-22 05:35:03 +00:00
|
|
|
|
IFNET_RLOCK();
|
2001-03-12 03:16:56 +00:00
|
|
|
|
TAILQ_FOREACH(ifp, &ifnet, if_link) {
|
2001-10-19 01:45:03 +00:00
|
|
|
|
linux_ifname(ifp, ifname, sizeof ifname);
|
|
|
|
|
sbuf_printf(sb, "%6.6s:", ifname);
|
2001-09-25 13:24:24 +00:00
|
|
|
|
sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ",
|
|
|
|
|
0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL);
|
|
|
|
|
sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
|
|
|
|
|
0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL);
|
2001-03-12 03:16:56 +00:00
|
|
|
|
}
|
2002-12-22 05:35:03 +00:00
|
|
|
|
IFNET_RUNLOCK();
|
2001-06-10 23:23:59 +00:00
|
|
|
|
|
|
|
|
|
return (0);
|
2001-03-12 03:16:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-10-26 15:30:44 +00:00
|
|
|
|
#if 0
|
|
|
|
|
extern struct cdevsw *cdevsw[];
|
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/devices
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_dodevices(PFS_FILL_ARGS)
|
2001-03-12 03:16:56 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb, "Character devices:\n");
|
2001-03-12 03:16:56 +00:00
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
for (i = 0; i < NUMCDEVSW; i++)
|
2001-03-12 03:16:56 +00:00
|
|
|
|
if (cdevsw[i] != NULL)
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb, "%3d %s\n", i, cdevsw[i]->d_name);
|
2001-03-12 03:16:56 +00:00
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb, "\nBlock devices:\n");
|
|
|
|
|
|
|
|
|
|
return (0);
|
2001-03-12 03:16:56 +00:00
|
|
|
|
}
|
2001-10-26 15:30:44 +00:00
|
|
|
|
#endif
|
2001-03-12 03:16:56 +00:00
|
|
|
|
|
2001-06-11 21:55:40 +00:00
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/cmdline
|
|
|
|
|
*/
|
2001-06-10 23:23:59 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_docmdline(PFS_FILL_ARGS)
|
2001-03-12 03:16:56 +00:00
|
|
|
|
{
|
2001-06-10 23:23:59 +00:00
|
|
|
|
sbuf_printf(sb, "BOOT_IMAGE=%s", kernelname);
|
|
|
|
|
sbuf_printf(sb, " ro root=302\n");
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
2001-09-25 13:24:24 +00:00
|
|
|
|
#if 0
|
|
|
|
|
/*
|
|
|
|
|
* Filler function for proc/modules
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
linprocfs_domodules(PFS_FILL_ARGS)
|
|
|
|
|
{
|
|
|
|
|
struct linker_file *lf;
|
|
|
|
|
|
|
|
|
|
TAILQ_FOREACH(lf, &linker_files, link) {
|
|
|
|
|
sbuf_printf(sb, "%-20s%8lu%4d\n", lf->filename,
|
|
|
|
|
(unsigned long)lf->size, lf->refs);
|
|
|
|
|
}
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-06-10 23:23:59 +00:00
|
|
|
|
/*
|
2001-10-19 01:45:03 +00:00
|
|
|
|
* Constructor
|
2001-06-10 23:23:59 +00:00
|
|
|
|
*/
|
2001-10-19 01:45:03 +00:00
|
|
|
|
static int
|
|
|
|
|
linprocfs_init(PFS_INIT_ARGS)
|
|
|
|
|
{
|
|
|
|
|
struct pfs_node *root;
|
|
|
|
|
struct pfs_node *dir;
|
|
|
|
|
|
|
|
|
|
root = pi->pi_root;
|
|
|
|
|
|
|
|
|
|
#define PFS_CREATE_FILE(name) \
|
|
|
|
|
pfs_create_file(root, #name, &linprocfs_do##name, NULL, NULL, PFS_RD)
|
|
|
|
|
PFS_CREATE_FILE(cmdline);
|
|
|
|
|
PFS_CREATE_FILE(cpuinfo);
|
2001-10-26 15:30:44 +00:00
|
|
|
|
#if 0
|
2001-10-19 01:45:03 +00:00
|
|
|
|
PFS_CREATE_FILE(devices);
|
2001-10-26 15:30:44 +00:00
|
|
|
|
#endif
|
2001-10-19 01:45:03 +00:00
|
|
|
|
PFS_CREATE_FILE(loadavg);
|
|
|
|
|
PFS_CREATE_FILE(meminfo);
|
2001-09-25 13:24:24 +00:00
|
|
|
|
#if 0
|
2001-10-19 01:45:03 +00:00
|
|
|
|
PFS_CREATE_FILE(modules);
|
2001-09-25 13:24:24 +00:00
|
|
|
|
#endif
|
2001-10-21 15:56:46 +00:00
|
|
|
|
PFS_CREATE_FILE(mtab);
|
2001-10-19 01:45:03 +00:00
|
|
|
|
PFS_CREATE_FILE(stat);
|
|
|
|
|
PFS_CREATE_FILE(uptime);
|
|
|
|
|
PFS_CREATE_FILE(version);
|
|
|
|
|
#undef PFS_CREATE_FILE
|
2001-12-09 00:38:59 +00:00
|
|
|
|
pfs_create_link(root, "self", &procfs_docurproc,
|
2001-10-19 01:45:03 +00:00
|
|
|
|
NULL, NULL, 0);
|
|
|
|
|
|
|
|
|
|
dir = pfs_create_dir(root, "net", NULL, NULL, 0);
|
|
|
|
|
pfs_create_file(dir, "dev", &linprocfs_donetdev,
|
|
|
|
|
NULL, NULL, PFS_RD);
|
|
|
|
|
|
|
|
|
|
dir = pfs_create_dir(root, "pid", NULL, NULL, PFS_PROCDEP);
|
|
|
|
|
pfs_create_file(dir, "cmdline", &linprocfs_doproccmdline,
|
|
|
|
|
NULL, NULL, PFS_RD);
|
2001-12-09 00:38:59 +00:00
|
|
|
|
pfs_create_link(dir, "exe", &procfs_doprocfile,
|
|
|
|
|
NULL, &procfs_notsystem, 0);
|
2001-10-19 01:45:03 +00:00
|
|
|
|
pfs_create_file(dir, "mem", &procfs_doprocmem,
|
|
|
|
|
&procfs_attr, &procfs_candebug, PFS_RDWR|PFS_RAW);
|
|
|
|
|
pfs_create_file(dir, "stat", &linprocfs_doprocstat,
|
|
|
|
|
NULL, NULL, PFS_RD);
|
|
|
|
|
pfs_create_file(dir, "status", &linprocfs_doprocstatus,
|
|
|
|
|
NULL, NULL, PFS_RD);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
|
2001-10-19 01:45:03 +00:00
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Destructor
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
linprocfs_uninit(PFS_INIT_ARGS)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
/* nothing to do, pseudofs will GC */
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
2001-06-10 23:23:59 +00:00
|
|
|
|
|
2001-10-19 01:45:03 +00:00
|
|
|
|
PSEUDOFS(linprocfs, 1);
|
2001-06-10 23:23:59 +00:00
|
|
|
|
MODULE_DEPEND(linprocfs, linux, 1, 1, 1);
|
|
|
|
|
MODULE_DEPEND(linprocfs, procfs, 1, 1, 1);
|