diff options
| author | alc <alc@FreeBSD.org> | 2002-12-01 18:57:56 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2002-12-01 18:57:56 +0000 |
| commit | 199800e1058c80a0d322fd71be36716efb764bb4 (patch) | |
| tree | 425df9792c443e4cf082c2ae44d5d47f24c8106a /sys | |
| parent | 60e7b0b07f69e424e8351fa8287a70bb86d65132 (diff) | |
| download | FreeBSD-src-199800e1058c80a0d322fd71be36716efb764bb4.zip FreeBSD-src-199800e1058c80a0d322fd71be36716efb764bb4.tar.gz | |
Hold the page queues lock when calling pmap_protect(); it updates fields
of the vm_page structure. Make the style of the pmap_protect() calls
consistent.
Approved by: re (blanket)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/vm/vm_map.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 84e12c6..0aa5519 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1857,8 +1857,11 @@ vm_map_clean( } } - if (invalidate) - pmap_remove(vm_map_pmap(map), start, end); + if (invalidate) { + vm_page_lock_queues(); + pmap_remove(map->pmap, start, end); + vm_page_unlock_queues(); + } /* * Make a second pass, cleaning/uncaching pages from the indicated * objects as we go. @@ -2071,7 +2074,9 @@ vm_map_delete(vm_map_t map, vm_offset_t start, vm_offset_t end) vm_object_page_remove(object, offidxstart, offidxend, FALSE); } else { mtx_lock(&Giant); + vm_page_lock_queues(); pmap_remove(map->pmap, s, e); + vm_page_unlock_queues(); if (object != NULL && object->ref_count != 1 && (object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING && @@ -2916,7 +2921,9 @@ vm_uiomove( /* * Remove old window into the file */ - pmap_remove (map->pmap, uaddr, tend); + vm_page_lock_queues(); + pmap_remove(map->pmap, uaddr, tend); + vm_page_unlock_queues(); /* * Force copy on write for mmaped regions @@ -2943,7 +2950,9 @@ vm_uiomove( entry->offset = cp; map->timestamp++; } else { - pmap_remove (map->pmap, uaddr, tend); + vm_page_lock_queues(); + pmap_remove(map->pmap, uaddr, tend); + vm_page_unlock_queues(); } } else if ((first_object->ref_count == 1) && @@ -2958,7 +2967,9 @@ vm_uiomove( /* * Remove old window into the file */ - pmap_remove (map->pmap, uaddr, tend); + vm_page_lock_queues(); + pmap_remove(map->pmap, uaddr, tend); + vm_page_unlock_queues(); /* * Remove unneeded old pages @@ -3007,7 +3018,9 @@ vm_uiomove( first_object->backing_object_offset = cp; map->timestamp++; } else { - pmap_remove (map->pmap, uaddr, tend); + vm_page_lock_queues(); + pmap_remove(map->pmap, uaddr, tend); + vm_page_unlock_queues(); } /* * Otherwise, we have to do a logical mmap. @@ -3017,7 +3030,9 @@ vm_uiomove( vm_object_set_flag(srcobject, OBJ_OPT); vm_object_reference(srcobject); - pmap_remove (map->pmap, uaddr, tend); + vm_page_lock_queues(); + pmap_remove(map->pmap, uaddr, tend); + vm_page_unlock_queues(); vm_object_pmap_copy_1 (srcobject, oindex, oindex + osize); vm_map_lock_upgrade(map); |
