d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the vm object and page locking in exec_map_first_page(). Mark the

Browse Source 
one still anticipated change with XXX.  Otherwise, this function is done.
This commit is contained in:
Alan Cox 2003-06-09 19:37:14 +00:00
parent 23b03a1274
commit 06fa71cdcc
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/kern/kern_exec.c
View File

@ -749,18 +749,23 @@ exec_map_first_page(imgp)
VOP_GETVOBJECT(imgp->vp, &object);
VM_OBJECT_LOCK(object);
ma[0] = vm_page_grab(object, 0, VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
VM_OBJECT_UNLOCK(object);
vm_page_lock_queues();
if ((ma[0]->valid & VM_PAGE_BITS_ALL) != VM_PAGE_BITS_ALL) {
vm_page_unlock_queues();
initial_pagein = VM_INITIAL_PAGEIN;
if (initial_pagein > object->size)
initial_pagein = object->size;
for (i = 1; i < initial_pagein; i++) {
if ((ma[i] = vm_page_lookup(object, i)) != NULL) {
if ((ma[i]->flags & PG_BUSY) || ma[i]->busy)
break;
if (ma[i]->valid)
break;
vm_page_lock_queues();
if ((ma[i]->flags & PG_BUSY) || ma[i]->busy) {
vm_page_unlock_queues();
break;
}
if (ma[i]->valid) {
vm_page_unlock_queues();
break;
}
vm_page_busy(ma[i]);
vm_page_unlock_queues();
} else {
@ -771,22 +776,23 @@ exec_map_first_page(imgp)
}
}
initial_pagein = i;
VM_OBJECT_UNLOCK(object); /* XXX */
rv = vm_pager_get_pages(object, ma, initial_pagein, 0);
VM_OBJECT_LOCK(object); /* XXX */
ma[0] = vm_page_lookup(object, 0);
vm_page_lock_queues();
if ((rv != VM_PAGER_OK) || (ma[0] == NULL) ||
(ma[0]->valid == 0)) {
if (ma[0]) {
vm_page_lock_queues();
pmap_remove_all(ma[0]);
vm_page_free(ma[0]);
vm_page_unlock_queues();
}
vm_page_unlock_queues();
VM_OBJECT_UNLOCK(object);
return (EIO);
}
}
vm_page_lock_queues();
VM_OBJECT_UNLOCK(object);
vm_page_wire(ma[0]);
vm_page_wakeup(ma[0]);
vm_page_unlock_queues();