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

sendfile: don't panic when VOP_GETPAGES_ASYNC returns an error

Browse Source 
This is a partial merge of 350144 from projects/fuse2

PR:		236466
Reviewed by:	markj
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D21095
This commit is contained in:
Alan Somers 2019-07-29 20:50:26 +00:00
commit 0367bca479
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=350426
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/kern/kern_sendfile.c
View File

@ -347,13 +347,13 @@ sendfile_iodone(void *arg, vm_page_t *pg, int count, int error)
* Iterate through pages vector and request paging for non-valid pages.
*/
static int
sendfile_swapin(vm_object_t obj, struct sf_io *sfio, off_t off, off_t len,
int npages, int rhpages, int flags)
sendfile_swapin(vm_object_t obj, struct sf_io *sfio, int *nios, off_t off,
off_t len, int npages, int rhpages, int flags)
{
vm_page_t *pa = sfio->pa;
int grabbed, nios;
int grabbed;
nios = 0;
*nios = 0;
flags = (flags & SF_NODISKIO) ? VM_ALLOC_NOWAIT : 0;
/*
@ -372,7 +372,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, off_t off, off_t len,
}
for (int i = 0; i < npages;) {
int j, a, count, rv __unused;
int j, a, count, rv;
/* Skip valid pages. */
if (vm_page_is_valid(pa[i], vmoff(i, off) & PAGE_MASK,
@ -435,6 +435,17 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, off_t off, off_t len,
rv = vm_pager_get_pages_async(obj, pa + i, count, NULL,
i + count == npages ? &rhpages : NULL,
&sendfile_iodone, sfio);
if (rv != VM_PAGER_OK) {
for (j = i; j < i + count; j++) {
if (pa[j] != bogus_page) {
vm_page_lock(pa[j]);
vm_page_unwire(pa[j], PQ_INACTIVE);
vm_page_unlock(pa[j]);
}
}
VM_OBJECT_WUNLOCK(obj);
return (EIO);
}
KASSERT(rv == VM_PAGER_OK, ("%s: pager fail obj %p page %p",
__func__, obj, pa[i]));
@ -456,15 +467,15 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, off_t off, off_t len,
}
i += count;
nios++;
(*nios)++;
}
VM_OBJECT_WUNLOCK(obj);
if (nios == 0 && npages != 0)
if (*nios == 0 && npages != 0)
SFSTAT_INC(sf_noiocnt);
return (nios);
return (0);
}
static int
@ -788,8 +799,14 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
sfio->so = so;
sfio->error = 0;
nios = sendfile_swapin(obj, sfio, off, space, npages, rhpages,
flags);
error = sendfile_swapin(obj, sfio, &nios, off, space, npages,
rhpages, flags);
if (error != 0) {
if (vp != NULL)
VOP_UNLOCK(vp, 0);
free(sfio, M_TEMP);
goto done;
}
/*
* Loop and construct maximum sized mbuf chain to be bulk