[src/trunk]: src/sys/arch/arm/arm32 Sprinkle kpreempt_{dis,en}able ready for ...

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

details:   https://anonhg.NetBSD.org/src/rev/fafdd6b19ffb
branches:  trunk
changeset: 960300:fafdd6b19ffb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Mar 14 10:36:46 2021 +0000

description:
Sprinkle kpreempt_{dis,en}able ready for when preemption gets turned on.

diffstat:

 sys/arch/arm/arm32/pmap.c |  38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diffs (231 lines):

diff -r c8b6eff19454 -r fafdd6b19ffb sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Sun Mar 14 08:16:57 2021 +0000
+++ b/sys/arch/arm/arm32/pmap.c Sun Mar 14 10:36:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.425 2021/02/01 19:02:28 skrll Exp $ */
+/*     $NetBSD: pmap.c,v 1.426 2021/03/14 10:36:46 skrll Exp $ */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -192,7 +192,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.425 2021/02/01 19:02:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.426 2021/03/14 10:36:46 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -2837,6 +2837,7 @@
        UVMHIST_FUNC(__func__);
        UVMHIST_CALLARGS(maphist, "md %#jx pa %#jx", (uintptr_t)md, pa, 0, 0);
 
+       kpreempt_disable();
        pmap_acquire_page_lock(md);
        struct pv_entry **pvp = &SLIST_FIRST(&md->pvh_list);
        if (*pvp == NULL) {
@@ -2851,6 +2852,8 @@
                PMAP_VALIDATE_MD_PAGE(md);
 #endif
                pmap_release_page_lock(md);
+               kpreempt_enable();
+
                return;
        }
 #if defined(PMAP_CACHE_VIPT) && !defined(ARM_MMU_EXTENDED)
@@ -3004,6 +3007,8 @@
        }
        cpu_cpwait();
 #endif /* ARM_MMU_EXTENDED */
+
+       kpreempt_enable();
 }
 
 /*
@@ -3111,6 +3116,7 @@
        if (flags & PMAP_WIRED)
                nflags |= PVF_WIRED;
 
+       kpreempt_disable();
        pmap_acquire_pmap_lock(pm);
 
        /*
@@ -3125,6 +3131,8 @@
        if (l2b == NULL) {
                if (flags & PMAP_CANFAIL) {
                        pmap_release_pmap_lock(pm);
+                       kpreempt_enable();
+
                        error = ENOMEM;
                        goto free_pv;
                }
@@ -3419,13 +3427,14 @@
 #endif
 
        pmap_release_pmap_lock(pm);
-
+       kpreempt_enable();
 
        if (old_pv)
                pool_put(&pmap_pv_pool, old_pv);
 free_pv:
        if (new_pv)
                pool_put(&pmap_pv_pool, new_pv);
+
        return error;
 }
 
@@ -3470,6 +3479,7 @@
        /*
         * we lock in the pmap => pv_head direction
         */
+       kpreempt_disable();
        pmap_acquire_pmap_lock(pm);
 
 #ifndef ARM_MMU_EXTENDED
@@ -3637,6 +3647,8 @@
        }
 
        pmap_release_pmap_lock(pm);
+       kpreempt_enable();
+
        SLIST_FOREACH_SAFE(pv, &opv_list, pv_link, npv) {
                pool_put(&pmap_pv_pool, pv);
        }
@@ -3709,6 +3721,7 @@
                     flags);
        }
 
+       kpreempt_disable();
        pmap_t kpm = pmap_kernel();
        pmap_acquire_pmap_lock(kpm);
        struct l2_bucket * const l2b = pmap_get_l2_bucket(kpm, va);
@@ -3845,6 +3858,8 @@
                        pool_put(&pmap_pv_pool, pv);
 #endif
        }
+       kpreempt_enable();
+
        if (pmap_initialized) {
                UVMHIST_LOG(maphist, "  <-- done (ptep %#jx: %#jx -> %#jx)",
                    (uintptr_t)ptep, opte, npte, 0);
@@ -3867,6 +3882,7 @@
        const vaddr_t eva = va + len;
        pmap_t kpm = pmap_kernel();
 
+       kpreempt_disable();
        pmap_acquire_pmap_lock(kpm);
 
        while (va < eva) {
@@ -3931,6 +3947,8 @@
        }
        pmap_release_pmap_lock(kpm);
        cpu_cpwait();
+       kpreempt_enable();
+
        UVMHIST_LOG(maphist, "  <--- done (%ju mappings removed)",
            total_mappings, 0, 0, 0);
 }
@@ -3952,6 +3970,7 @@
        u_int l1slot;
        bool coherent;
 
+       kpreempt_disable();
        pmap_acquire_pmap_lock(pm);
 
        l1slot = l1pte_index(va);
@@ -3982,11 +4001,14 @@
                if (l2 == NULL ||
                    (ptep = l2->l2_bucket[L2_BUCKET(l1slot)].l2b_kva) == NULL) {
                        pmap_release_pmap_lock(pm);
+                       kpreempt_enable();
+
                        return false;
                }
 
                pte = ptep[l2pte_index(va)];
                pmap_release_pmap_lock(pm);
+               kpreempt_enable();
 
                if (pte == 0)
                        return false;
@@ -4023,6 +4045,7 @@
 {
        struct pmap_page *pp;
 
+       KASSERT(kpreempt_disabled());
        pp = pmap_pv_tracked(pa);
        if (pp == NULL)
                panic("pmap_pv_protect: page not pv-tracked: 0x%"PRIxPADDR,
@@ -4064,6 +4087,7 @@
                return;
        }
 
+       kpreempt_disable();
        pmap_acquire_pmap_lock(pm);
 
 #ifndef ARM_MMU_EXTENDED
@@ -4154,6 +4178,7 @@
 #endif
 
        pmap_release_pmap_lock(pm);
+       kpreempt_enable();
 }
 
 void
@@ -4364,6 +4389,7 @@
 
   out:
        kpreempt_enable();
+
        return rv;
 }
 #endif
@@ -4392,6 +4418,7 @@
            (uintptr_t)PMAP_PAI(pm, cpu_tlb_info(curcpu()))->pai_asid, 0);
 #endif
 
+       kpreempt_disable();
        pmap_acquire_pmap_lock(pm);
 
        /*
@@ -4785,6 +4812,7 @@
 
 out:
        pmap_release_pmap_lock(pm);
+       kpreempt_enable();
 
        return rv;
 }
@@ -4825,6 +4853,7 @@
        UVMHIST_FUNC(__func__);
        UVMHIST_CALLARGS(maphist, "pm %#jx va %#jx", (uintptr_t)pm, va, 0, 0);
 
+       kpreempt_disable();
        pmap_acquire_pmap_lock(pm);
 
        l2b = pmap_get_l2_bucket(pm, va);
@@ -4846,6 +4875,7 @@
        }
 
        pmap_release_pmap_lock(pm);
+       kpreempt_enable();
 
        UVMHIST_LOG(maphist, " <-- done", 0, 0, 0, 0);
 }
@@ -5188,6 +5218,7 @@
 
        KASSERT(pm != pmap_kernel());
 
+       kpreempt_disable();
        /*
         * The vmspace described by this pmap is about to be torn down.
         * Until pmap_update() is called, UVM will only make calls
@@ -5212,6 +5243,7 @@
        pmap_tlb_asid_release_all(pm);
 #endif
        pm->pm_remove_all = true;
+       kpreempt_enable();
 
        UVMHIST_LOG(maphist, " <-- done", 0, 0, 0, 0);
        return false;