On Fri, Jun 17, 2011 at 11:31:46AM +0200, Otto Moerbeek wrote:
> Hi,
>
> ktrace is a wonderful tool, but interpreting arguments of syscalls is
> a pain sometimes.
>
> This is code (mostly taken from FreeBSD) makes this task more simple.
>
> e.g. showing pieces of a diff between current kdump and with this diff:
>
> - 24666 ssh CALL fcntl(0x3,0x4,0x6)
> + 24666 ssh CALL fcntl(0x3,F_SETFL,0x6<O_RDWR|O_NONBLOCK>)
>
> - 24666 ssh CALL kill(0x605a,0x2)
> + 24666 ssh CALL kill(0x605a,SIGINT)
>
> You'll need a current system for this diff.
>
> Please test and review,
>
Updated diff. Nothing spectacular compared to previous diff (added
mquery handling and some formatting changes).
-Otto
Index: Makefile
===================================================================
RCS file: /cvs/src/usr.bin/kdump/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 29 Dec 2010 17:51:48 -0000 1.17
+++ Makefile 19 Jun 2011 07:17:27 -0000
@@ -3,9 +3,9 @@
LDSTATIC=${STATIC}
PROG= kdump
CFLAGS+=-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../../sys
-SRCS= kdump.c ioctl.c subr.c
+SRCS= kdump.c ioctl.c kdump_subr.c subr.c
.PATH: ${.CURDIR}/../ktrace
-CLEANFILES+=ioctl.c
+CLEANFILES+=ioctl.c kdump_subr.c
ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
CC="${CC}" DESTDIR="${DESTDIR}" \
@@ -40,5 +40,8 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/
${DESTDIR}/usr/include/sys/scanio.h \
${DESTDIR}/usr/include/sys/scsiio.h \
${DESTDIR}/usr/include/sys/sockio.h > ioctl.c
+
+kdump_subr.c: ${.CURDIR}/mksubr
+ sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET}
.include <bsd.prog.mk>
Index: kdump.c
===================================================================
RCS file: /cvs/src/usr.bin/kdump/kdump.c,v
retrieving revision 1.50
diff -u -p -r1.50 kdump.c
--- kdump.c 2 Jun 2011 16:19:13 -0000 1.50
+++ kdump.c 19 Jun 2011 07:17:27 -0000
@@ -35,6 +35,7 @@
#include <sys/ktrace.h>
#include <sys/ioctl.h>
#include <sys/ptrace.h>
+#include <sys/socket.h>
#include <sys/sysctl.h>
#define _KERNEL
#include <sys/errno.h>
@@ -51,6 +52,7 @@
#include "ktrace.h"
#include "kdump.h"
+#include "kdump_subr.h"
#include "extern.h"
int timestamp, decimal, iohex, fancy = 1, tail, maxdata;
@@ -311,10 +313,22 @@ ioctldecode(u_long cmd)
printf(")");
}
+#define print_number(i, n, c) do { \
+ if (c) \
+ (void)putchar(c); \
+ if (decimal) \
+ (void)printf("%ld", (long)*i); \
+ else \
+ (void)printf("%#lx", (long)*i); \
+ i++; \
+ n--; \
+ c = ','; \
+} while (0);
+
static void
ktrsyscall(struct ktr_syscall *ktr)
{
- int argsize = ktr->ktr_argsize;
+ int narg = ktr->ktr_argsize / sizeof(register_t);
register_t *ap;
if (ktr->ktr_code >= current->nsysnames || ktr->ktr_code < 0)
@@ -323,10 +337,11 @@ ktrsyscall(struct ktr_syscall *ktr)
(void)printf("%s", current->sysnames[ktr->ktr_code]);
ap = (register_t *)((char *)ktr + sizeof(struct ktr_syscall));
(void)putchar('(');
- if (argsize) {
+ if (narg) {
char c = '\0';
if (fancy) {
- if (ktr->ktr_code == SYS_ioctl) {
+ switch (ktr->ktr_code) {
+ case SYS_ioctl: {
const char *cp;
if (decimal)
@@ -334,15 +349,17 @@ ktrsyscall(struct ktr_syscall *ktr)
else
(void)printf("%#lx", (long)*ap);
ap++;
- argsize -= sizeof(register_t);
+ narg--;
if ((cp = ioctlname(*ap)) != NULL)
(void)printf(",%s", cp);
else
ioctldecode(*ap);
c = ',';
ap++;
- argsize -= sizeof(register_t);
- } else if (ktr->ktr_code == SYS___sysctl) {
+ narg--;
+ break;
+ }
+ case SYS___sysctl: {
int *np, n;
n = ap[1];
@@ -358,8 +375,10 @@ ktrsyscall(struct ktr_syscall *ktr)
c = ',';
ap += 2;
- argsize -= 2 * sizeof(register_t);
- } else if (ktr->ktr_code == SYS_ptrace) {
+ narg -= 2;
+ break;
+ }
+ case SYS_ptrace:
if (*ap >= 0 && *ap <
sizeof(ptrace_ops) / sizeof(ptrace_ops[0]))
(void)printf("%s", ptrace_ops[*ap]);
@@ -396,10 +415,289 @@ ktrsyscall(struct ktr_syscall *ktr)
}
c = ',';
ap++;
- argsize -= sizeof(register_t);
+ narg--;
+ break;
+ case SYS_access:
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ accessmodename((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_chmod:
+ case SYS_fchmod:
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ modename((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_fcntl: {
+ int cmd;
+ int arg;
+ print_number(ap, narg, c);
+ cmd = *ap;
+ arg = *++ap;
+ (void)putchar(',');
+ fcntlcmdname(cmd, arg, decimal);
+ ap++;
+ narg -= 2;
+ break;
+ }
+ case SYS_flock:
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ flockname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_getrlimit:
+ case SYS_setrlimit:
+ rlimitname((int)*ap);
+ ap++;
+ narg--;
+ c = ',';
+ break;
+ case SYS_getsockopt:
+ case SYS_setsockopt:
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ sockoptlevelname((int)*ap, decimal);
+ if ((int)*ap == SOL_SOCKET) {
+ ap++;
+ narg--;
+ (void)putchar(',');
+ sockoptname((int)*ap);
+ }
+ ap++;
+ narg--;
+ break;
+ case SYS_kill:
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ signame((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_lseek:
+ print_number(ap, narg, c);
+ /* skip padding */
+ ap++;
+ narg--;
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ whencename((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_madvise:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ madvisebehavname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_minherit:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ minheritname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_mlockall:
+ mlockallname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_mmap:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ mmapprotname((int)*ap);
+ (void)putchar(',');
+ ap++;
+ narg--;
+ mmapflagsname((int)*ap);
+ ap++;
+ narg--;
+ print_number(ap, narg, c);
+ /* skip padding */
+ ap++;
+ narg--;
+ break;
+ case SYS_mprotect:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ mmapprotname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_mquery:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ mmapprotname((int)*ap);
+ ap++;
+ narg--;
+ (void)putchar(',');
+ mmapflagsname((int)*ap);
+ ap++;
+ narg--;
+ print_number(ap, narg, c);
+ /* skip padding */
+ ap++;
+ narg--;
+ break;
+ case SYS_msync:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ msyncflagsname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_msgctl:
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ shmctlname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_open: {
+ int flags;
+ int mode;
+ print_number(ap, narg, c);
+ flags = *ap;
+ mode = *++ap;
+ (void)putchar(',');
+ flagsandmodename(flags, mode, decimal);
+ ap++;
+ narg -= 2;
+ break;
+ }
+ case SYS_pread:
+ case SYS_preadv:
+ case SYS_pwrite:
+ case SYS_pwritev:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ /* skip padding */
+ ap++;
+ narg--;
+ break;
+ case SYS_recvmsg:
+ case SYS_sendmsg:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ sendrecvflagsname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_recvfrom:
+ case SYS_sendto:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ sendrecvflagsname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS___semctl:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ semctlname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_semget:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ semgetname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_shmat:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ shmatname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_shmctl:
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ shmctlname((int)*ap);
+ ap++;
+ narg--;
+ break;
+ case SYS_sigaction:
+ signame((int)*ap);
+ ap++;
+ narg--;
+ c = ',';
+ break;
+ case SYS_sigprocmask:
+ sigprocmaskhowname((int)*ap);
+ ap++;
+ narg--;
+ c = ',';
+ break;
+ case SYS_socket: {
+ int sockdomain = (int)*ap;
+ sockdomainname(sockdomain);
+ ap++;
+ narg--;
+ (void)putchar(',');
+ socktypename((int)*ap);
+ ap++;
+ narg--;
+ if (sockdomain == PF_INET ||
+ sockdomain == PF_INET6) {
+ (void)putchar(',');
+ sockipprotoname((int)*ap);
+ ap++;
+ narg--;
+ }
+ c = ',';
+ break;
+ }
+ case SYS_socketpair:
+ sockdomainname((int)*ap);
+ ap++;
+ narg--;
+ (void)putchar(',');
+ socktypename((int)*ap);
+ ap++;
+ narg--;
+ c = ',';
+ break;
+ case SYS_truncate:
+ case SYS_ftruncate:
+ print_number(ap, narg, c);
+ /* skip padding */
+ ap++;
+ narg--;
+ break;
+ case SYS_wait4:
+ print_number(ap, narg, c);
+ print_number(ap, narg, c);
+ (void)putchar(',');
+ wait4optname((int)*ap);
+ ap++;
+ narg--;
+ break;
}
}
- while (argsize) {
+ while (narg) {
if (c)
putchar(c);
if (decimal)
@@ -408,7 +706,7 @@ ktrsyscall(struct ktr_syscall *ktr)
(void)printf("%#lx", (long)*ap);
c = ',';
ap++;
- argsize -= sizeof(register_t);
+ narg--;
}
}
(void)printf(")\n");
@@ -614,7 +912,7 @@ usage(void)
fprintf(stderr, "usage: %s "
"[-dlnRTXx] [-e emulation] [-f file] [-m maxdata] [-p pid]\n"
"%*s[-t [ceinsw]]\n",
- __progname, sizeof("usage: ") + strlen(__progname), "");
+ __progname, (int)(sizeof("usage: ") + strlen(__progname)), "");
exit(1);
}
Index: mksubr
===================================================================
RCS file: /cvs/src/usr.bin/kdump/mksubr,v
retrieving revision 1.2
diff -u -p -r1.2 mksubr
--- mksubr 16 Jun 2011 17:08:59 -0000 1.2
+++ mksubr 19 Jun 2011 07:17:27 -0000
@@ -334,26 +334,26 @@ _EOF_
auto_or_type "modename" "S_[A-Z]+[[:space:]]+[0-6]{7}" "sys/stat.h"
auto_or_type "flagsname" "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/fcntl.h"
-#auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+"
"sys/unistd.h"
+auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+"
"sys/unistd.h"
auto_or_type "mmapprotname" "PROT_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"
"sys/mman.h"
auto_or_type "mmapflagsname" "MAP_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+"
"sys/mman.h"
-#auto_or_type "wait4optname" "W[A-Z]+[[:space:]]+[0-9]+" "sys/wait.h"
+auto_or_type "wait4optname" "W[A-Z]+[[:space:]]+[0-9]+" "sys/wait.h"
#auto_or_type "getfsstatflagsname" "MNT_[A-Z]+[[:space:]]+[1-9][0-9]*"
"sys/mount.h"
#auto_or_type "mountflagsname" "MNT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mount.h"
#auto_or_type "rebootoptname" "RB_[A-Z]+[[:space:]]+0x[0-9]+" "sys/reboot.h"
-#auto_or_type "flockname" "LOCK_[A-Z]+[[:space:]]+0x[0-9]+" "sys/fcntl.h"
+auto_or_type "flockname" "LOCK_[A-Z]+[[:space:]]+0x[0-9]+" "sys/fcntl.h"
#auto_or_type "thrcreateflagsname" "THR_[A-Z]+[[:space:]]+0x[0-9]+" "sys/thr.h"
-#auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
-#auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "sys/shm.h"
+auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
+auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}" "sys/shm.h"
#auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)"
"sys/unistd.h"
#auto_or_type "nfssvcname" "NFSSVC_[A-Z]+[[:space:]]+0x[0-9]+"
"nfsserver/nfs.h"
#
-#auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h"
-#auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+"
"sys/resource.h"
+auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h"
+auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+"
"sys/resource.h"
#auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+[0-9]+"
"sys/socket.h"
#auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h"
-#auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+"
"sys/mman.h"
-#auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
+auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+"
"sys/mman.h"
+auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
#auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sched.h"
#auto_switch_type "kldunloadfflagsname"
"LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h"
#auto_switch_type "extattrctlname"
"EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h"
@@ -362,13 +362,13 @@ auto_or_type "mmapflagsname" "MAP_[A-Z]+
#auto_switch_type "acltypename" "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+"
"sys/acl.h"
auto_switch_type "sigprocmaskhowname" "SIG_[A-Z]+[[:space:]]+[0-9]+"
"sys/signal.h"
#auto_switch_type "lio_listioname" "LIO_(NO)?WAIT[[:space:]]+[0-9]+" "aio.h"
-#auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+"
"sys/mman.h"
+auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h"
#auto_switch_type "quotactlname" "Q_[A-Z]+[[:space:]]+0x[0-9]+"
"ufs/ufs/quota.h"
-#auto_if_type "sockdomainname" "PF_[[:alnum:]]+[[:space:]]+" "sys/socket.h"
+auto_if_type "sockdomainname" "PF_[[:alnum:]]+[[:space:]]+" "sys/socket.h"
#auto_if_type "sockfamilyname" "AF_[[:alnum:]]+[[:space:]]+" "sys/socket.h"
-#auto_if_type "sockipprotoname" "IPPROTO_[[:alnum:]]+[[:space:]]+"
"netinet/in.h"
-#auto_switch_type "sockoptname" "SO_[A-Z]+[[:space:]]+0x[0-9]+" "sys/socket.h"
-#auto_switch_type "socktypename" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*"
"sys/socket.h"
+auto_if_type "sockipprotoname" "IPPROTO_[[:alnum:]]+[[:space:]]+"
"netinet/in.h"
+auto_switch_type "sockoptname" "SO_[A-Z]+[[:space:]]+0x[0-9]+" "sys/socket.h"
+auto_switch_type "socktypename" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*"
"sys/socket.h"
#auto_switch_type "ptraceopname" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+"
"sys/ptrace.h"
cat <<_EOF_
