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

This is the first step in transitioning responsibility for synchronizing

Browse Source 
access to the page's wire_count from the page queues lock to the page lock.

Submitted by:	kmacy
This commit is contained in:
Alan Cox 2010-05-03 05:41:50 +00:00
parent 464aa6d5fb
commit 913814935a
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/uipc_cow.c
View File

@ -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);
}

4
sys/kern/uipc_syscalls.c
View File

@ -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;
}

2
sys/net/bpf_zerocopy.c
View File

@ -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);
}
/*