diff options
| author | alc <alc@FreeBSD.org> | 2010-07-09 19:38:30 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2010-07-09 19:38:30 +0000 |
| commit | 7c09dc242c035943fb8ed54909fd0a8461cb99ba (patch) | |
| tree | 59894efa2a34a762f15c9dc8d9456b6f9e56f524 /sys/vm | |
| parent | 4ef0eb46da85379be188033bd5af465eaa2f1b0d (diff) | |
| download | FreeBSD-src-7c09dc242c035943fb8ed54909fd0a8461cb99ba.zip FreeBSD-src-7c09dc242c035943fb8ed54909fd0a8461cb99ba.tar.gz | |
Add support for the VM_ALLOC_COUNT() hint to vm_page_alloc(). Consequently,
the maintenance of vm_pageout_deficit can be localized to just two places:
vm_page_alloc() and vm_pageout_scan().
This change also corrects an off-by-one error in the maintenance of
vm_pageout_deficit. Historically, the buffer cache functions, allocbuf()
and vm_hold_load_pages(), have not taken into account that vm_page_alloc()
already increments vm_pageout_deficit by one.
Reviewed by: kib
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_page.c | 9 | ||||
| -rw-r--r-- | sys/vm/vm_page.h | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 61718f4..348ab99 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1264,7 +1264,8 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req) * Not allocatable, give up. */ mtx_unlock(&vm_page_queue_free_mtx); - atomic_add_int(&vm_pageout_deficit, 1); + atomic_add_int(&vm_pageout_deficit, + MAX((u_int)req >> VM_ALLOC_COUNT_SHIFT, 1)); pagedaemon_wakeup(); return (NULL); } @@ -2041,7 +2042,6 @@ vm_page_t vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags) { vm_page_t m; - u_int count; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); KASSERT((allocflags & VM_ALLOC_RETRY) != 0, @@ -2071,12 +2071,9 @@ retrylookup: } } m = vm_page_alloc(object, pindex, allocflags & ~(VM_ALLOC_RETRY | - VM_ALLOC_IGN_SBUSY | VM_ALLOC_COUNT_MASK)); + VM_ALLOC_IGN_SBUSY)); if (m == NULL) { VM_OBJECT_UNLOCK(object); - count = (u_int)allocflags >> VM_ALLOC_COUNT_SHIFT; - if (count > 0) - atomic_add_int(&vm_pageout_deficit, count); VM_WAIT; VM_OBJECT_LOCK(object); goto retrylookup; diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 62868cd..a877c43 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -321,7 +321,6 @@ extern struct vpglocks vm_page_queue_lock; #define VM_ALLOC_COUNT_SHIFT 16 #define VM_ALLOC_COUNT(count) ((count) << VM_ALLOC_COUNT_SHIFT) -#define VM_ALLOC_COUNT_MASK VM_ALLOC_COUNT(0xffff) void vm_page_flag_set(vm_page_t m, unsigned short bits); void vm_page_flag_clear(vm_page_t m, unsigned short bits); |
