diff options
| -rw-r--r-- | sys/kern/uipc_cow.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 4 | ||||
| -rw-r--r-- | sys/net/bpf_zerocopy.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c index 5c0dcd2..88a5625 100644 --- a/sys/kern/uipc_cow.c +++ b/sys/kern/uipc_cow.c @@ -80,6 +80,7 @@ socow_iodone(void *addr, void *args) pp = sf_buf_page(sf); sf_buf_free(sf); /* remove COW mapping */ + vm_page_lock(pp); vm_page_lock_queues(); vm_page_cowclear(pp); vm_page_unwire(pp, 0); @@ -91,6 +92,7 @@ socow_iodone(void *addr, void *args) if (pp->wire_count == 0 && pp->object == NULL) vm_page_free(pp); vm_page_unlock_queues(); + vm_page_unlock(pp); socow_stats.iodone++; } @@ -149,6 +151,7 @@ socow_setup(struct mbuf *m0, struct uio *uio) */ sf = sf_buf_alloc(pp, SFB_CATCH); if (!sf) { + vm_page_lock(pp); vm_page_lock_queues(); vm_page_cowclear(pp); vm_page_unwire(pp, 0); @@ -160,6 +163,7 @@ socow_setup(struct mbuf *m0, struct uio *uio) if (pp->wire_count == 0 && pp->object == NULL) vm_page_free(pp); vm_page_unlock_queues(); + vm_page_unlock(pp); socow_stats.fail_sf_buf++; return(0); } diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 3271235..a137875 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1715,6 +1715,7 @@ sf_buf_mext(void *addr, void *args) m = sf_buf_page(args); sf_buf_free(args); + vm_page_lock(m); vm_page_lock_queues(); vm_page_unwire(m, 0); /* @@ -1725,6 +1726,7 @@ sf_buf_mext(void *addr, void *args) if (m->wire_count == 0 && m->object == NULL) vm_page_free(m); vm_page_unlock_queues(); + vm_page_unlock(m); if (addr == NULL) return; sfs = addr; @@ -2136,6 +2138,7 @@ retry_space: if ((sf = sf_buf_alloc(pg, (mnw ? SFB_NOWAIT : SFB_CATCH))) == NULL) { mbstat.sf_allocfail++; + vm_page_lock(pg); vm_page_lock_queues(); vm_page_unwire(pg, 0); /* @@ -2144,6 +2147,7 @@ retry_space: if (pg->wire_count == 0 && pg->object == NULL) vm_page_free(pg); vm_page_unlock_queues(); + vm_page_unlock(pg); error = (mnw ? EAGAIN : EINTR); break; } diff --git a/sys/net/bpf_zerocopy.c b/sys/net/bpf_zerocopy.c index 3cf4b8d..5ca6978 100644 --- a/sys/net/bpf_zerocopy.c +++ b/sys/net/bpf_zerocopy.c @@ -112,11 +112,13 @@ static void zbuf_page_free(vm_page_t pp) { + vm_page_lock(pp); vm_page_lock_queues(); vm_page_unwire(pp, 0); if (pp->wire_count == 0 && pp->object == NULL) vm_page_free(pp); vm_page_unlock_queues(); + vm_page_unlock(pp); } /* |
