[src/trunk]: src/sys/arch/powerpc/oea avoid calling into the pool code while ...

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

details:   https://anonhg.NetBSD.org/src/rev/1243d6e7b859
branches:  trunk
changeset: 584715:1243d6e7b859
user:      chs <chs%NetBSD.org@localhost>
date:      Tue Sep 27 08:03:11 2005 +0000

description:
avoid calling into the pool code while PSL_EE is off.
the pool code can do spl*()/splx(), and splx() requires PSL_EE to be on.

diffstat:

 sys/arch/powerpc/oea/pmap.c |  53 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 12 deletions(-)

diffs (159 lines):

diff -r 9517be6bc6e2 -r 1243d6e7b859 sys/arch/powerpc/oea/pmap.c
--- a/sys/arch/powerpc/oea/pmap.c       Tue Sep 27 07:20:32 2005 +0000
+++ b/sys/arch/powerpc/oea/pmap.c       Tue Sep 27 08:03:11 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.32 2005/06/02 14:35:08 he Exp $     */
+/*     $NetBSD: pmap.c,v 1.33 2005/09/27 08:03:11 chs Exp $    */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.32 2005/06/02 14:35:08 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33 2005/09/27 08:03:11 chs Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_altivec.h"
@@ -243,7 +243,9 @@
 STATIC int pmap_pte_insert(int, struct pte *);
 STATIC int pmap_pvo_enter(pmap_t, struct pool *, struct pvo_head *,
        vaddr_t, paddr_t, register_t, int);
-STATIC void pmap_pvo_remove(struct pvo_entry *, int, boolean_t);
+STATIC void pmap_pvo_remove(struct pvo_entry *, int, struct pvo_head *);
+STATIC void pmap_pvo_free(struct pvo_entry *);
+STATIC void pmap_pvo_free_list(struct pvo_head *);
 STATIC struct pvo_entry *pmap_pvo_find_va(pmap_t, vaddr_t, int *); 
 STATIC volatile struct pte *pmap_pvo_to_pte(const struct pvo_entry *, int);
 STATIC struct pvo_entry *pmap_pvo_reclaim(struct pmap *);
@@ -1520,7 +1522,7 @@
                pvoh = &pmap_pvo_table[idx];
                TAILQ_FOREACH(pvo, pvoh, pvo_olink) {
                        if ((pvo->pvo_vaddr & PVO_WIRED) == 0) {
-                               pmap_pvo_remove(pvo, -1, FALSE);
+                               pmap_pvo_remove(pvo, -1, NULL);
                                pmap_pvo_reclaim_nextidx = idx;
                                PMAPCOUNT(pvos_reclaimed);
                                return pvo;
@@ -1582,7 +1584,7 @@
                        }
 #endif
                        PMAPCOUNT(mappings_replaced);
-                       pmap_pvo_remove(pvo, -1, TRUE);
+                       pmap_pvo_remove(pvo, -1, NULL);
                        break;
                }
        }
@@ -1594,6 +1596,9 @@
        --pmap_pvo_enter_depth;
 #endif
        pmap_interrupts_restore(msr);
+       if (pvo) {
+               pmap_pvo_free(pvo);
+       }
        pvo = pool_get(pl, poolflags);
 
 #ifdef DEBUG
@@ -1690,7 +1695,7 @@
 }
 
 void
-pmap_pvo_remove(struct pvo_entry *pvo, int pteidx, boolean_t do_free)
+pmap_pvo_remove(struct pvo_entry *pvo, int pteidx, struct pvo_head *pvol)
 {
        volatile struct pte *pt;
        int ptegidx;
@@ -1761,15 +1766,34 @@
         */
        LIST_REMOVE(pvo, pvo_vlink);
        TAILQ_REMOVE(&pmap_pvo_table[ptegidx], pvo, pvo_olink);
-       if (do_free) {
-               pool_put(pvo->pvo_vaddr & PVO_MANAGED ? &pmap_mpvo_pool :
-                        &pmap_upvo_pool, pvo);
+       if (pvol) {
+               LIST_INSERT_HEAD(pvol, pvo, pvo_vlink);
        }
 #if defined(DIAGNOSTIC) || defined(DEBUG) || defined(PMAPCHECK)
        pmap_pvo_remove_depth--;
 #endif
 }
 
+void
+pmap_pvo_free(struct pvo_entry *pvo)
+{
+
+       pool_put(pvo->pvo_vaddr & PVO_MANAGED ? &pmap_mpvo_pool :
+                &pmap_upvo_pool, pvo);
+}
+
+void
+pmap_pvo_free_list(struct pvo_head *pvol)
+{
+       struct pvo_entry *pvo, *npvo;
+
+       for (pvo = LIST_FIRST(pvol); pvo != NULL; pvo = npvo) {
+               npvo = LIST_NEXT(pvo, pvo_vlink);
+               LIST_REMOVE(pvo, pvo_vlink);
+               pmap_pvo_free(pvo);
+       }
+}
+
 /*
  * Mark a mapping as executable.
  * If this is the first executable mapping in the segment,
@@ -1991,18 +2015,21 @@
 void
 pmap_remove(pmap_t pm, vaddr_t va, vaddr_t endva)
 {
+       struct pvo_head pvol;
        struct pvo_entry *pvo;
        register_t msr;
        int pteidx;
 
+       LIST_INIT(&pvol);
        msr = pmap_interrupts_off();
        for (; va < endva; va += PAGE_SIZE) {
                pvo = pmap_pvo_find_va(pm, va, &pteidx);
                if (pvo != NULL) {
-                       pmap_pvo_remove(pvo, pteidx, TRUE);
+                       pmap_pvo_remove(pvo, pteidx, &pvol);
                }
        }
        pmap_interrupts_restore(msr);
+       pmap_pvo_free_list(&pvol);
 }
 
 /*
@@ -2165,12 +2192,13 @@
 void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
 {
-       struct pvo_head *pvo_head;
+       struct pvo_head *pvo_head, pvol;
        struct pvo_entry *pvo, *next_pvo;
        volatile struct pte *pt;
        register_t msr;
 
        KASSERT(prot != VM_PROT_ALL);
+       LIST_INIT(&pvol);
        msr = pmap_interrupts_off();
 
        /*
@@ -2196,7 +2224,7 @@
                 * Downgrading to no mapping at all, we just remove the entry.
                 */
                if ((prot & VM_PROT_READ) == 0) {
-                       pmap_pvo_remove(pvo, -1, TRUE);
+                       pmap_pvo_remove(pvo, -1, &pvol);
                        continue;
                } 
 
@@ -2232,6 +2260,7 @@
                PMAP_PVO_CHECK(pvo);            /* sanity check */
        }
        pmap_interrupts_restore(msr);
+       pmap_pvo_free_list(&pvol);
 }
 
 /*