Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/kernel/arch/amd64 Remove dbregs* in arch/amd64/t_ptrac...



details:   https://anonhg.NetBSD.org/src/rev/e43ea1e940ae
branches:  trunk
changeset: 349525:e43ea1e940ae
user:      kamil <kamil%NetBSD.org@localhost>
date:      Tue Dec 13 13:09:00 2016 +0000

description:
Remove dbregs* in arch/amd64/t_ptrace_wait*

CPU Debug Registers won't be exposed as is to userland.

Hardware Watchpoints will be exported to userland dedicated interface
through the ptrace(2) interface.

Sponsored by <The NetBSD Foundation>

diffstat:

 tests/kernel/arch/amd64/t_ptrace_wait.c |  1639 +------------------------------
 1 files changed, 2 insertions(+), 1637 deletions(-)

diffs (truncated from 1673 to 300 lines):

diff -r 52ed53a8f8ac -r e43ea1e940ae tests/kernel/arch/amd64/t_ptrace_wait.c
--- a/tests/kernel/arch/amd64/t_ptrace_wait.c   Tue Dec 13 13:04:18 2016 +0000
+++ b/tests/kernel/arch/amd64/t_ptrace_wait.c   Tue Dec 13 13:09:00 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_ptrace_wait.c,v 1.6 2016/12/13 13:04:18 kamil Exp $  */
+/*     $NetBSD: t_ptrace_wait.c,v 1.7 2016/12/13 13:09:00 kamil Exp $  */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.6 2016/12/13 13:04:18 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.7 2016/12/13 13:09:00 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -54,36 +54,6 @@
 #include "../../t_ptrace_wait.h"
 
 
-union u {
-       long raw;
-       struct {
-               long local_dr0_breakpoint : 1;  /* 0 */
-               long global_dr0_breakpoint : 1; /* 1 */
-               long local_dr1_breakpoint : 1;  /* 2 */
-               long global_dr1_breakpoint : 1; /* 3 */
-               long local_dr2_breakpoint : 1;  /* 4 */
-               long global_dr2_breakpoint : 1; /* 5 */
-               long local_dr3_breakpoint : 1;  /* 6 */
-               long global_dr3_breakpoint : 1; /* 7 */
-               long local_exact_breakpt : 1;   /* 8 */
-               long global_exact_breakpt : 1;  /* 9 */
-               long reserved_10 : 1;           /* 10 */
-               long rest_trans_memory : 1;     /* 11 */
-               long reserved_12 : 1;           /* 12 */
-               long general_detect_enable : 1; /* 13 */
-               long reserved_14 : 1;           /* 14 */
-               long reserved_15 : 1;           /* 15 */
-               long condition_dr0 : 2;         /* 16-17 */
-               long len_dr0 : 2;               /* 18-19 */
-               long condition_dr1 : 2;         /* 20-21 */
-               long len_dr1 : 2;               /* 22-23 */
-               long condition_dr2 : 2;         /* 24-25 */
-               long len_dr2 : 2;               /* 26-27 */
-               long condition_dr3 : 2;         /* 28-29 */
-               long len_dr3 : 2;               /* 30-31 */
-       } bits;
-};
-
 #if defined(HAVE_GPREGS)
 ATF_TC(regs1);
 ATF_TC_HEAD(regs1, tc)
@@ -167,1589 +137,6 @@
 }
 #endif
 
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_print);
-ATF_TC_HEAD(dbregs_print, tc)
-{
-       atf_tc_set_md_var(tc, "descr",
-           "Verify plain PT_GETDBREGS with printing Debug Registers");
-}
-
-ATF_TC_BODY(dbregs_print, tc)
-{
-       const int exitval = 5;
-       const int sigval = SIGSTOP;
-       pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-       int status;
-#endif
-       struct dbreg r;
-       size_t i;
-
-       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 GETDBREGS for the child process\n");
-       ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r, 0) != -1);
-
-       printf("State of the debug registers:\n");
-       for (i = 0; i < __arraycount(r.dbregs); i++)
-               printf("r[%zu]=%#lx\n", i, r.dbregs[i]);
-
-       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
-
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_preserve_dr0);
-ATF_TC_HEAD(dbregs_preserve_dr0, tc)
-{
-       atf_tc_set_md_var(tc, "descr",
-           "Verify that setting DR0 is preserved across ptrace(2) calls");
-}
-
-ATF_TC_BODY(dbregs_preserve_dr0, tc)
-{
-       const int exitval = 5;
-       const int sigval = SIGSTOP;
-       pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-       int status;
-#endif
-       struct dbreg r1;
-       struct dbreg r2;
-       /* Number of available CPU Debug Registers on AMD64 */
-       const size_t len = 16;
-       size_t i;
-       int watchme;
-
-       printf("Assert that known number of Debug Registers (%zu) is valid\n",
-           len);
-       ATF_REQUIRE_EQ(__arraycount(r1.dbregs), len);
-       ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
-
-       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 GETDBREGS for the child process (r1)\n");
-       ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r1, 0) != -1);
-
-       printf("State of the debug registers (r1):\n");
-       for (i = 0; i < __arraycount(r1.dbregs); i++)
-               printf("r1[%zu]=%#lx\n", i, r1.dbregs[i]);
-
-       r1.dbregs[0] = (long)(intptr_t)&watchme;
-       printf("Set DR0 (r1.dbregs[0]) to new value %#lx\n", r1.dbregs[0]);
-
-       printf("New state of the debug registers (r1):\n");
-       for (i = 0; i < __arraycount(r1.dbregs); i++)
-               printf("r1[%zu]=%#lx\n", i, r1.dbregs[i]);
-
-       printf("Call SETDBREGS for the child process (r1)\n");
-       ATF_REQUIRE(ptrace(PT_SETDBREGS, child, &r1, 0) != -1);
-
-       printf("Call GETDBREGS for the child process (r2)\n");
-       ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r2, 0) != -1);
-
-       printf("Assert that (r1) and (r2) are the same\n");
-       ATF_REQUIRE(memcmp(&r1, &r2, len) == 0);
-
-       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
-
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_preserve_dr1);
-ATF_TC_HEAD(dbregs_preserve_dr1, tc)
-{
-       atf_tc_set_md_var(tc, "descr",
-           "Verify that setting DR1 is preserved across ptrace(2) calls");
-}
-
-ATF_TC_BODY(dbregs_preserve_dr1, tc)
-{
-       const int exitval = 5;
-       const int sigval = SIGSTOP;
-       pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-       int status;
-#endif
-       struct dbreg r1;
-       struct dbreg r2;
-       /* Number of available CPU Debug Registers on AMD64 */
-       const size_t len = 16;
-       size_t i;
-       int watchme;
-
-       printf("Assert that known number of Debug Registers (%zu) is valid\n",
-           len);
-       ATF_REQUIRE_EQ(__arraycount(r1.dbregs), len);
-       ATF_REQUIRE_EQ(__arraycount(r2.dbregs), len);
-
-       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 GETDBREGS for the child process (r1)\n");
-       ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r1, 0) != -1);
-
-       printf("State of the debug registers (r1):\n");
-       for (i = 0; i < __arraycount(r1.dbregs); i++)
-               printf("r1[%zu]=%#lx\n", i, r1.dbregs[i]);
-
-       r1.dbregs[1] = (long)(intptr_t)&watchme;
-       printf("Set DR1 (r1.dbregs[1]) to new value %#lx\n", r1.dbregs[1]);
-
-       printf("New state of the debug registers (r1):\n");
-       for (i = 0; i < __arraycount(r1.dbregs); i++)
-               printf("r1[%zu]=%#lx\n", i, r1.dbregs[i]);
-
-       printf("Call SETDBREGS for the child process (r1)\n");
-       ATF_REQUIRE(ptrace(PT_SETDBREGS, child, &r1, 0) != -1);
-
-       printf("Call GETDBREGS for the child process (r2)\n");
-       ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r2, 0) != -1);
-
-       printf("Assert that (r1) and (r2) are the same\n");
-       ATF_REQUIRE(memcmp(&r1, &r2, len) == 0);
-
-       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
-
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_preserve_dr2);
-ATF_TC_HEAD(dbregs_preserve_dr2, tc)
-{
-       atf_tc_set_md_var(tc, "descr",
-           "Verify that setting DR2 is preserved across ptrace(2) calls");
-}
-
-ATF_TC_BODY(dbregs_preserve_dr2, tc)
-{
-       const int exitval = 5;
-       const int sigval = SIGSTOP;
-       pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)



Home | Main Index | Thread Index | Old Index