diff options
| author | alc <alc@FreeBSD.org> | 2011-12-28 19:59:54 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2011-12-28 19:59:54 +0000 |
| commit | d8353bd3a28f2633bf8daa3ef31a9b40f200d1f1 (patch) | |
| tree | 704bd4a9069c8a4108ef7ff8bc69c48fbf1d386b /sys/i386/xen/pmap.c | |
| parent | 68c3cd3b7eaf83d0c18275995c4373e51eb78f75 (diff) | |
| download | FreeBSD-src-d8353bd3a28f2633bf8daa3ef31a9b40f200d1f1.zip FreeBSD-src-d8353bd3a28f2633bf8daa3ef31a9b40f200d1f1.tar.gz | |
Fix a bug in the Xen pmap's implementation of pmap_extract_and_hold():
If the page lock acquisition is retried, then the underlying thread is
not unpinned.
Wrap nearby lines that exceed 80 columns.
Diffstat (limited to 'sys/i386/xen/pmap.c')
| -rw-r--r-- | sys/i386/xen/pmap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index a839f95..53847c9 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -1134,8 +1134,8 @@ retry: if (pde != 0) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { - if (vm_page_pa_tryrelock(pmap, (pde & PG_PS_FRAME) | - (va & PDRMASK), &pa)) + if (vm_page_pa_tryrelock(pmap, (pde & + PG_PS_FRAME) | (va & PDRMASK), &pa)) goto retry; m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); @@ -1148,8 +1148,11 @@ retry: PT_SET_MA(PADDR1, 0); if ((pte & PG_V) && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { - if (vm_page_pa_tryrelock(pmap, pte & PG_FRAME, &pa)) + if (vm_page_pa_tryrelock(pmap, pte & PG_FRAME, + &pa)) { + sched_unpin(); goto retry; + } m = PHYS_TO_VM_PAGE(pte & PG_FRAME); vm_page_hold(m); } |
