 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcb.h,v 1.27 2020/09/26 04:31:53 simonb Exp $	*/
+/*	$NetBSD: pcb.h,v 1.28 2021/03/13 17:14:11 skrll Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -35,27 +35,27 @@
+ *
  * from: Utah Hdr: pcb.h 1.13 89/04/23
+ *
  *	@(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 #ifndef _MIPS_PCB_H_
 #define	_MIPS_PCB_H_
 #include <mips/types.h>
 #include <mips/reg.h>
 struct pcb_faultinfo {
-	void *pfi_faultpte;
+	void *pfi_faultptep;
 	vaddr_t pfi_faultaddr;
 	u_int pfi_repeats;
 	pid_t pfi_lastpid;
 	uint8_t pfi_faulttype;
 };
 /*
  * MIPS process control block
  */
 struct pcb {
 	mips_label_t pcb_context;	/* kernel context for resume */
 	void *pcb_onfault;		/* for copyin/copyout faults */
 	uint32_t pcb_ppl;		/* previous priority level */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.257 2021/03/07 15:10:05 christos Exp $	*/
+/*	$NetBSD: trap.c,v 1.258 2021/03/13 17:14:11 skrll Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * 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.
+ *
  * from: Utah Hdr: trap.c 1.32 91/04/06
+ *
  *	@(#)trap.c	8.5 (Berkeley) 1/11/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.257 2021/03/07 15:10:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.258 2021/03/13 17:14:11 skrll Exp $");
 #include "opt_cputype.h"	/* which mips CPU levels do we support? */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/ras.h>
 #include <sys/signalvar.h>
 @@ -373,46 +373,46 @@ trap(uint32_t status, uint32_t cause, va
 				userret(l);
+			}
 			return; /* GEN */
+		}
 #endif
 		KASSERT(KERNLAND_P(va) || curcpu()->ci_pmap_asid_cur != 0);
 		pmap_tlb_asid_check();
 		kpreempt_enable();
 #ifdef PMAP_FAULTINFO
 		if (p->p_pid == pfi->pfi_lastpid && va == pfi->pfi_faultaddr) {
 			if (++pfi->pfi_repeats > 4) {
 				tlb_asid_t asid = tlb_get_asid();
-				pt_entry_t *ptep = pfi->pfi_faultpte;
+				pt_entry_t *ptep = pfi->pfi_faultptep;
 				printf("trap: fault #%u (%s/%s) for %#"
 				    PRIxVADDR" (%#"PRIxVADDR") at pc %#"
 				    PRIxVADDR" curpid=%u/%u ptep@%p=%#"
 				    PRIxPTE")\n", pfi->pfi_repeats,
 				    trap_names[TRAPTYPE(cause)],
 				    trap_names[pfi->pfi_faulttype], va,
 				    vaddr, pc, map->pmap->pm_pai[0].pai_asid,
 				    asid, ptep, ptep ? pte_value(*ptep) : 0);
 				if (pfi->pfi_repeats >= 4) {
 					cpu_Debugger();
 				} else {
 					pfi->pfi_faulttype = TRAPTYPE(cause);
+				}
+			}
 		} else {
 			pfi->pfi_lastpid = p->p_pid;
 			pfi->pfi_faultaddr = va;
 			pfi->pfi_repeats = 0;
-			pfi->pfi_faultpte = NULL;
+			pfi->pfi_faultptep = NULL;
 			pfi->pfi_faulttype = TRAPTYPE(cause);
+		}
 #endif /* PMAP_FAULTINFO */
 		onfault = pcb->pcb_onfault;
 		pcb->pcb_onfault = NULL;
 		rv = uvm_fault(map, va, ftype);
 		pcb->pcb_onfault = onfault;
 #if defined(VMFAULT_TRACE)
 		if (!KERNLAND_P(va))
 			printf(
 			    "uvm_fault(%p (pmap %p), %#"PRIxVADDR
 @@ -425,30 +425,30 @@ trap(uint32_t status, uint32_t cause, va
 		 * failure it is due to accessing the stack region outside
 		 * the current limit and we need to reflect that as an access
 		 * error.
 		 */
 		if ((void *)va >= vm->vm_maxsaddr) {
 			if (rv == 0)
 				uvm_grow(p, va);
 			else if (rv == EACCES)
 				rv = EFAULT;
+		}
 		if (rv == 0) {
 #ifdef PMAP_FAULTINFO
 			if (pfi->pfi_repeats == 0) {
-				pfi->pfi_faultpte =
+				pfi->pfi_faultptep =
 				    pmap_pte_lookup(map->pmap, va);
+			}
-			KASSERT(*(pt_entry_t *)pfi->pfi_faultpte);
+			KASSERT(*(pt_entry_t *)pfi->pfi_faultptep);
 #endif
 			if (type & T_USER) {
 				userret(l);
+			}
 			return; /* GEN */
+		}
 		if ((type & T_USER) == 0)
 			goto copyfault;
 		KSI_INIT_TRAP(&ksi);
 		switch (rv) {
 		case EINVAL:
 			ksi.ksi_signo = SIGBUS;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.59 2021/03/13 15:29:13 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.60 2021/03/13 17:14:11 skrll Exp $	*/
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * 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.
+ *
  *	@(#)pmap.c	8.4 (Berkeley) 1/26/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.59 2021/03/13 15:29:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.60 2021/03/13 17:14:11 skrll Exp $");
 /*
  *	Manages physical address maps.
+ *
  *	In addition to hardware address maps, this
  *	module is called upon to provide software-use-only
  *	maps which may or may not be stored in the same
  *	form as hardware maps.  These pseudo-maps are
  *	used to store intermediate results from copy
  *	operations to and from address spaces.
+ *
  *	Since the information managed by this module is
  *	also stored by the logical address mapping module,
 @@ -1017,27 +1017,27 @@ pmap_remove(pmap_t pmap, vaddr_t sva, va
 	UVMHIST_FUNC(__func__);
 	UVMHIST_CALLARGS(pmaphist, "(pmap=%#jx, va=%#jx..%#jx)",
 	    (uintptr_t)pmap, sva, eva, 0);
 	if (is_kernel_pmap_p) {
 		PMAP_COUNT(remove_kernel_calls);
 	} else {
 		PMAP_COUNT(remove_user_calls);
+	}
 #ifdef PMAP_FAULTINFO
 	curpcb->pcb_faultinfo.pfi_faultaddr = 0;
 	curpcb->pcb_faultinfo.pfi_repeats = 0;
-	curpcb->pcb_faultinfo.pfi_faultpte = NULL;
+	curpcb->pcb_faultinfo.pfi_faultptep = NULL;
 #endif
 	kpreempt_disable();
 	pmap_addr_range_check(pmap, sva, eva, __func__);
 	pmap_pte_process(pmap, sva, eva, pmap_pte_remove, npte);
 	kpreempt_enable();
 	UVMHIST_LOG(pmaphist, " <-- done", 0, 0, 0, 0);
+}
 /*
  *	pmap_page_protect:
+ *
  *	Lower the permission for all mappings to a given page.
 @@ -1562,27 +1562,27 @@ pmap_remove_all(struct pmap *pmap)
 	if (kcpuset_isset(pmap->pm_onproc, cpu_index(curcpu())))
 #endif
 		pmap_tlb_asid_deactivate(pmap);
 #ifdef MULTIPROCESSOR
 	KASSERT(kcpuset_iszero(pmap->pm_onproc));
 #endif
 	pmap_tlb_asid_release_all(pmap);
 	pmap_tlb_miss_lock_exit();
 	pmap->pm_flags |= PMAP_DEFERRED_ACTIVATE;
 #ifdef PMAP_FAULTINFO
 	curpcb->pcb_faultinfo.pfi_faultaddr = 0;
 	curpcb->pcb_faultinfo.pfi_repeats = 0;
-	curpcb->pcb_faultinfo.pfi_faultpte = NULL;
+	curpcb->pcb_faultinfo.pfi_faultptep = NULL;
 #endif
 	kpreempt_enable();
 	UVMHIST_LOG(pmaphist, " <-- done", 0, 0, 0, 0);
 	return false;
+}
 /*
  *	Routine:	pmap_unwire
  *	Function:	Clear the wired attribute for a map/virtual-address
  *			pair.
  *	In/out conditions:
  *			The mapping must already exist in the pmap.