svn commit: r212278 - head/sys/powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Sep  6 23:07:58 2010
New Revision: 212278
URL: http://svn.freebsd.org/changeset/base/212278

Log:
  Fix the same race condition on 32-bit AIM CPUs that was fixed for 64-bit
  ones in r211967 involving VSID allocation.

Modified:
  head/sys/powerpc/aim/mmu_oea.c

Modified: head/sys/powerpc/aim/mmu_oea.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea.c      Mon Sep  6 23:05:38 2010        
(r212277)
+++ head/sys/powerpc/aim/mmu_oea.c      Mon Sep  6 23:07:58 2010        
(r212278)
@@ -203,6 +203,7 @@ extern struct pmap ofw_pmap;
  * Lock for the pteg and pvo tables.
  */
 struct mtx     moea_table_mutex;
+struct mtx     moea_vsid_mutex;
 
 /* tlbie instruction synchronization */
 static struct mtx tlbie_mtx;
@@ -819,6 +820,7 @@ moea_bootstrap(mmu_t mmup, vm_offset_t k
         */
        mtx_init(&moea_table_mutex, "pmap table", NULL, MTX_DEF |
            MTX_RECURSE);
+       mtx_init(&moea_vsid_mutex, "VSID table", NULL, MTX_DEF);
 
        mtx_init(&tlbie_mtx, "tlbie", NULL, MTX_SPIN);
 
@@ -1589,6 +1591,7 @@ moea_pinit(mmu_t mmu, pmap_t pmap)
        }
        
 
+       mtx_lock(&moea_vsid_mutex);
        /*
         * Allocate some segment registers for this pmap.
         */
@@ -1623,9 +1626,11 @@ moea_pinit(mmu_t mmu, pmap_t pmap)
                moea_vsid_bitmap[n] |= mask;
                for (i = 0; i < 16; i++)
                        pmap->pm_sr[i] = VSID_MAKE(i, hash);
+               mtx_unlock(&moea_vsid_mutex);
                return;
        }
 
+       mtx_unlock(&moea_vsid_mutex);
        panic("moea_pinit: out of segments");
 }
 
@@ -1737,10 +1742,12 @@ moea_release(mmu_t mmu, pmap_t pmap)
         if (pmap->pm_sr[0] == 0)
                 panic("moea_release");
 
+       mtx_lock(&moea_vsid_mutex);
         idx = VSID_TO_HASH(pmap->pm_sr[0]) & (NPMAPS-1);
         mask = 1 << (idx % VSID_NBPW);
         idx /= VSID_NBPW;
         moea_vsid_bitmap[idx] &= ~mask;
+       mtx_unlock(&moea_vsid_mutex);
        PMAP_LOCK_DESTROY(pmap);
 }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"