[src/trunk]: src/sys/arch/sparc64/sparc64 convert pmap_lock into an IPL_VM lo...

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

details:   https://anonhg.NetBSD.org/src/rev/8dca34537506
branches:  trunk
changeset: 753221:8dca34537506
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Mar 20 20:36:23 2010 +0000

description:
convert pmap_lock into an IPL_VM lock, and avoid calling
KASSERT(!mutex_owned(&pmap_lock)) since that's no longer valid.

this fixes hangs on 4-core machines like the U80.

tested on U80, SB2500 and SB2000.


XXX: my initial attempts to replace pseg_lock with this new equivalent
XXX: lock hang in pmap_bootstrap it seems..  but this should be able
XXX: to go away now.

diffstat:

 sys/arch/sparc64/sparc64/pmap.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r d8408bc0bec3 -r 8dca34537506 sys/arch/sparc64/sparc64/pmap.c
--- a/sys/arch/sparc64/sparc64/pmap.c   Sat Mar 20 20:34:56 2010 +0000
+++ b/sys/arch/sparc64/sparc64/pmap.c   Sat Mar 20 20:36:23 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.259 2010/03/10 06:57:22 mrg Exp $   */
+/*     $NetBSD: pmap.c,v 1.260 2010/03/20 20:36:23 mrg Exp $   */
 /*
  *
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.259 2010/03/10 06:57:22 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.260 2010/03/20 20:36:23 mrg Exp $");
 
 #undef NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define        HWREF
@@ -1293,7 +1293,7 @@
        vm_first_phys = avail_start;
        vm_num_phys = avail_end - avail_start;
 
-       mutex_init(&pmap_lock, MUTEX_DEFAULT, IPL_NONE);
+       mutex_init(&pmap_lock, MUTEX_SPIN, IPL_VM);
 #if defined(USE_LOCKSAFE_PSEG_GETSET)
        mutex_init(&pseg_lock, MUTEX_SPIN, IPL_VM);
 #endif
@@ -2621,8 +2621,6 @@
        pv_entry_t pv, npv;
        bool res = false;
 
-       KASSERT(!mutex_owned(&pmap_lock));
-
        /* Check if any mapping has been modified */
        pv = &pg->mdpage.mdpg_pvh;
        if (pv->pv_va & PV_MOD)
@@ -2725,8 +2723,6 @@
        pv_entry_t pv;
        bool res = false;
 
-       KASSERT(!mutex_owned(&pmap_lock));
-
        /* Check if any mapping has been referenced */
        pv = &pg->mdpage.mdpg_pvh;
        if (pv->pv_va & PV_REF)