 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.79 2020/06/19 07:19:19 rin Exp $	*/
+/*	$NetBSD: trap.c,v 1.80 2020/06/19 07:24:41 rin Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.79 2020/06/19 07:19:19 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.80 2020/06/19 07:24:41 rin Exp $");
 #include "opt_altivec.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #define	__UFETCHSTORE_PRIVATE
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/kauth.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/syscall.h>
 @@ -237,58 +237,68 @@ out:
 		DBPRINTF(TDB_ALL,
 		    ("trap(EXC_DSI|EXC_USER) at %lx %s fault on %lx %x\n",
 		    tf->tf_srr0, (ftype & VM_PROT_WRITE) ? "write" : "read",
 		    tf->tf_dear, tf->tf_esr));
 		KASSERT(l == curlwp && (l->l_stat == LSONPROC));
 //		KASSERT(curpcb->pcb_onfault == NULL);
 		rv = uvm_fault(&p->p_vmspace->vm_map, trunc_page(tf->tf_dear),
 		    ftype);
 		if (rv == 0) {
 			break;
+		}
 		KSI_INIT_TRAP(&ksi);
 		ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_trap = EXC_DSI;
 		ksi.ksi_addr = (void *)tf->tf_dear;
-		if (rv == ENOMEM) {
+vm_signal:
-			printf("UVM: pid %d (%s) lid %d, uid %d killed: "
+		switch (rv) {
-			    "out of swap\n",
+		case EINVAL:
-			    p->p_pid, p->p_comm, l->l_lid,
+			ksi.ksi_signo = SIGBUS;
-			    l->l_cred ?
+			ksi.ksi_code = BUS_ADRERR;
-			    kauth_cred_geteuid(l->l_cred) : -1);
+			break;
 		case EACCES:
 			ksi.ksi_signo = SIGSEGV;
 			ksi.ksi_code = SEGV_ACCERR;
 			break;
 		case ENOMEM:
 			ksi.ksi_signo = SIGKILL;
 			printf("UVM: pid %d.%d (%s), uid %d killed: "
 			       "out of swap\n", p->p_pid, l->l_lid, p->p_comm,
 			       l->l_cred ? kauth_cred_geteuid(l->l_cred) : -1);
 			break;
 		default:
 			ksi.ksi_signo = SIGSEGV;
 			ksi.ksi_code = SEGV_MAPERR;
 			break;
+		}
 		trapsignal(l, &ksi);
 		break;
 	case EXC_ITMISS|EXC_USER:
 	case EXC_ISI|EXC_USER:
 		ftype = VM_PROT_EXECUTE;
 		DBPRINTF(TDB_ALL,
 		    ("trap(EXC_ISI|EXC_USER) at %lx execute fault tf %p\n",
 		    tf->tf_srr0, tf));
 //		KASSERT(curpcb->pcb_onfault == NULL);
 		rv = uvm_fault(&p->p_vmspace->vm_map, trunc_page(tf->tf_srr0),
 		    ftype);
 		if (rv == 0) {
 			break;
+		}
 		KSI_INIT_TRAP(&ksi);
 		ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_trap = EXC_ISI;
 		ksi.ksi_addr = (void *)tf->tf_srr0;
-		ksi.ksi_code = (rv == EACCES ? SEGV_ACCERR : SEGV_MAPERR);
+		goto vm_signal;
 		trapsignal(l, &ksi);
 		break;
 	case EXC_AST|EXC_USER:
 		cpu_ast(l, curcpu());
 		break;
 	case EXC_ALI|EXC_USER:
 		if (fix_unaligned(l, tf) != 0) {
 			KSI_INIT_TRAP(&ksi);
 			ksi.ksi_signo = SIGBUS;
 			ksi.ksi_trap = EXC_ALI;
 			ksi.ksi_addr = (void *)tf->tf_dear;
 			trapsignal(l, &ksi);