diff options
author | attilio <attilio@FreeBSD.org> | 2013-05-21 20:38:19 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2013-05-21 20:38:19 +0000 |
commit | fdf82ef9cfb84888e76e303fe6c9ee30fbc21d1e (patch) | |
tree | 24458ef5e2585280bf95280f83f977fde60faeaa | |
parent | 05bd8275f3829e7d1f55e8faabd64095eab3c291 (diff) | |
download | FreeBSD-src-fdf82ef9cfb84888e76e303fe6c9ee30fbc21d1e.zip FreeBSD-src-fdf82ef9cfb84888e76e303fe6c9ee30fbc21d1e.tar.gz |
o Relax locking assertions for vm_page_find_least()
o Relax locking assertions for pmap_enter_object() and add them also
to architectures that currently don't have any
o Introduce VM_OBJECT_LOCK_DOWNGRADE() which is basically a downgrade
operation on the per-object rwlock
o Use all the mechanisms above to make vm_map_pmap_enter() to work
mostl of the times only with readlocks.
Sponsored by: EMC / Isilon storage division
Reviewed by: alc
-rw-r--r-- | sys/amd64/amd64/pmap.c | 3 | ||||
-rw-r--r-- | sys/arm/arm/pmap-v6.c | 2 | ||||
-rw-r--r-- | sys/arm/arm/pmap.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 3 | ||||
-rw-r--r-- | sys/i386/xen/pmap.c | 3 | ||||
-rw-r--r-- | sys/ia64/ia64/pmap.c | 3 | ||||
-rw-r--r-- | sys/mips/mips/pmap.c | 3 | ||||
-rw-r--r-- | sys/powerpc/aim/mmu_oea.c | 2 | ||||
-rw-r--r-- | sys/powerpc/aim/mmu_oea64.c | 2 | ||||
-rw-r--r-- | sys/powerpc/booke/pmap.c | 2 | ||||
-rw-r--r-- | sys/sparc64/sparc64/pmap.c | 2 | ||||
-rw-r--r-- | sys/vm/vm_map.c | 22 | ||||
-rw-r--r-- | sys/vm/vm_object.h | 2 | ||||
-rw-r--r-- | sys/vm/vm_page.c | 2 |
14 files changed, 40 insertions, 13 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index ebb184e..272158d 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -3722,7 +3722,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m, mpte; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 1174660..de14b0d 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -2931,6 +2931,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c index 0875f83..645e6bb 100644 --- a/sys/arm/arm/pmap.c +++ b/sys/arm/arm/pmap.c @@ -3587,6 +3587,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index f4681bf..d889bf8 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -3677,7 +3677,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m, mpte; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index a9bc124..01a493c 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -2871,7 +2871,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, multicall_entry_t *mclp = mcl; int error, count = 0; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index 883f39c..f2a4c65 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -1802,7 +1802,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c index 5c94a39..3ef5186 100644 --- a/sys/mips/mips/pmap.c +++ b/sys/mips/mips/pmap.c @@ -2399,7 +2399,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m, mpte; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 3c024de..17dcf66 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -1217,6 +1217,8 @@ moea_enter_object(mmu_t mmu, pmap_t pm, vm_offset_t start, vm_offset_t end, vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 709501b..df91892 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -1360,6 +1360,8 @@ moea64_enter_object(mmu_t mmu, pmap_t pm, vm_offset_t start, vm_offset_t end, vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index a4de230..7e3c29e 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1716,6 +1716,8 @@ mmu_booke_enter_object(mmu_t mmu, pmap_t pmap, vm_offset_t start, vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c index 8bbc7f4..adafa57 100644 --- a/sys/sparc64/sparc64/pmap.c +++ b/sys/sparc64/sparc64/pmap.c @@ -1632,6 +1632,8 @@ pmap_enter_object(pmap_t pm, vm_offset_t start, vm_offset_t end, vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&tte_list_global_lock); diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 933b0e1..a9ae803 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1806,18 +1806,27 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, if ((prot & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0 || object == NULL) return; - VM_OBJECT_WLOCK(object); + VM_OBJECT_RLOCK(object); if (object->type == OBJT_DEVICE || object->type == OBJT_SG) { - pmap_object_init_pt(map->pmap, addr, object, pindex, size); - goto unlock_return; + VM_OBJECT_RUNLOCK(object); + VM_OBJECT_WLOCK(object); + if (object->type == OBJT_DEVICE || object->type == OBJT_SG) { + pmap_object_init_pt(map->pmap, addr, object, pindex, + size); + VM_OBJECT_WUNLOCK(object); + return; + } + VM_OBJECT_LOCK_DOWNGRADE(object); } psize = atop(size); if (psize > MAX_INIT_PT && (flags & MAP_PREFAULT_PARTIAL) != 0) psize = MAX_INIT_PT; if (psize + pindex > object->size) { - if (object->size < pindex) - goto unlock_return; + if (object->size < pindex) { + VM_OBJECT_RUNLOCK(object); + return; + } psize = object->size - pindex; } @@ -1856,8 +1865,7 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, if (p_start != NULL) pmap_enter_object(map->pmap, start, addr + ptoa(psize), p_start, prot); -unlock_return: - VM_OBJECT_WUNLOCK(object); + VM_OBJECT_RUNLOCK(object); } /* diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index cf54663..05ab73d 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -223,6 +223,8 @@ extern struct vm_object kmem_object_store; rw_assert(&(object)->lock, RA_RLOCKED) #define VM_OBJECT_ASSERT_WLOCKED(object) \ rw_assert(&(object)->lock, RA_WLOCKED) +#define VM_OBJECT_LOCK_DOWNGRADE(object) \ + rw_downgrade(&(object)->lock) #define VM_OBJECT_RLOCK(object) \ rw_rlock(&(object)->lock) #define VM_OBJECT_RUNLOCK(object) \ diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 637fb0c..15697c9 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -959,7 +959,7 @@ vm_page_find_least(vm_object_t object, vm_pindex_t pindex) { vm_page_t m; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); if ((m = TAILQ_FIRST(&object->memq)) != NULL && m->pindex < pindex) m = vm_radix_lookup_ge(&object->rtree, pindex); return (m); |