diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2017-08-11 16:29:22 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2017-08-11 16:29:22 +0000 |
| commit | 9df950b35dd419931257b83b5c10ba04b86a9c56 (patch) | |
| tree | 075b91d936165430009cba2ba88798a29ced9d05 /sys/vm/vm_page.c | |
| parent | 6921451dabae30ff5b4af5aea749be1ff787bab9 (diff) | |
| download | src-9df950b35dd419931257b83b5c10ba04b86a9c56.tar.gz src-9df950b35dd419931257b83b5c10ba04b86a9c56.zip | |
Modify vm_page_grab_pages() to handle VM_ALLOC_NOWAIT.
This will allow its use in sendfile_swapin().
Reviewed by: alc, kib
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D11942
Notes
Notes:
svn path=/head/; revision=322405
Diffstat (limited to 'sys/vm/vm_page.c')
| -rw-r--r-- | sys/vm/vm_page.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 449b299c7338..8f0d5807bc4e 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -3173,13 +3173,15 @@ retrylookup: * optional allocation flags: * VM_ALLOC_IGN_SBUSY do not sleep on soft busy pages * VM_ALLOC_NOBUSY do not exclusive busy the page + * VM_ALLOC_NOWAIT do not sleep * VM_ALLOC_SBUSY set page to sbusy state * VM_ALLOC_WIRED wire the pages * VM_ALLOC_ZERO zero and validate any invalid pages * - * This routine may sleep. + * If VM_ALLOC_NOWAIT is not specified, this routine may sleep. Otherwise, it + * may return a partial prefix of the requested range. */ -void +int vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags, vm_page_t *ma, int count) { @@ -3197,7 +3199,7 @@ vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags, (allocflags & VM_ALLOC_IGN_SBUSY) != 0, ("vm_page_grab_pages: VM_ALLOC_SBUSY/IGN_SBUSY mismatch")); if (count == 0) - return; + return (0); i = 0; retrylookup: m = vm_page_lookup(object, pindex + i); @@ -3206,6 +3208,8 @@ retrylookup: sleep = (allocflags & VM_ALLOC_IGN_SBUSY) != 0 ? vm_page_xbusied(m) : vm_page_busied(m); if (sleep) { + if ((allocflags & VM_ALLOC_NOWAIT) != 0) + break; /* * Reference the page before unlocking and * sleeping so that the page daemon is less @@ -3233,6 +3237,8 @@ retrylookup: m = vm_page_alloc(object, pindex + i, (allocflags & ~VM_ALLOC_IGN_SBUSY) | VM_ALLOC_COUNT(count - i)); if (m == NULL) { + if ((allocflags & VM_ALLOC_NOWAIT) != 0) + break; VM_OBJECT_WUNLOCK(object); VM_WAIT; VM_OBJECT_WLOCK(object); @@ -3247,6 +3253,7 @@ retrylookup: ma[i] = m; m = vm_page_next(m); } + return (i); } /* |