 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.c,v 1.269 2020/08/29 20:06:59 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.270 2020/09/03 02:05:03 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008, 2020
  * 	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, by Andrew Doran and Mindaugas Rasiukevicius,
  * and by Chris G. Demetriou.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -125,27 +125,27 @@
  *	this module may delay invalidate or reduced protection
  *	operations until such time as they are actually
  *	necessary.  This module is given full information as
  *	to which processors are currently using which maps,
  *	and to when physical maps must be made correct.
  */
 #include "opt_lockdebug.h"
 #include "opt_sysv.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.269 2020/08/29 20:06:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.270 2020/09/03 02:05:03 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
 #include <sys/evcnt.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <uvm/uvm.h>
 @@ -941,27 +941,26 @@ pmap_tlb_shootnow(const struct pmap_tlb_
+	}
 #if defined(MULTIPROCESSOR)
 	/*
 	 * If there are remote CPUs that need to do work, get them
 	 * started now.
 	 */
 	const u_long remote_cpus = active_cpus & ~this_cpu;
 	KASSERT(tlb_context == NULL);
 	if (remote_cpus) {
 		TLB_COUNT(shootnow_remote);
 		tlb_context = tlbctx;
 		tlb_pending = remote_cpus;
 		alpha_wmb();
 		alpha_multicast_ipi(remote_cpus, ALPHA_IPI_SHOOTDOWN);
+	}
 #endif /* MULTIPROCESSOR */
 	/*
 	 * Now that the remotes have been notified, release the
 	 * activation lock.
 	 */
 	if (activation_locked) {
 		KASSERT(tlbctx->t_pmap != NULL);
 		PMAP_ACT_UNLOCK(tlbctx->t_pmap);
+	}
 @@ -973,39 +972,39 @@ pmap_tlb_shootnow(const struct pmap_tlb_
 	if (active_cpus & this_cpu) {
 		pmap_tlb_invalidate(tlbctx, ci);
+	}
 #if defined(MULTIPROCESSOR)
 	/* Wait for remote CPUs to finish. */
 	if (remote_cpus) {
 		int backoff = SPINLOCK_BACKOFF_MIN;
 		u_int spins = 0;
 		while (atomic_load_relaxed(&tlb_context) != NULL) {
 			SPINLOCK_BACKOFF(backoff);
 			if (spins++ > 0x0fffffff) {
 				alpha_mb();
 				printf("TLB LOCAL MASK  = 0x%016lx\n",
 				    this_cpu);
 				printf("TLB REMOTE MASK = 0x%016lx\n",
 				    remote_cpus);
 				printf("TLB REMOTE PENDING = 0x%016lx\n",
 				    tlb_pending);
 				printf("TLB CONTEXT = %p\n", tlb_context);
 				printf("TLB LOCAL IPL = %lu\n",
 				    alpha_pal_rdps() & ALPHA_PSL_IPL_MASK);
 				panic("pmap_tlb_shootnow");
+			}
+		}
 		membar_consumer();
+	}
 	KASSERT(tlb_context == NULL);
 #endif /* MULTIPROCESSOR */
 	mutex_spin_exit(&tlb_lock);
 	if (__predict_false(TLB_CTX_FLAGS(tlbctx) & TLB_CTX_F_PV)) {
 		/*
 		 * P->V TLB operations may operate on multiple pmaps.
 		 * The shootdown takes a reference on the first pmap it
 		 * encounters, in order to prevent it from disappearing,
 		 * in the hope that we end up with a single-pmap P->V
 		 * operation (instrumentation shows this is not rare).
 @@ -1016,27 +1015,27 @@ pmap_tlb_shootnow(const struct pmap_tlb_
 		KASSERT(tlbctx->t_pmap != NULL);
 		pmap_destroy(tlbctx->t_pmap);
+	}
+}
 #if defined(MULTIPROCESSOR)
 void
 pmap_tlb_shootdown_ipi(struct cpu_info * const ci,
     struct trapframe * const tf __unused)
+{
 	KASSERT(tlb_context != NULL);
 	pmap_tlb_invalidate(tlb_context, ci);
 	if (atomic_and_ulong_nv(&tlb_pending, ~(1UL << ci->ci_cpuid)) == 0) {
-		alpha_wmb();
+		membar_producer();
 		atomic_store_relaxed(&tlb_context, NULL);
+	}
+}
 #endif /* MULTIPROCESSOR */
 static void
 pmap_tlb_physpage_free(paddr_t const ptpa,
     struct pmap_tlb_context * const tlbctx)
+{
 	struct vm_page * const pg = PHYS_TO_VM_PAGE(ptpa);
 	KASSERT(pg != NULL);
 @@ -1604,27 +1603,27 @@ pmap_create(void)
+ *
  *	Drop the reference count on the specified pmap, releasing
  *	all resources if the reference count drops to zero.
  */
 void
 pmap_destroy(pmap_t pmap)
+{
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_destroy(%p)\n", pmap);
 #endif
-	PMAP_MP(alpha_mb());
+	PMAP_MP(membar_exit());
 	if (atomic_dec_ulong_nv(&pmap->pm_count) > 0)
 		return;
 	rw_enter(&pmap_growkernel_lock, RW_READER);
 	/*
 	 * Remove it from the global list of all pmaps.
 	 */
 	mutex_enter(&pmap_all_pmaps_lock);
 	TAILQ_REMOVE(&pmap_all_pmaps, pmap, pm_list);
 	mutex_exit(&pmap_all_pmaps_lock);
 	pool_cache_put(&pmap_l1pt_cache, pmap->pm_lev1map);
 @@ -1640,27 +1639,27 @@ pmap_destroy(pmap_t pmap)
+ *
  *	Add a reference to the specified pmap.
  */
 void
 pmap_reference(pmap_t pmap)
+{
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_reference(%p)\n", pmap);
 #endif
 	atomic_inc_ulong(&pmap->pm_count);
-	PMAP_MP(alpha_mb());
+	PMAP_MP(membar_enter());
+}
 /*
  * pmap_remove:			[ INTERFACE ]
+ *
  *	Remove the given range of addresses from the specified map.
+ *
  *	It is assumed that the start and end are properly
  *	rounded to the page size.
  */
 static void
 pmap_remove_internal(pmap_t pmap, vaddr_t sva, vaddr_t eva,
     struct pmap_tlb_context * const tlbctx)
 @@ -2296,27 +2295,27 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
 	KASSERT(va >= VM_MIN_KERNEL_ADDRESS);
 	pt_entry_t * const pte = PMAP_KERNEL_PTE(va);
 	/* Build the new PTE. */
 	const pt_entry_t npte =
 	    ((pa >> PGSHIFT) << PG_SHIFT) | pte_prot(pmap_kernel(), prot) |
 	    PG_V | PG_WIRED;
 	/* Set the new PTE. */
 	const pt_entry_t opte = atomic_load_relaxed(pte);
 	atomic_store_relaxed(pte, npte);
-	PMAP_MP(alpha_mb());
+	PMAP_MP(membar_enter());
 	PMAP_STAT_INCR(pmap->pm_stats.resident_count, 1);
 	PMAP_STAT_INCR(pmap->pm_stats.wired_count, 1);
 	/*
 	 * There should not have been anything here, previously,
 	 * so we can skip TLB shootdowns, etc. in the common case.
 	 */
 	if (__predict_false(opte & PG_V)) {
 		const pt_entry_t diff = npte ^ opte;
 		printf_nolog("%s: mapping already present\n", __func__);
 		PMAP_STAT_DECR(pmap->pm_stats.resident_count, 1);
 @@ -2359,27 +2358,26 @@ pmap_kremove(vaddr_t va, vsize_t size)
 		opte = atomic_load_relaxed(pte);
 		if (opte & PG_V) {
 			KASSERT((opte & PG_PVLIST) == 0);
 			/* Zap the mapping. */
 			atomic_store_relaxed(pte, PG_NV);
 			pmap_tlb_shootdown(pmap, va, opte, &tlbctx);
 			/* Update stats. */
 			PMAP_STAT_DECR(pmap->pm_stats.resident_count, 1);
 			PMAP_STAT_DECR(pmap->pm_stats.wired_count, 1);
+		}
+	}
 	PMAP_MP(alpha_wmb());
 	pmap_tlb_shootnow(&tlbctx);
 	TLB_COUNT(reason_kremove);
+}
 /*
  * pmap_unwire:			[ INTERFACE ]
+ *
  *	Clear the wired attribute for a map/virtual-address pair.
+ *
  *	The mapping must already exist in the pmap.
  */
 void
 @@ -2604,27 +2602,26 @@ pmap_deactivate(struct lwp *l)
 	KASSERT(pmap == ci->ci_pmap);
 	/*
 	 * There is no need to switch to a different PTBR here,
 	 * because a pmap_activate() or SWPCTX is guaranteed
 	 * before whatever lev1map we're on now is invalidated
 	 * or before user space is accessed again.
+	 *
 	 * Because only kernel mappings will be accessed before the
 	 * next pmap_activate() call, we consider our CPU to be on
 	 * the kernel pmap.
 	 */
 	ci->ci_pmap = pmap_kernel();
 	PMAP_MP(alpha_mb());
 	KASSERT(atomic_load_relaxed(&pmap->pm_count) > 1);
 	pmap_destroy(pmap);
+}
 /*
  * pmap_zero_page:		[ INTERFACE ]
+ *
  *	Zero the specified (machine independent) page by mapping the page
  *	into virtual memory and clear its contents, one machine dependent
  *	page at a time.
+ *
  *	Note: no locking is necessary in this function.
  */