Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Add regs1 in arch/i386/t_ptrace_wait*
details: https://anonhg.NetBSD.org/src/rev/9cbfa89600ff
branches: trunk
changeset: 349527:9cbfa89600ff
user: kamil <kamil%NetBSD.org@localhost>
date: Tue Dec 13 18:00:10 2016 +0000
description:
Add regs1 in arch/i386/t_ptrace_wait*
regs1:
Call PT_GETREGS and iterate over General Purpose registers
Sponsored by <The NetBSD Foundation>
diffstat:
distrib/sets/lists/debug/mi | 8 +-
distrib/sets/lists/tests/mi | 12 ++-
etc/mtree/NetBSD.dist.tests | 4 +-
tests/kernel/arch/Makefile | 6 +-
tests/kernel/arch/i386/Makefile | 18 +++
tests/kernel/arch/i386/Makefile.inc | 1 +
tests/kernel/arch/i386/t_ptrace_wait.c | 141 ++++++++++++++++++++++++++++++
tests/kernel/arch/i386/t_ptrace_wait3.c | 30 ++++++
tests/kernel/arch/i386/t_ptrace_wait4.c | 30 ++++++
tests/kernel/arch/i386/t_ptrace_wait6.c | 30 ++++++
tests/kernel/arch/i386/t_ptrace_waitid.c | 30 ++++++
tests/kernel/arch/i386/t_ptrace_waitpid.c | 30 ++++++
12 files changed, 336 insertions(+), 4 deletions(-)
diffs (truncated from 440 to 300 lines):
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi Tue Dec 13 17:12:51 2016 +0000
+++ b/distrib/sets/lists/debug/mi Tue Dec 13 18:00:10 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.184 2016/12/09 06:12:02 kamil Exp $
+# $NetBSD: mi,v 1.185 2016/12/13 18:00:10 kamil Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1665,6 +1665,12 @@
./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_wait6.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_waitid.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_waitpid.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait.debug tests-kernel-tests debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait3.debug tests-kernel-tests debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait4.debug tests-kernel-tests debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_wait6.debug tests-kernel-tests debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_waitid.debug tests-kernel-tests debug,atf,compattestfile,machine=i386
+./usr/libdata/debug/usr/tests/kernel/arch/i386/t_ptrace_waitpid.debug tests-kernel-tests debug,atf,compattestfile,machine=i386
./usr/libdata/debug/usr/tests/kernel/h_ps_strings1.debug tests-kernel-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/kernel/h_ps_strings2.debug tests-kernel-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/kernel/kqueue/read/t_fifo.debug tests-kernel-tests debug,atf,compattestfile
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Tue Dec 13 17:12:51 2016 +0000
+++ b/distrib/sets/lists/tests/mi Tue Dec 13 18:00:10 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.707 2016/12/09 06:12:02 kamil Exp $
+# $NetBSD: mi,v 1.708 2016/12/13 18:00:10 kamil Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -57,6 +57,7 @@
./usr/libdata/debug/usr/tests/kernel tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/arch tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/arch/amd64 tests-kernel-tests compattestfile,atf
+./usr/libdata/debug/usr/tests/kernel/arch/i386 tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/kqueue tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/read tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/write tests-kernel-tests compattestfile,atf
@@ -2095,6 +2096,15 @@
./usr/tests/kernel/arch/amd64/t_ptrace_wait6 tests-kernel-tests compattestfile,atf,machine=amd64
./usr/tests/kernel/arch/amd64/t_ptrace_waitid tests-kernel-tests compattestfile,atf,machine=amd64
./usr/tests/kernel/arch/amd64/t_ptrace_waitpid tests-kernel-tests compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/i386 tests-kernel-tests compattestfile,atf
+./usr/tests/kernel/arch/i386/Atffile tests-kernel-tests compattestfile,atf,machine=i386
+./usr/tests/kernel/arch/i386/Kyuafile tests-kernel-tests compattestfile,atf,kyua,machine=i386
+./usr/tests/kernel/arch/i386/t_ptrace_wait tests-kernel-tests compattestfile,atf,machine=i386
+./usr/tests/kernel/arch/i386/t_ptrace_wait3 tests-kernel-tests compattestfile,atf,machine=i386
+./usr/tests/kernel/arch/i386/t_ptrace_wait4 tests-kernel-tests compattestfile,atf,machine=i386
+./usr/tests/kernel/arch/i386/t_ptrace_wait6 tests-kernel-tests compattestfile,atf,machine=i386
+./usr/tests/kernel/arch/i386/t_ptrace_waitid tests-kernel-tests compattestfile,atf,machine=i386
+./usr/tests/kernel/arch/i386/t_ptrace_waitpid tests-kernel-tests compattestfile,atf,machine=i386
./usr/tests/kernel/h_ps_strings1 tests-kernel-tests compattestfile,atf
./usr/tests/kernel/h_ps_strings2 tests-kernel-tests compattestfile,atf
./usr/tests/kernel/kqueue tests-kernel-tests compattestfile,atf
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff etc/mtree/NetBSD.dist.tests
--- a/etc/mtree/NetBSD.dist.tests Tue Dec 13 17:12:51 2016 +0000
+++ b/etc/mtree/NetBSD.dist.tests Tue Dec 13 18:00:10 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.137 2016/12/09 06:12:02 kamil Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.138 2016/12/13 18:00:10 kamil Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -48,6 +48,7 @@
./usr/libdata/debug/usr/tests/kernel
./usr/libdata/debug/usr/tests/kernel/arch
./usr/libdata/debug/usr/tests/kernel/arch/amd64
+./usr/libdata/debug/usr/tests/kernel/arch/i386
./usr/libdata/debug/usr/tests/kernel/kqueue
./usr/libdata/debug/usr/tests/kernel/kqueue/read
./usr/libdata/debug/usr/tests/kernel/kqueue/write
@@ -231,6 +232,7 @@
./usr/tests/kernel
./usr/tests/kernel/arch
./usr/tests/kernel/arch/amd64
+./usr/tests/kernel/arch/i386
./usr/tests/kernel/kqueue
./usr/tests/kernel/kqueue/read
./usr/tests/kernel/kqueue/write
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff tests/kernel/arch/Makefile
--- a/tests/kernel/arch/Makefile Tue Dec 13 17:12:51 2016 +0000
+++ b/tests/kernel/arch/Makefile Tue Dec 13 18:00:10 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/02 05:54:15 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/13 18:00:10 kamil Exp $
NOMAN= # defined
@@ -10,4 +10,8 @@
TESTS_SUBDIRS+= amd64
.endif
+.if (${MACHINE} == "i386")
+TESTS_SUBDIRS+= i386
+.endif
+
.include <bsd.test.mk>
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff tests/kernel/arch/i386/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/kernel/arch/i386/Makefile Tue Dec 13 18:00:10 2016 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2016/12/13 18:00:10 kamil Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/kernel/arch/i386
+
+TESTS_C+= t_ptrace_wait
+TESTS_C+= t_ptrace_wait3
+TESTS_C+= t_ptrace_wait4
+TESTS_C+= t_ptrace_wait6
+TESTS_C+= t_ptrace_waitid
+TESTS_C+= t_ptrace_waitpid
+
+CPPFLAGS+= -D_KERNTYPES
+
+.include <bsd.test.mk>
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff tests/kernel/arch/i386/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/kernel/arch/i386/Makefile.inc Tue Dec 13 18:00:10 2016 +0000
@@ -0,0 +1,1 @@
+.include "../Makefile.inc"
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff tests/kernel/arch/i386/t_ptrace_wait.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/kernel/arch/i386/t_ptrace_wait.c Tue Dec 13 18:00:10 2016 +0000
@@ -0,0 +1,141 @@
+/* $NetBSD: t_ptrace_wait.c,v 1.1 2016/12/13 18:00:10 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 The NetBSD Foundation, Inc.
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.1 2016/12/13 18:00:10 kamil Exp $");
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+#include <machine/reg.h>
+#include <err.h>
+#include <errno.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+#include "../../t_ptrace_wait.h"
+
+
+#if defined(HAVE_GPREGS)
+ATF_TC(regs1);
+ATF_TC_HEAD(regs1, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Call PT_GETREGS and iterate over General Purpose registers");
+}
+
+ATF_TC_BODY(regs1, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ struct reg r;
+
+ printf("Before forking process PID=%d\n", getpid());
+ ATF_REQUIRE((child = fork()) != -1);
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Call GETREGS for the child process\n");
+ ATF_REQUIRE(ptrace(PT_GETREGS, child, &r, 0) != -1);
+
+ printf("EAX=%#" PRIxREGISTER "\n", r.r_eax);
+ printf("EBX=%#" PRIxREGISTER "\n", r.r_ebx);
+ printf("ECX=%#" PRIxREGISTER "\n", r.r_ecx);
+ printf("EDX=%#" PRIxREGISTER "\n", r.r_edx);
+
+ printf("ESP=%#" PRIxREGISTER "\n", r.r_esp);
+ printf("EBP=%#" PRIxREGISTER "\n", r.r_ebp);
+
+ printf("ESI=%#" PRIxREGISTER "\n", r.r_esi);
+ printf("EDI=%#" PRIxREGISTER "\n", r.r_edi);
+
+ printf("EIP=%#" PRIxREGISTER "\n", r.r_eip);
+
+ printf("EFLAGS=%#" PRIxREGISTER "\n", r.r_eflags);
+
+ printf("CS=%#" PRIxREGISTER "\n", r.r_cs);
+ printf("SS=%#" PRIxREGISTER "\n", r.r_ss);
+ printf("DS=%#" PRIxREGISTER "\n", r.r_ds);
+ printf("ES=%#" PRIxREGISTER "\n", r.r_es);
+ printf("FS=%#" PRIxREGISTER "\n", r.r_fs);
+ printf("GS=%#" PRIxREGISTER "\n", r.r_gs);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
+#endif
+
+ATF_TP_ADD_TCS(tp)
+{
+ setvbuf(stdout, NULL, _IONBF, 0);
+ setvbuf(stderr, NULL, _IONBF, 0);
+
+ ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs1);
+
+ return atf_no_error();
+}
diff -r 17c1e4a1e2b5 -r 9cbfa89600ff tests/kernel/arch/i386/t_ptrace_wait3.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/kernel/arch/i386/t_ptrace_wait3.c Tue Dec 13 18:00:10 2016 +0000
@@ -0,0 +1,30 @@
+/* $NetBSD: t_ptrace_wait3.c,v 1.1 2016/12/13 18:00:10 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 The NetBSD Foundation, Inc.
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
Home |
Main Index |
Thread Index |
Old Index