[src/netbsd-6]: src/sys/common/pmap/tlb Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/df17434e7a83
branches:  netbsd-6
changeset: 774319:df17434e7a83
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jul 05 18:50:52 2012 +0000

description:
Pull up following revision(s) (requested by matt in ticket #404):
        sys/common/pmap/tlb/pmap.c: revision 1.14
        sys/common/pmap/tlb/pmap.h: revision 1.13
        sys/common/pmap/tlb/pmap_segtab.c: revision 1.5
The lockless list can lead to corruption.  Instead use a spinlock to =
control
access to the head of the free segtab list.
=20
=20

diffstat:

 sys/common/pmap/tlb/pmap.c        |   9 +++++-
 sys/common/pmap/tlb/pmap.h        |   3 +-
 sys/common/pmap/tlb/pmap_segtab.c |  51 ++++++++++++++++----------------------
 3 files changed, 31 insertions(+), 32 deletions(-)

diffs (150 lines):

diff -r 929aac7f763f -r df17434e7a83 sys/common/pmap/tlb/pmap.c
--- a/sys/common/pmap/tlb/pmap.c        Thu Jul 05 18:49:03 2012 +0000
+++ b/sys/common/pmap/tlb/pmap.c        Thu Jul 05 18:50:52 2012 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -67,7 +67,7 @@
 
 #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.
@@ -439,6 +439,11 @@
        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.
diff -r 929aac7f763f -r df17434e7a83 sys/common/pmap/tlb/pmap.h
--- a/sys/common/pmap/tlb/pmap.h        Thu Jul 05 18:49:03 2012 +0000
+++ b/sys/common/pmap/tlb/pmap.h        Thu Jul 05 18:50:52 2012 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -109,6 +109,7 @@
 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 */
 
 /*
diff -r 929aac7f763f -r df17434e7a83 sys/common/pmap/tlb/pmap_segtab.c
--- a/sys/common/pmap/tlb/pmap_segtab.c Thu Jul 05 18:49:03 2012 +0000
+++ b/sys/common/pmap/tlb/pmap_segtab.c Thu Jul 05 18:50:52 2012 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -67,7 +67,7 @@
 
 #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.
@@ -110,7 +110,7 @@
 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;
@@ -121,6 +121,8 @@
 #endif
 } pmap_segtab_info;
 
+kmutex_t pmap_segtab_lock __cacheline_aligned;
+
 static inline struct vm_page *
 pmap_pte_pagealloc(void)
 {
@@ -162,20 +164,16 @@
 {
        struct pmap_segtab *stp;
  again:
-       stp = NULL;
-       while (__predict_true(pmap_segtab_info.free_segtab != NULL)) {
-               struct pmap_segtab *next_stp;
-               stp = pmap_segtab_info.free_segtab;
-               next_stp = (struct pmap_segtab *)stp->seg_tab[0];
-               if (stp == atomic_cas_ptr(&pmap_segtab_info.free_segtab, stp, next_stp)) {
-                       SEGTAB_ADD(nget, 1);
-                       break;
-               }
+       mutex_spin_enter(&pmap_segtab_lock);
+       if (__predict_true((stp = pmap_segtab_info.free_segtab) != NULL)) {
+               pmap_segtab_info.free_segtab =
+                   (struct pmap_segtab *)stp->seg_tab[0];
+               stp->seg_tab[0] = NULL;
+               SEGTAB_ADD(nget, 1);
        }
+       mutex_spin_exit(&pmap_segtab_lock);
        
-       if (__predict_true(stp != NULL)) {
-               stp->seg_tab[0] = NULL;
-       } else {
+       if (__predict_false(stp == NULL)) {
                struct vm_page * const stp_pg = pmap_pte_pagealloc();
 
                if (__predict_false(stp_pg == NULL)) {
@@ -200,13 +198,11 @@
                        /*
                         * Now link the new segtabs into the free segtab list.
                         */
-                       for (;;) {
-                               void *tmp = pmap_segtab_info.free_segtab;
-                               stp[n-1].seg_tab[0] = tmp;
-                               if (tmp == atomic_cas_ptr(&pmap_segtab_info.free_segtab, tmp, stp+1))
-                                       break;
-                       }
+                       mutex_spin_enter(&pmap_segtab_lock);
+                       stp[n-1].seg_tab[0] = (void *)pmap_segtab_info.free_segtab;
+                       pmap_segtab_info.free_segtab = stp + 1;
                        SEGTAB_ADD(nput, n - 1);
+                       mutex_spin_exit(&pmap_segtab_lock);
                }
        }
 
@@ -255,14 +251,11 @@
        /*
         * Insert the the segtab into the segtab freelist.
         */
-       for (;;) {
-               void *tmp = pmap_segtab_info.free_segtab;
-               stp->seg_tab[0] = tmp;
-               if (tmp == atomic_cas_ptr(&pmap_segtab_info.free_segtab, tmp, stp)) {
-                       SEGTAB_ADD(nput, 1);
-                       break;
-               }
-       }
+       mutex_spin_enter(&pmap_segtab_lock);
+       stp->seg_tab[0] = (void *) pmap_segtab_info.free_segtab;
+       pmap_segtab_info.free_segtab = stp;
+       SEGTAB_ADD(nput, 1);
+       mutex_spin_exit(&pmap_segtab_lock);
 }
 
 /*