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

Hold the page queues lock when calling pmap_unwire_pte_hold() or

Browse source 
pmap_remove_pte().  Use vm_page_sleep_if_busy() in
_pmap_unwire_pte_hold() so that the page queues lock is released
when sleeping.

Approved by:	re (blanket)
This commit is contained in:
Alan Cox 2002-12-02 04:54:21 +00:00
parent a8896b02e0
commit d79ebb6026
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/amd64/amd64/pmap.c
View file

@ -1149,8 +1149,8 @@ static int
_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m)
{
while (vm_page_sleep_busy(m, FALSE, "pmuwpt"))
;
while (vm_page_sleep_if_busy(m, FALSE, "pmuwpt"))
vm_page_lock_queues();
if (m->hold_count == 0) {
vm_offset_t pteva;
@ -2133,7 +2133,9 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
*/
if (opa) {
int err;
vm_page_lock_queues();
err = pmap_remove_pte(pmap, pte, va);
vm_page_unlock_queues();
if (err)
panic("pmap_enter: pte vanished, va: 0x%x", va);
}
@ -2252,8 +2254,11 @@ retry:
*/
pte = vtopte(va);
if (*pte) {
if (mpte)
if (mpte != NULL) {
vm_page_lock_queues();
pmap_unwire_pte_hold(pmap, mpte);
vm_page_unlock_queues();
}
return 0;
}
@ -2667,7 +2672,9 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len,
pmap_insert_entry(dst_pmap, addr,
dstmpte, m);
} else {
vm_page_lock_queues();
pmap_unwire_pte_hold(dst_pmap, dstmpte);
vm_page_unlock_queues();
}
if (dstmpte->hold_count >= srcmpte->hold_count)
break;

13
sys/i386/i386/pmap.c
View file

@ -1149,8 +1149,8 @@ static int
_pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m)
{
while (vm_page_sleep_busy(m, FALSE, "pmuwpt"))
;
while (vm_page_sleep_if_busy(m, FALSE, "pmuwpt"))
vm_page_lock_queues();
if (m->hold_count == 0) {
vm_offset_t pteva;
@ -2133,7 +2133,9 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
*/
if (opa) {
int err;
vm_page_lock_queues();
err = pmap_remove_pte(pmap, pte, va);
vm_page_unlock_queues();
if (err)
panic("pmap_enter: pte vanished, va: 0x%x", va);
}
@ -2252,8 +2254,11 @@ retry:
*/
pte = vtopte(va);
if (*pte) {
if (mpte)
if (mpte != NULL) {
vm_page_lock_queues();
pmap_unwire_pte_hold(pmap, mpte);
vm_page_unlock_queues();
}
return 0;
}
@ -2667,7 +2672,9 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len,
pmap_insert_entry(dst_pmap, addr,
dstmpte, m);
} else {
vm_page_lock_queues();
pmap_unwire_pte_hold(dst_pmap, dstmpte);
vm_page_unlock_queues();
}
if (dstmpte->hold_count >= srcmpte->hold_count)
break;