[src/trunk]: src/sys/rump Support ktrace for rump kernels.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bd62827835de
branches:  trunk
changeset: 791902:bd62827835de
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Dec 09 16:54:20 2013 +0000

description:
Support ktrace for rump kernels.

Requested by Justin Cormack on rumpkernel-users.

diffstat:

 sys/rump/Makefile.rump                      |   3 ++-
 sys/rump/librump/rumpkern/Makefile.rumpkern |   3 ++-
 sys/rump/librump/rumpkern/emul.c            |  18 ++----------------
 sys/rump/librump/rumpkern/locks.c           |   7 +++++--
 sys/rump/librump/rumpkern/rump.c            |   6 ++++--
 sys/rump/librump/rumpvfs/Makefile.rumpvfs   |   5 ++++-
 6 files changed, 19 insertions(+), 23 deletions(-)

diffs (147 lines):

diff -r 0825ca2c853e -r bd62827835de sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Mon Dec 09 16:49:43 2013 +0000
+++ b/sys/rump/Makefile.rump    Mon Dec 09 16:54:20 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rump,v 1.87 2013/09/03 19:57:02 pooka Exp $
+#      $NetBSD: Makefile.rump,v 1.88 2013/12/09 16:54:20 pooka Exp $
 #
 
 WARNS?=                3       # XXX: src/sys won't compile with -Wsign-compare yet
@@ -24,6 +24,7 @@
 CWARNFLAGS+=   -Wno-format-zero-length -Wno-pointer-sign
 CPPFLAGS+=     -D_KERNEL -DMULTIPROCESSOR -D_MODULE -DMODULAR
 CPPFLAGS+=     -DDEBUGPRINT
+CPPFLAGS+=     -DKTRACE
 CPPFLAGS+=     -I${.CURDIR} -I.
 CPPFLAGS+=     -I${RUMPTOP}/../../common/include
 CPPFLAGS+=     -I${RUMPTOP}/include
diff -r 0825ca2c853e -r bd62827835de sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Mon Dec 09 16:49:43 2013 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Mon Dec 09 16:54:20 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.132 2013/09/07 17:58:00 pooka Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.133 2013/12/09 16:54:20 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -76,6 +76,7 @@
        kern_event.c            \
        kern_hook.c             \
        kern_ksyms.c            \
+       kern_ktrace.c           \
        kern_malloc.c           \
        kern_module.c           \
        kern_mutex_obj.c        \
diff -r 0825ca2c853e -r bd62827835de sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Mon Dec 09 16:49:43 2013 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Mon Dec 09 16:54:20 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.158 2013/04/30 16:03:44 pooka Exp $ */
+/*     $NetBSD: emul.c,v 1.159 2013/12/09 16:54:20 pooka Exp $ */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.158 2013/04/30 16:03:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.159 2013/12/09 16:54:20 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -281,20 +281,6 @@
 }
 #endif
 
-int
-trace_enter(register_t code, const register_t *args, int narg)
-{
-
-       return 0;
-}
-
-void
-trace_exit(register_t code, register_t rval[], int error)
-{
-
-       /* nada */
-}
-
 #ifdef LOCKDEBUG
 void
 turnstile_print(volatile void *obj, void (*pr)(const char *, ...))
diff -r 0825ca2c853e -r bd62827835de sys/rump/librump/rumpkern/locks.c
--- a/sys/rump/librump/rumpkern/locks.c Mon Dec 09 16:49:43 2013 +0000
+++ b/sys/rump/librump/rumpkern/locks.c Mon Dec 09 16:54:20 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locks.c,v 1.65 2013/07/03 17:10:28 njoly Exp $ */
+/*     $NetBSD: locks.c,v 1.66 2013/12/09 16:54:20 pooka Exp $ */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.65 2013/07/03 17:10:28 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.66 2013/12/09 16:54:20 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -55,6 +55,9 @@
        NULL
 };
 
+/* not used, but need the symbols for pointer comparisons */
+syncobj_t mutex_syncobj, rw_syncobj;
+
 #define ALLOCK(lock, ops)              \
     lockdebug_alloc(lock, ops, (uintptr_t)__builtin_return_address(0))
 #define FREELOCK(lock)                 \
diff -r 0825ca2c853e -r bd62827835de sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Mon Dec 09 16:49:43 2013 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Mon Dec 09 16:54:20 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.c,v 1.277 2013/12/09 16:23:10 pooka Exp $ */
+/*     $NetBSD: rump.c,v 1.278 2013/12/09 16:54:20 pooka Exp $ */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.277 2013/12/09 16:23:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.278 2013/12/09 16:54:20 pooka Exp $");
 
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
@@ -370,6 +370,8 @@
        inittimecounter();
        ntp_init();
 
+       ktrinit();
+
        ts = boottime;
        tc_setclock(&ts);
 
diff -r 0825ca2c853e -r bd62827835de sys/rump/librump/rumpvfs/Makefile.rumpvfs
--- a/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Dec 09 16:49:43 2013 +0000
+++ b/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Dec 09 16:54:20 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpvfs,v 1.36 2013/03/15 12:09:59 pooka Exp $
+#      $NetBSD: Makefile.rumpvfs,v 1.37 2013/12/09 16:54:20 pooka Exp $
 #
 
 LIB=   rumpvfs
@@ -49,6 +49,9 @@
 # MFS miniroot support
 SRCS+= mfs_miniroot.c
 
+# ktrace vfs part
+SRCS+= kern_ktrace_vfs.c
+
 #quota2 plists
 SRCS+= quota1_subr.c vfs_quotactl.c