system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-29 13:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the wait for sendfile buffers interruptable. Stops one process

Browse source 
consuming them all and then getting stuck.

Reviewed by:	dg
Reviewed by:	bmilekic
Observed by:	Andreas Persson <pap@garen.net>
This commit is contained in:
David Malone 2001-03-08 16:28:10 +00:00
parent 5af5ae6e18
commit 2239c07de9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=73995
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sys/kern/uipc_syscalls.c
View file

@ -1454,11 +1454,17 @@ static struct sf_buf *
sf_buf_alloc()
{
struct sf_buf *sf;
int error;
mtx_lock(&sf_freelist.sf_lock);
while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
sf_buf_alloc_want++;
msleep(&sf_freelist, &sf_freelist.sf_lock, PVM, "sfbufa", 0);
error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
"sfbufa", 0);
if (error != 0) {
sf_buf_alloc_want--;
break;
}
}
SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list);
mtx_unlock(&sf_freelist.sf_lock);
@ -1707,12 +1713,26 @@ sendfile(struct proc *p, struct sendfile_args *uap)
}
}
/*
* Get a sendfile buf. We usually wait as long as necessary,
* but this wait can be interrupted.
*/
if ((sf = sf_buf_alloc()) == NULL) {
s = splvm();
vm_page_unwire(pg, 0);
if (pg->wire_count == 0 && pg->object == NULL)
vm_page_free(pg);
splx(s);
sbunlock(&so->so_snd);
error = EINTR;
goto done;
}
/*
* Allocate a kernel virtual page and insert the physical page
* into it.
*/
sf = sf_buf_alloc();
sf->m = pg;
pmap_qenter(sf->kva, &pg, 1);
/*
@ -1722,6 +1742,7 @@ sendfile(struct proc *p, struct sendfile_args *uap)
if (m == NULL) {
error = ENOBUFS;
sf_buf_free((void *)sf->kva, NULL);
sbunlock(&so->so_snd);
goto done;
}
/*