Page MenuHomeFreeBSD
Files F146642551

D21095.id60219.diff
No OneTemporary
Actions

D21095.id60219.diff
View Options

Index: sys/kern/kern_sendfile.c
===================================================================
--- sys/kern/kern_sendfile.c
+++ sys/kern/kern_sendfile.c
@@ -45,6 +45,7 @@
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/rwlock.h>
+#include <sys/sdt.h>
#include <sys/sf_buf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
@@ -65,6 +66,8 @@
#define EXT_FLAG_NOCACHE EXT_FLAG_VENDOR2
#define EXT_FLAG_CACHE_LAST EXT_FLAG_VENDOR3
+SDT_PROVIDER_DECLARE(vfs);
+
/*
* Structure describing a single sendfile(2) I/O, which may consist of
* several underlying pager I/Os.
@@ -343,17 +346,18 @@
free(sfio, M_TEMP);
}
+SDT_PROBE_DEFINE1(vfs, sendfile, swapin, pager_error, "int");
/*
* 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 +376,7 @@
}
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 +439,16 @@
rv = vm_pager_get_pages_async(obj, pa + i, count, NULL,
i + count == npages ? &rhpages : NULL,
&sendfile_iodone, sfio);
+ if (rv != VM_PAGER_OK) {
+ SDT_PROBE1(vfs, sendfile, swapin, pager_error, rv);
+ for (j = 0; j < count; j++) {
+ vm_page_lock(*(pa + i + j));
+ vm_page_unwire(*(pa + i + j), PQ_INACTIVE);
+ vm_page_unlock(*(pa + i + 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 +470,15 @@
}
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 +802,14 @@
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) {
+ free(sfio, M_TEMP);
+ if (vp != NULL)
+ VOP_UNLOCK(vp, 0);
+ goto done;
+ }
/*
* Loop and construct maximum sized mbuf chain to be bulk

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 5, 8:55 AM (17 h, 3 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29279140
Default Alt Text
D21095.id60219.diff (2 KB)

Event Timeline