Module Name: src
Committed By: mrg
Date: Fri Sep 14 01:55:20 UTC 2018
Modified Files:
src/sys/kern: files.kern
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Added Files:
src/sys/kern: kern_reboot.c kern_scdebug.c
Log Message:
retire kern_xxx.c. long live kern_xxx.c.
split it into kern_reboot.c and kern_scdebug.c. while here,
add my copyright to kern_scdebug.c as it was largely rewritten
for kernhist support.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/kern/files.kern
cvs rdiff -u -r0 -r1.1 src/sys/kern/kern_reboot.c src/sys/kern/kern_scdebug.c
cvs rdiff -u -r1.170 -r1.171 src/sys/rump/librump/rumpkern/Makefile.rumpkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/files.kern
diff -u src/sys/kern/files.kern:1.22 src/sys/kern/files.kern:1.23
--- src/sys/kern/files.kern:1.22 Mon Aug 20 11:35:28 2018
+++ src/sys/kern/files.kern Fri Sep 14 01:55:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.kern,v 1.22 2018/08/20 11:35:28 maxv Exp $
+# $NetBSD: files.kern,v 1.23 2018/09/14 01:55:19 mrg Exp $
#
# kernel sources
@@ -66,6 +66,7 @@ file kern/kern_proc.c kern
file kern/kern_prot.c kern
file kern/kern_ras.c kern
file kern/kern_rate.c kern
+file kern/kern_reboot.c kern
file kern/kern_resource.c kern
file kern/kern_rndpool.c kern
file kern/kern_rndq.c kern
@@ -73,6 +74,7 @@ file kern/kern_rndsink.c kern
file kern/kern_runq.c kern
file kern/kern_rwlock.c kern
file kern/kern_rwlock_obj.c kern
+file kern/kern_scdebug.c kern
file kern/kern_sdt.c kdtrace_hooks
file kern/kern_sig.c kern
file kern/kern_sleepq.c kern
@@ -90,7 +92,6 @@ file kern/kern_turnstile.c kern
file kern/kern_todr.c kern
file kern/kern_uidinfo.c kern
file kern/kern_uuid.c kern
-file kern/kern_xxx.c kern
file kern/kgdb_stub.c kgdb
file kern/sched_4bsd.c sched_4bsd
file kern/sched_m2.c sched_m2
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.170 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.171
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.170 Tue Jul 25 05:01:25 2017
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Fri Sep 14 01:55:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.170 2017/07/25 05:01:25 ozaki-r Exp $
+# $NetBSD: Makefile.rumpkern,v 1.171 2018/09/14 01:55:20 mrg Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -81,11 +81,13 @@ SRCS+= init_sysctl_base.c \
kern_proc.c \
kern_prot.c \
kern_rate.c \
+ kern_reboot.c \
kern_resource.c \
kern_rndpool.c \
kern_rndq.c \
kern_rndsink.c \
kern_rwlock_obj.c \
+ kern_scdebug.c \
kern_stub.c \
kern_ssp.c \
kern_syscall.c \
@@ -94,7 +96,6 @@ SRCS+= init_sysctl_base.c \
kern_time.c \
kern_timeout.c \
kern_uidinfo.c \
- kern_xxx.c \
param.c \
subr_callback.c \
subr_copy.c \
Added files:
Index: src/sys/kern/kern_reboot.c
diff -u /dev/null src/sys/kern/kern_reboot.c:1.1
--- /dev/null Fri Sep 14 01:55:20 2018
+++ src/sys/kern/kern_reboot.c Fri Sep 14 01:55:19 2018
@@ -0,0 +1,76 @@
+/* $NetBSD: kern_reboot.c,v 1.1 2018/09/14 01:55:19 mrg Exp $ */
+
+/*
+ * Copyright (c) 1982, 1986, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)kern_xxx.c 8.3 (Berkeley) 2/14/95
+ * from: NetBSD: kern_xxx.c,v 1.74 2017/10/28 00:37:11 pgoyette Exp
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: kern_reboot.c,v 1.1 2018/09/14 01:55:19 mrg Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
+#include <sys/syscall.h>
+#include <sys/syscallargs.h>
+#include <sys/kauth.h>
+
+/* ARGSUSED */
+int
+sys_reboot(struct lwp *l, const struct sys_reboot_args *uap, register_t *retval)
+{
+ /* {
+ syscallarg(int) opt;
+ syscallarg(char *) bootstr;
+ } */
+ int error;
+ char *bootstr, bs[128];
+
+ if ((error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_REBOOT,
+ 0, NULL, NULL, NULL)) != 0)
+ return (error);
+
+ /*
+ * Only use the boot string if RB_STRING is set.
+ */
+ if ((SCARG(uap, opt) & RB_STRING) &&
+ (error = copyinstr(SCARG(uap, bootstr), bs, sizeof(bs), 0)) == 0)
+ bootstr = bs;
+ else
+ bootstr = NULL;
+ /*
+ * Not all ports use the bootstr currently.
+ */
+ KERNEL_LOCK(1, NULL);
+ cpu_reboot(SCARG(uap, opt), bootstr);
+ KERNEL_UNLOCK_ONE(NULL);
+ return (0);
+}
Index: src/sys/kern/kern_scdebug.c
diff -u /dev/null src/sys/kern/kern_scdebug.c:1.1
--- /dev/null Fri Sep 14 01:55:20 2018
+++ src/sys/kern/kern_scdebug.c Fri Sep 14 01:55:19 2018
@@ -0,0 +1,303 @@
+/* $NetBSD: kern_scdebug.c,v 1.1 2018/09/14 01:55:19 mrg Exp $ */
+
+/*
+ * Copyright (c) 2015 Matthew R. Green
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * Copyright (c) 1982, 1986, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)kern_xxx.c 8.3 (Berkeley) 2/14/95
+ * from: NetBSD: kern_xxx.c,v 1.74 2017/10/28 00:37:11 pgoyette Exp
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: kern_scdebug.c,v 1.1 2018/09/14 01:55:19 mrg Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_syscall_debug.h"
+#include "opt_kernhist.h"
+#endif
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
+#include <sys/mount.h>
+#include <sys/syscall.h>
+#include <sys/syscallargs.h>
+#include <sys/kernhist.h>
+
+/*
+ * Pull in the indirect syscall functions here.
+ * They are only actually used if the ports syscall entry code
+ * doesn't special-case SYS_SYSCALL and SYS___SYSCALL
+ *
+ * In some cases the generated code for the two functions is identical,
+ * but there isn't a MI way of determining that - so we don't try.
+ */
+
+#define SYS_SYSCALL sys_syscall
+#include "sys_syscall.c"
+#undef SYS_SYSCALL
+
+#define SYS_SYSCALL sys___syscall
+#include "sys_syscall.c"
+#undef SYS_SYSCALL
+
+#ifdef SYSCALL_DEBUG
+#define SCDEBUG_CALLS 0x0001 /* show calls */
+#define SCDEBUG_RETURNS 0x0002 /* show returns */
+#define SCDEBUG_ALL 0x0004 /* even syscalls that are not implemented */
+#define SCDEBUG_SHOWARGS 0x0008 /* show arguments to calls */
+#define SCDEBUG_KERNHIST 0x0010 /* use kernhist instead of printf */
+
+#ifndef SCDEBUG_DEFAULT
+#define SCDEBUG_DEFAULT (SCDEBUG_CALLS|SCDEBUG_RETURNS|SCDEBUG_SHOWARGS)
+#endif
+
+int scdebug = SCDEBUG_DEFAULT;
+
+#ifdef KERNHIST
+KERNHIST_DEFINE(scdebughist);
+#define SCDEBUG_KERNHIST_FUNC(a) KERNHIST_FUNC(a)
+#define SCDEBUG_KERNHIST_CALLED(a) KERNHIST_CALLED(a)
+#define SCDEBUG_KERNHIST_LOG(a,b,c,d,e,f) KERNHIST_LOG(a,b,c,d,e,f)
+#else
+#define SCDEBUG_KERNHIST_FUNC(a) /* nothing */
+#define SCDEBUG_KERNHIST_CALLED(a) /* nothing */
+#define SCDEBUG_KERNHIST_LOG(a,b,c,d,e,f) /* nothing */
+/* The non-kernhist support version can elide all this code easily. */
+#undef SCDEBUG_KERNHIST
+#define SCDEBUG_KERNHIST 0
+#endif
+
+#ifdef __HAVE_MINIMAL_EMUL
+#define CODE_NOT_OK(code, em) ((int)(code) < 0)
+#else
+#define CODE_NOT_OK(code, em) (((int)(code) < 0) || \
+ ((int)(code) >= (em)->e_nsysent))
+#endif
+
+void
+scdebug_call(register_t code, const register_t args[])
+{
+ SCDEBUG_KERNHIST_FUNC("scdebug_call");
+ struct lwp *l = curlwp;
+ struct proc *p = l->l_proc;
+ const struct sysent *sy;
+ const struct emul *em;
+ int i;
+
+ if ((scdebug & SCDEBUG_CALLS) == 0)
+ return;
+
+ if (scdebug & SCDEBUG_KERNHIST)
+ SCDEBUG_KERNHIST_CALLED(scdebughist);
+
+ em = p->p_emul;
+ sy = &em->e_sysent[code];
+
+ if ((scdebug & SCDEBUG_ALL) == 0 &&
+ (CODE_NOT_OK(code, em) || sy->sy_call == sys_nosys)) {
+ if (scdebug & SCDEBUG_KERNHIST)
+ SCDEBUG_KERNHIST_LOG(scdebughist, "", 0, 0, 0, 0);
+ return;
+ }
+
+ /*
+ * The kernhist version of scdebug needs to restrict the usage
+ * compared to the normal version. histories must avoid these
+ * sorts of usage:
+ *
+ * - the format string *must* be literal, as it is used
+ * at display time in the kernel or userland
+ * - strings in the format will cause vmstat -u to crash
+ * so avoid using %s formats
+ *
+ * to avoid these, we have a fairly long block to print args
+ * as the format needs to change for each, and we can't just
+ * call printf() on each argument until we're done.
+ */
+ if (scdebug & SCDEBUG_KERNHIST) {
+ if (CODE_NOT_OK(code, em)) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "pid %jd:%jd: OUT OF RANGE (%jd)",
+ p->p_pid, l->l_lid, code, 0);
+ } else {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "pid %jd:%jd: num %jd call %#jx",
+ p->p_pid, l->l_lid, code, (uintptr_t)sy->sy_call);
+ if ((scdebug & SCDEBUG_SHOWARGS) == 0)
+ return;
+
+ if (sy->sy_narg > 7) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[4-7]: (%jx, %jx, %jx, %jx, ...)",
+ (long)args[4], (long)args[5],
+ (long)args[6], (long)args[7]);
+ } else if (sy->sy_narg > 6) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[4-6]: (%jx, %jx, %jx)",
+ (long)args[4], (long)args[5],
+ (long)args[6], 0);
+ } else if (sy->sy_narg > 5) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[4-5]: (%jx, %jx)",
+ (long)args[4], (long)args[5], 0, 0);
+ } else if (sy->sy_narg == 5) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[4]: (%jx)",
+ (long)args[4], 0, 0, 0);
+ }
+
+ if (sy->sy_narg > 3) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[0-3]: (%jx, %jx, %jx, %jx, ...)",
+ (long)args[0], (long)args[1],
+ (long)args[2], (long)args[3]);
+ } else if (sy->sy_narg > 2) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[0-2]: (%jx, %jx, %jx)",
+ (long)args[0], (long)args[1],
+ (long)args[2], 0);
+ } else if (sy->sy_narg > 1) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[0-1]: (%jx, %jx)",
+ (long)args[0], (long)args[1], 0, 0);
+ } else if (sy->sy_narg == 1) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "args[0]: (%jx)",
+ (long)args[0], 0, 0, 0);
+ }
+ }
+ return;
+ }
+
+ printf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name);
+ if (CODE_NOT_OK(code, em))
+ printf("OUT OF RANGE (%ld)", (long)code);
+ else {
+ printf("%ld call: %s", (long)code, em->e_syscallnames[code]);
+ if (scdebug & SCDEBUG_SHOWARGS) {
+ printf("(");
+ for (i = 0; i < sy->sy_argsize/sizeof(register_t); i++)
+ printf("%s0x%lx", i == 0 ? "" : ", ",
+ (long)args[i]);
+ printf(")");
+ }
+ }
+ printf("\n");
+}
+
+void
+scdebug_ret(register_t code, int error, const register_t retval[])
+{
+ SCDEBUG_KERNHIST_FUNC("scdebug_ret");
+ struct lwp *l = curlwp;
+ struct proc *p = l->l_proc;
+ const struct sysent *sy;
+ const struct emul *em;
+
+ if ((scdebug & SCDEBUG_RETURNS) == 0)
+ return;
+
+ if (scdebug & SCDEBUG_KERNHIST)
+ SCDEBUG_KERNHIST_CALLED(scdebughist);
+
+ em = p->p_emul;
+ sy = &em->e_sysent[code];
+ if ((scdebug & SCDEBUG_ALL) == 0 &&
+ (CODE_NOT_OK(code, em) || sy->sy_call == sys_nosys)) {
+ if (scdebug & SCDEBUG_KERNHIST)
+ SCDEBUG_KERNHIST_LOG(scdebughist, "", 0, 0, 0, 0);
+ return;
+ }
+
+ if (scdebug & SCDEBUG_KERNHIST) {
+ if (CODE_NOT_OK(code, em)) {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "pid %jd:%jd: OUT OF RANGE (%jd)",
+ p->p_pid, l->l_lid, code, 0);
+ } else {
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "pid %jd:%jd: num %jd",
+ p->p_pid, l->l_lid, code, 0);
+ SCDEBUG_KERNHIST_LOG(scdebughist,
+ "ret: err = %jd, rv = 0x%jx,0x%jx",
+ error, (long)retval[0], (long)retval[1], 0);
+ }
+ return;
+ }
+
+ printf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name);
+ if (CODE_NOT_OK(code, em))
+ printf("OUT OF RANGE (%ld)", (long)code);
+ else
+ printf("%ld ret %s: err = %d, rv = 0x%lx,0x%lx", (long)code,
+ em->e_syscallnames[code], error,
+ (long)retval[0], (long)retval[1]);
+ printf("\n");
+}
+#endif /* SYSCALL_DEBUG */
+
+#ifndef SCDEBUG_KERNHIST_SIZE
+#define SCDEBUG_KERNHIST_SIZE 500
+#endif
+
+void
+scdebug_init(void)
+{
+#if defined(SYSCALL_DEBUG) && defined(KERNHIST)
+ /* Setup scdebughist kernel history */
+ KERNHIST_INIT(scdebughist, SCDEBUG_KERNHIST_SIZE);
+#endif
+}
