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

- Hold the page queues lock around calls to vm_page_wakeup() and

Browse Source 
vm_page_flag_clear().
This commit is contained in:
Alan Cox 2002-12-24 07:32:38 +00:00
parent dc907f6632
commit 11a2911cec
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amd64/amd64/pmap.c
View File

@ -997,9 +997,11 @@ pmap_new_thread(struct thread *td, int pages)
VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
ma[i] = m;
vm_page_lock_queues();
vm_page_wakeup(m);
vm_page_flag_clear(m, PG_ZERO);
m->valid = VM_PAGE_BITS_ALL;
vm_page_unlock_queues();
}
pmap_qenter(ks, ma, pages);
}
@ -1271,8 +1273,10 @@ pmap_pinit(pmap)
*/
ptdpg = vm_page_grab(pmap->pm_pteobj, PTDPTDI,
VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO);
vm_page_lock_queues();
vm_page_flag_clear(ptdpg, PG_BUSY);
ptdpg->valid = VM_PAGE_BITS_ALL;
vm_page_unlock_queues();
pmap_qenter((vm_offset_t) pmap->pm_pdir, &ptdpg, 1);
if ((ptdpg->flags & PG_ZERO) == 0)
@ -1412,10 +1416,11 @@ _pmap_allocpte(pmap, ptepindex)
pmap_zero_page(m);
}
}
vm_page_lock_queues();
m->valid = VM_PAGE_BITS_ALL;
vm_page_flag_clear(m, PG_ZERO);
vm_page_wakeup(m);
vm_page_unlock_queues();
return m;
}
@ -2349,7 +2354,6 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,
vm_page_lock_queues();
if (vm_page_sleep_if_busy(p, FALSE, "init4p"))
goto retry;
vm_page_unlock_queues();
} else {
p = vm_page_alloc(object, pindex, VM_ALLOC_NORMAL);
if (p == NULL)
@ -2364,8 +2368,10 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,
}
p = vm_page_lookup(object, pindex);
vm_page_lock_queues();
vm_page_wakeup(p);
}
vm_page_unlock_queues();
ptepa = VM_PAGE_TO_PHYS(p);
if (ptepa & (NBPDR - 1)) {

10
sys/i386/i386/pmap.c
View File

@ -997,9 +997,11 @@ pmap_new_thread(struct thread *td, int pages)
VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
ma[i] = m;
vm_page_lock_queues();
vm_page_wakeup(m);
vm_page_flag_clear(m, PG_ZERO);
m->valid = VM_PAGE_BITS_ALL;
vm_page_unlock_queues();
}
pmap_qenter(ks, ma, pages);
}
@ -1271,8 +1273,10 @@ pmap_pinit(pmap)
*/
ptdpg = vm_page_grab(pmap->pm_pteobj, PTDPTDI,
VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO);
vm_page_lock_queues();
vm_page_flag_clear(ptdpg, PG_BUSY);
ptdpg->valid = VM_PAGE_BITS_ALL;
vm_page_unlock_queues();
pmap_qenter((vm_offset_t) pmap->pm_pdir, &ptdpg, 1);
if ((ptdpg->flags & PG_ZERO) == 0)
@ -1412,10 +1416,11 @@ _pmap_allocpte(pmap, ptepindex)
pmap_zero_page(m);
}
}
vm_page_lock_queues();
m->valid = VM_PAGE_BITS_ALL;
vm_page_flag_clear(m, PG_ZERO);
vm_page_wakeup(m);
vm_page_unlock_queues();
return m;
}
@ -2349,7 +2354,6 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,
vm_page_lock_queues();
if (vm_page_sleep_if_busy(p, FALSE, "init4p"))
goto retry;
vm_page_unlock_queues();
} else {
p = vm_page_alloc(object, pindex, VM_ALLOC_NORMAL);
if (p == NULL)
@ -2364,8 +2368,10 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,
}
p = vm_page_lookup(object, pindex);
vm_page_lock_queues();
vm_page_wakeup(p);
}
vm_page_unlock_queues();
ptepa = VM_PAGE_TO_PHYS(p);
if (ptepa & (NBPDR - 1)) {