 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.12 2012/01/18 07:17:09 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.12.2.1 2012/07/05 18:50:52 riz 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.12 2012/01/18 07:17:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.12.2.1 2012/07/05 18:50:52 riz 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,
 @@ -429,26 +429,31 @@ pmap_steal_memory(vsize_t size, vaddr_t
  *	Initialize the pmap module.
  *	Called by vm_init, to initialize any structures that the pmap
  *	system needs to map virtual memory.
  */
 void
 pmap_init(void)
+{
         UVMHIST_INIT_STATIC(pmapexechist, pmapexechistbuf);
         UVMHIST_INIT_STATIC(pmaphist, pmaphistbuf);
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmaphist);
 	/*
 	 * Initialize the segtab lock.
 	 */
 	mutex_init(&pmap_segtab_lock, MUTEX_DEFAULT, IPL_HIGH);
 	/*
 	 * Set a low water mark on the pv_entry pool, so that we are
 	 * more likely to have these around even in extreme memory
 	 * starvation.
 	 */
 	pool_setlowat(&pmap_pv_pool, pmap_pv_lowat);
 	pmap_md_init();
 	/*
 	 * Now it is safe to enable pv entry recording.
 	 */
 	pmap_initialized = true;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.11 2011/10/13 19:50:39 matt Exp $	*/
+/*	$NetBSD: pmap.h,v 1.11.8.1 2012/07/05 18:50:52 riz Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell.
+ *
  * 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.
 @@ -99,26 +99,27 @@ struct pmap_segtab {
 };
 #ifdef _KERNEL
 struct pmap;
 typedef bool (*pte_callback_t)(struct pmap *, vaddr_t, vaddr_t,
 	pt_entry_t *, uintptr_t);
 pt_entry_t *pmap_pte_lookup(struct pmap *, vaddr_t);
 pt_entry_t *pmap_pte_reserve(struct pmap *, vaddr_t, int);
 void pmap_pte_process(struct pmap *, vaddr_t, vaddr_t, pte_callback_t,
 	uintptr_t);
 void pmap_segtab_activate(struct pmap *, struct lwp *);
 void pmap_segtab_alloc(struct pmap *);
 void pmap_segtab_free(struct pmap *);
 extern kmutex_t pmap_segtab_lock;
 #endif /* _KERNEL */
 /*
  * Per TLB (normally same as CPU) asid info
  */
 struct pmap_asid_info {
 	LIST_ENTRY(pmap_asid_info) pai_link;
 	uint32_t	pai_asid;	/* TLB address space tag */
 };
 #define	TLBINFO_LOCK(ti)		mutex_spin_enter((ti)->ti_lock)
 #define	TLBINFO_UNLOCK(ti)		mutex_spin_exit((ti)->ti_lock)
 #define	PMAP_PAI_ASIDVALID_P(pai, ti)	((pai)->pai_asid != 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_segtab.c,v 1.4 2011/06/23 08:11:56 matt Exp $	*/
+/*	$NetBSD: pmap_segtab.c,v 1.4.8.1 2012/07/05 18:50:52 riz 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_segtab.c,v 1.4 2011/06/23 08:11:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.4.8.1 2012/07/05 18:50:52 riz 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,
 @@ -100,37 +100,39 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_segtab.
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/atomic.h>
 #include <uvm/uvm.h>
 CTASSERT(NBPG >= sizeof(struct pmap_segtab));
 struct pmap_segtab_info {
-	struct pmap_segtab * volatile free_segtab;		/* free list kept locally */
+	struct pmap_segtab *free_segtab;	/* free list kept locally */
 #ifdef DEBUG
 	uint32_t nget_segtab;
 	uint32_t nput_segtab;
 	uint32_t npage_segtab;
 #define	SEGTAB_ADD(n, v)	(pmap_segtab_info.n ## _segtab += (v))
 #else
 #define	SEGTAB_ADD(n, v)	((void) 0)
 #endif
 } pmap_segtab_info;
 kmutex_t pmap_segtab_lock __cacheline_aligned;
 static inline struct vm_page *
 pmap_pte_pagealloc(void)
+{
 	return pmap_md_alloc_poolpage(UVM_PGA_ZERO|UVM_PGA_USERESERVE);
+}
 static inline pt_entry_t *
 pmap_segmap(struct pmap *pmap, vaddr_t va)
+{
 	struct pmap_segtab *stp = pmap->pm_segtab;
 	KASSERT(pmap != pmap_kernel() || !pmap_md_direct_mapped_vaddr_p(va));
 	return stp->seg_tab[va >> SEGSHIFT];
+}
 @@ -152,71 +154,65 @@ pmap_pte_lookup(pmap_t pmap, vaddr_t va)
  *	is zero, the map is an actual physical
  *	map, and may be referenced by the
  *	hardware.
+ *
  *	If the size specified is non-zero,
  *	the map will be used in software only, and
  *	is bounded by that size.
  */
 void
 pmap_segtab_alloc(pmap_t pmap)
+{
 	struct pmap_segtab *stp;
  again:
-	stp = NULL;
+	mutex_spin_enter(&pmap_segtab_lock);
-	while (__predict_true(pmap_segtab_info.free_segtab != NULL)) {
+	if (__predict_true((stp = pmap_segtab_info.free_segtab) != NULL)) {
-		struct pmap_segtab *next_stp;
+		pmap_segtab_info.free_segtab =
-		stp = pmap_segtab_info.free_segtab;
+		    (struct pmap_segtab *)stp->seg_tab[0];
-		next_stp = (struct pmap_segtab *)stp->seg_tab[0];
+		stp->seg_tab[0] = NULL;
-		if (stp == atomic_cas_ptr(&pmap_segtab_info.free_segtab, stp, next_stp)) {
+		SEGTAB_ADD(nget, 1);
 			SEGTAB_ADD(nget, 1);
 			break;
+	}
 	mutex_spin_exit(&pmap_segtab_lock);
-	if (__predict_true(stp != NULL)) {
+	if (__predict_false(stp == NULL)) {
 		stp->seg_tab[0] = NULL;
 	} else {
 		struct vm_page * const stp_pg = pmap_pte_pagealloc();
 		if (__predict_false(stp_pg == NULL)) {
 			/*
 			 * XXX What else can we do?  Could we deadlock here?
 			 */
 			uvm_wait("pmap_create");
 			goto again;
+		}
 		SEGTAB_ADD(npage, 1);
 		const paddr_t stp_pa = VM_PAGE_TO_PHYS(stp_pg);
 		stp = (struct pmap_segtab *)POOL_PHYSTOV(stp_pa);
 		const size_t n = NBPG / sizeof(struct pmap_segtab);
 		if (n > 1) {
 			/*
 			 * link all the segtabs in this page together
 			 */
 			for (size_t i = 1; i < n - 1; i++) {
 				stp[i].seg_tab[0] = (void *)&stp[i+1];
+			}
 			/*
 			 * Now link the new segtabs into the free segtab list.
 			 */
-			for (;;) {
+			mutex_spin_enter(&pmap_segtab_lock);
-				void *tmp = pmap_segtab_info.free_segtab;
+			stp[n-1].seg_tab[0] = (void *)pmap_segtab_info.free_segtab;
-				stp[n-1].seg_tab[0] = tmp;
+			pmap_segtab_info.free_segtab = stp + 1;
 				if (tmp == atomic_cas_ptr(&pmap_segtab_info.free_segtab, tmp, stp+1))
 					break;
 			SEGTAB_ADD(nput, n - 1);
 			mutex_spin_exit(&pmap_segtab_lock);
+		}
+	}
 #ifdef PARANOIADIAG
 	for (i = 0; i < PMAP_SEGTABSIZE; i++) {
 		if (stp->seg_tab[i] != 0)
 			panic("pmap_create: pm_segtab.seg_tab[%zu] != 0");
+	}
 #endif
 	pmap->pm_segtab = stp;
+}
 @@ -245,34 +241,31 @@ pmap_segtab_free(pmap_t pmap)
 				panic("pmap_destroy: segmap not empty");
+		}
 #endif
 		pa = POOL_VTOPHYS(pte);
 		uvm_pagefree(PHYS_TO_VM_PAGE(pa));
 		stp->seg_tab[i] = NULL;
+	}
 	/*
 	 * Insert the the segtab into the segtab freelist.
 	 */
-	for (;;) {
+	mutex_spin_enter(&pmap_segtab_lock);
-		void *tmp = pmap_segtab_info.free_segtab;
+	stp->seg_tab[0] = (void *) pmap_segtab_info.free_segtab;
-		stp->seg_tab[0] = tmp;
+	pmap_segtab_info.free_segtab = stp;
-		if (tmp == atomic_cas_ptr(&pmap_segtab_info.free_segtab, tmp, stp)) {
+	SEGTAB_ADD(nput, 1);
-			SEGTAB_ADD(nput, 1);
+	mutex_spin_exit(&pmap_segtab_lock);
 			break;
+}
 /*
  *	Make a new pmap (vmspace) active for the given process.
  */
 void
 pmap_segtab_activate(struct pmap *pm, struct lwp *l)
+{
 	if (l == curlwp) {
 		if (pm == pmap_kernel()) {
 			l->l_cpu->ci_pmap_user_segtab = (void*)0xdeadbabe;
 		} else {
 			KASSERT(pm == l->l_proc->p_vmspace->vm_map.pmap);