[src/trunk]: src/sys/arch Revert my previous change. It is too severe: a faul...

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

details:   https://anonhg.NetBSD.org/src/rev/7539c9bacef9
branches:  trunk
changeset: 347955:7539c9bacef9
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Sep 25 12:53:24 2016 +0000

description:
Revert my previous change. It is too severe: a fault might be happening in
the kernel page if the map is pageable - implying it is not pmap_kernel. I
thought it wouldn't be the case.

diffstat:

 sys/arch/amd64/amd64/trap.c |  8 ++------
 sys/arch/i386/i386/trap.c   |  8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diffs (58 lines):

diff -r 2ac9a71281e2 -r 7539c9bacef9 sys/arch/amd64/amd64/trap.c
--- a/sys/arch/amd64/amd64/trap.c       Sun Sep 25 11:45:39 2016 +0000
+++ b/sys/arch/amd64/amd64/trap.c       Sun Sep 25 12:53:24 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.85 2016/09/16 11:48:10 maxv Exp $   */
+/*     $NetBSD: trap.c,v 1.86 2016/09/25 12:53:24 maxv Exp $   */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.85 2016/09/16 11:48:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.86 2016/09/25 12:53:24 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -310,10 +310,6 @@
 copyefault:
                        error = EFAULT;
 copyfault:
-                       KASSERT(onfault == kcopy_fault ||
-                           rcr2() < VM_MAXUSER_ADDRESS);
-                       KASSERT(onfault != kcopy_fault ||
-                           rcr2() >= VM_MAXUSER_ADDRESS);
                        frame->tf_rip = (uintptr_t)onfault;
                        frame->tf_rax = error;
                        return;
diff -r 2ac9a71281e2 -r 7539c9bacef9 sys/arch/i386/i386/trap.c
--- a/sys/arch/i386/i386/trap.c Sun Sep 25 11:45:39 2016 +0000
+++ b/sys/arch/i386/i386/trap.c Sun Sep 25 12:53:24 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.279 2016/09/16 11:48:10 maxv Exp $  */
+/*     $NetBSD: trap.c,v 1.280 2016/09/25 12:53:24 maxv Exp $  */
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.279 2016/09/16 11:48:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.280 2016/09/25 12:53:24 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -354,10 +354,6 @@
 copyefault:
                        error = EFAULT;
 copyfault:
-                       KASSERT(onfault == kcopy_fault ||
-                           rcr2() < VM_MAXUSER_ADDRESS);
-                       KASSERT(onfault != kcopy_fault ||
-                           rcr2() >= VM_MAXUSER_ADDRESS);
                        frame->tf_eip = (uintptr_t)onfault;
                        frame->tf_eax = error;
                        return;