upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-10 17:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

o Convert the vm_page buckets mutex to a spin lock. (This resolves

Browse source 
an issue on the Alpha platform found by jeff@.)
 o Simplify vm_page_lookup().

Reviewed by:	jhb
This commit is contained in:
Alan Cox 2002-04-30 21:24:47 +00:00
parent 39acc78a1e
commit ea0f50bcf0
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/kern/subr_witness.c
View file

@ -217,6 +217,7 @@ static struct witness_order_list_entry order_lists[] = {
* leaf locks
*/
{ "allpmaps", &lock_class_mtx_spin },
{ "vm page buckets mutex", &lock_class_mtx_spin },
{ "icu", &lock_class_mtx_spin },
#ifdef SMP
{ "smp rendezvous", &lock_class_mtx_spin },

25
sys/vm/vm_page.c
View file

@ -253,7 +253,7 @@ vm_page_startup(vm_offset_t starta, vm_offset_t enda, vm_offset_t vaddr)
VM_PROT_READ | VM_PROT_WRITE);
bzero((caddr_t) mapped, end - new_end);
mtx_init(&vm_page_buckets_mtx, "vm page buckets mutex", NULL, MTX_DEF);
mtx_init(&vm_page_buckets_mtx, "vm page buckets mutex", NULL, MTX_SPIN);
vm_page_buckets = (struct vm_page **)mapped;
bucket = vm_page_buckets;
for (i = 0; i < vm_page_bucket_count; i++) {
@ -599,10 +599,10 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex)
* Insert it into the object_object/offset hash table
*/
bucket = &vm_page_buckets[vm_page_hash(object, pindex)];
mtx_lock(&vm_page_buckets_mtx);
mtx_lock_spin(&vm_page_buckets_mtx);
m->hnext = *bucket;
*bucket = m;
mtx_unlock(&vm_page_buckets_mtx);
mtx_unlock_spin(&vm_page_buckets_mtx);
/*
* Now link into the object's list of backed pages.
@ -662,7 +662,7 @@ vm_page_remove(vm_page_t m)
* must be on the hash queue, we will panic if it isn't
*/
bucket = &vm_page_buckets[vm_page_hash(m->object, m->pindex)];
mtx_lock(&vm_page_buckets_mtx);
mtx_lock_spin(&vm_page_buckets_mtx);
while (*bucket != m) {
if (*bucket == NULL)
panic("vm_page_remove(): page not found in hash");
@ -670,7 +670,7 @@ vm_page_remove(vm_page_t m)
}
*bucket = m->hnext;
m->hnext = NULL;
mtx_unlock(&vm_page_buckets_mtx);
mtx_unlock_spin(&vm_page_buckets_mtx);
/*
* Now remove from the object's list of backed pages.
@ -706,15 +706,12 @@ vm_page_lookup(vm_object_t object, vm_pindex_t pindex)
* Search the hash table for this object/offset pair
*/
bucket = &vm_page_buckets[vm_page_hash(object, pindex)];
mtx_lock(&vm_page_buckets_mtx);
for (m = *bucket; m != NULL; m = m->hnext) {
if ((m->object == object) && (m->pindex == pindex)) {
mtx_unlock(&vm_page_buckets_mtx);
return (m);
}
}
mtx_unlock(&vm_page_buckets_mtx);
return (NULL);
mtx_lock_spin(&vm_page_buckets_mtx);
for (m = *bucket; m != NULL; m = m->hnext)
if (m->object == object && m->pindex == pindex)
break;
mtx_unlock_spin(&vm_page_buckets_mtx);
return (m);
}
/*