diff options
author | Alan Cox <alc@FreeBSD.org> | 2004-07-30 20:38:30 +0000 |
---|---|---|
committer | Alan Cox <alc@FreeBSD.org> | 2004-07-30 20:38:30 +0000 |
commit | 9bb0e0686177321598c25b25527322951d7c2c87 (patch) | |
tree | faa2860aa76235455158a6f157cb6600621e1bb2 /sys/powerpc | |
parent | 9be60284a61cba925961107135ac54d265afff20 (diff) | |
download | src-9bb0e0686177321598c25b25527322951d7c2c87.tar.gz src-9bb0e0686177321598c25b25527322951d7c2c87.zip |
- Push down the acquisition and release of Giant into pmap_protect() on
those architectures without pmap locking.
- Eliminate the acquisition and release of Giant from vm_map_protect().
(Translation: mprotect(2) runs to completion without touching Giant on
alpha, amd64, i386 and ia64.)
Notes
Notes:
svn path=/head/; revision=132899
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/aim/mmu_oea.c | 4 | ||||
-rw-r--r-- | sys/powerpc/powerpc/mmu_oea.c | 4 | ||||
-rw-r--r-- | sys/powerpc/powerpc/pmap.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index c0368605454c..4db44cb677e7 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -1459,10 +1459,13 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) ("pmap_protect: non current pmap")); if ((prot & VM_PROT_READ) == VM_PROT_NONE) { + mtx_lock(&Giant); pmap_remove(pm, sva, eva); + mtx_unlock(&Giant); return; } + mtx_lock(&Giant); vm_page_lock_queues(); for (; sva < eva; sva += PAGE_SIZE) { pvo = pmap_pvo_find_va(pm, sva, &pteidx); @@ -1490,6 +1493,7 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) pmap_pte_change(pt, &pvo->pvo_pte, pvo->pvo_vaddr); } vm_page_unlock_queues(); + mtx_unlock(&Giant); } /* diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c index c0368605454c..4db44cb677e7 100644 --- a/sys/powerpc/powerpc/mmu_oea.c +++ b/sys/powerpc/powerpc/mmu_oea.c @@ -1459,10 +1459,13 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) ("pmap_protect: non current pmap")); if ((prot & VM_PROT_READ) == VM_PROT_NONE) { + mtx_lock(&Giant); pmap_remove(pm, sva, eva); + mtx_unlock(&Giant); return; } + mtx_lock(&Giant); vm_page_lock_queues(); for (; sva < eva; sva += PAGE_SIZE) { pvo = pmap_pvo_find_va(pm, sva, &pteidx); @@ -1490,6 +1493,7 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) pmap_pte_change(pt, &pvo->pvo_pte, pvo->pvo_vaddr); } vm_page_unlock_queues(); + mtx_unlock(&Giant); } /* diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c index c0368605454c..4db44cb677e7 100644 --- a/sys/powerpc/powerpc/pmap.c +++ b/sys/powerpc/powerpc/pmap.c @@ -1459,10 +1459,13 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) ("pmap_protect: non current pmap")); if ((prot & VM_PROT_READ) == VM_PROT_NONE) { + mtx_lock(&Giant); pmap_remove(pm, sva, eva); + mtx_unlock(&Giant); return; } + mtx_lock(&Giant); vm_page_lock_queues(); for (; sva < eva; sva += PAGE_SIZE) { pvo = pmap_pvo_find_va(pm, sva, &pteidx); @@ -1490,6 +1493,7 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) pmap_pte_change(pt, &pvo->pvo_pte, pvo->pvo_vaddr); } vm_page_unlock_queues(); + mtx_unlock(&Giant); } /* |